Add output enable and disable invert

Closes #115
MCUdude · Apr 8, 2021 · 3f20e21 · 3f20e21 · SpenceKonde · Apr 9, 2021
1 parent 4ed967a
commit 3f20e21
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 9 deletions.
diff --git a/megaavr/libraries/Comparator/README.md b/megaavr/libraries/Comparator/README.md
@@ -104,12 +104,14 @@ Comparator.hysteresis = hyst::large;  // Use 50V hysteresis
 
 
 ### output
-Variable for setting the comparator output pin (PA7).
+Variable for setting the comparator output, internally and/or externally.
 Accepted values:
 ``` c++
-out::disable; // No output pin
-out::enable;  // Enable output pin (PA7)
-out::invert;  // Invert output pin (PA7)
+out::disable;        // No output pin, signal not inverted internally
+out::disable_invert; // No output pin, signal inverted internally
+out::enable;         // Enable output pin (PA7), signal not inverted internally
+out::invert;         // Enable output pin (PA7), signal inverted internally
+out::enable_invert;  // Identical to out::invert
 ```
 
 ##### Usage
@@ -148,7 +150,7 @@ Comparator.stop(); // Stop comparator
 
 
 ## read()
-Reads the state of the analog comparator output.
+Reads the state of the analog comparator output. Works also when the physical output pin is disabled.
 
 ##### Usage
 ```c++

diff --git a/megaavr/libraries/Comparator/src/Comparator.cpp b/megaavr/libraries/Comparator/src/Comparator.cpp
@@ -59,7 +59,7 @@ void AnalogComparator::init()
     AC.CTRLA |= out::enable;
     PORTA.DIRSET = PIN7_bm;
   }
-  else if(output == out::invert)
+  else if(output == out::invert /* || output == out::invert_enable */)
   {
     AC.MUXCTRLA |= out::invert;
     AC.CTRLA |= out::enable;
@@ -71,6 +71,12 @@ void AnalogComparator::init()
     AC.CTRLA &= ~out::enable;
     PORTA.DIRCLR = PIN7_bm;
   }
+  else if(output == out::disable_invert)
+  {
+    AC.MUXCTRLA |= out::invert;
+    AC.CTRLA &= ~out::enable;
+    PORTA.DIRCLR = PIN7_bm;
+  }
 }
 
 void AnalogComparator::start(bool state)

diff --git a/megaavr/libraries/Comparator/src/Comparator.h b/megaavr/libraries/Comparator/src/Comparator.h
@@ -7,9 +7,11 @@ namespace out
 {
   enum output_t : uint8_t
   {
-    disable = 0x00,
-    enable  = 0x40,
-    invert  = 0x80,
+    disable         = 0x00,
+    disable_invert  = 0xC0,
+    enable          = 0x40,
+    invert          = 0x80,
+    enable_invert   = 0x80,
   };
 };