minor compile failures

Author: SpenceKonde

megaavr/cores/megatinycore/core_devices.h

@@ -1013,39 +1013,39 @@ has once worked for the same thing as meaning that thing */
     #define TCA_SINGLE_EVACT_UPDOWN_gc TCA_SINGLE_EVACTA_UPDOWN_gc
   #endif
   // Some versions of the EA headers have it as PORTx_EVGENCTRL, retroactively changed to PORTx_EVGENCTRLA, implying plans for more.
-  #if defined(PORTA_EVGENCTRL)
+    #if defined(PORTA_EVGENCTRL)
     #define PORTA_EVGENCTRLA PORTA_EVGENCTRL
-  #else
+  #elif defined(PORTA_EVGENCTRLA)
     #define PORTA_EVGENCTRL PORTA_EVGENCTRLA
   #endif
   #if defined(PORTB_EVGENCTRL)
     #define PORTB_EVGENCTRLA PORTB_EVGENCTRL
-  #else
+  #elif defined(PORTB_EVGENCTRLA)
     #define PORTB_EVGENCTRL PORTB_EVGENCTRLA
   #endif
   #if defined(PORTC_EVGENCTRL)
     #define PORTC_EVGENCTRLA PORTC_EVGENCTRL
-  #else
+  #elif defined(PORTC_EVGENCTRLA)
     #define PORTC_EVGENCTRL PORTC_EVGENCTRLA
   #endif
   #if defined(PORTD_EVGENCTRL)
     #define PORTD_EVGENCTRLA PORTD_EVGENCTRL
-  #else
+  #elif defined(PORTD_EVGENCTRLA)
     #define PORTD_EVGENCTRL PORTD_EVGENCTRLA
   #endif
   #if defined(PORTE_EVGENCTRL)
     #define PORTE_EVGENCTRLA PORTE_EVGENCTRL
-  #else
+  #elif defined(PORTE_EVGENCTRLA)
     #define PORTE_EVGENCTRL PORTE_EVGENCTRLA
   #endif
   #if defined(PORTF_EVGENCTRL)
     #define PORTF_EVGENCTRLA PORTF_EVGENCTRL
-  #else
+  #elif defined(PORTF_EVGENCTRLA)
     #define PORTF_EVGENCTRL PORTF_EVGENCTRLA
   #endif
   #if defined(PORTG_EVGENCTRL)
     #define PORTG_EVGENCTRLA PORTG_EVGENCTRL
-  #else
+  #elif defined(PORTG_EVGENCTRLA)
     #define PORTG_EVGENCTRL PORTG_EVGENCTRLA
   #endif
 

megaavr/libraries/Comparator/README.md

@@ -60,6 +60,9 @@ comparator::in_p::in0; // Use positive input pin 0 as input
 comparator::in_p::in1; // Use positive input pin 1 as input (if present)
 comparator::in_p::in2; // Use positive input pin 2 as input (if present)
 comparator::in_p::in3; // Use positive input pin 3 as input (if present)
+comparator::in_p::in4; // Use positive input pin 4 as input (if present, DD and later omly)
+comparator::in_p::in5; // Use positive input pin 5 as input (if present, EB and later only)
+comparator::in_p::in5; // Use positive input pin 6 as input (if present, EB and later only)
 ```
 
 #### Usage
@@ -77,10 +80,13 @@ Accepted values:
 ``` c++
 comparator::in_n::in0;    // Use negative input pin 0 as input
 comparator::in_n::in1;    // Use negative input pin 1 as input (if present)
-comparator::in_n::in2;    // Use negative input pin 2 as input (2-series only)
-comparator::in_n::vref;   // Use the voltage reference w/out DAC (0/1-series only)
-comparator::in_n::dacref; // Use DACREF as input (1/2-series only)
+comparator::in_n::in2;    // Use negative input pin 2 as input (if present, 2-series and Dx/Ex only)
+comparator::in_n::in3;    // Use negative input pin 3 as input (DD and later only)
+comparator::in_n::vref;   // Use the voltage reference w/out DAC (0/1-series only. 
+comparator::in_n::dacref; // Use DACREF as input - not available on megaAVR 0-series. Available on all other devices. On tiny1
 ```
+#### What is the DACREF?
+On the tinyAVR 1-series, a new feature was added to the AC's (okay, it was a new feature that they dropped on the 0-series, since the 1-series came out first) - the 1-series had a DAC, so they let you use the output of that as the negative input, without having to output it on a pin! Of course, when they packed all those extra peripherals onto the larger tiny1's to test things out for the Dx, that was awkward, since they now had 3 comparators to model the window comparator feature going in the DA/DB. They only had one full fledged DAC. And they sure weren't going to put 3 full DACs on the DA/DB nor one DAC (normally only found on higher end parts) per comparator (at least one is found on every or nearly every AVR that has ever been made). So on the 1+-series parts, they just gave them kneecapped DACs with no pin output, except for the first one, which was unchanged from the other 1-series. That was fine for the 1-series, but it wasn't great. 
 
 #### Usage
 ``` c++

megaavr/libraries/Event/src/Event.cpp

@@ -197,12 +197,13 @@ Event& Event::get_generator_channel(uint8_t generator_pin)
   uint8_t gen = 0xFF;
   if (port != NOT_A_PIN && port_pin != NOT_A_PIN) {
     #if defined(PORTA_EVGENCTRL)
-      volatile port_t* port_ptr = portToPortStruct(port);
+      #error "what the f?"
+      volatile PORT_t* port_ptr = portToPortStruct(port);
       uint8_t temp = port_ptr.EVGENCTRL;
-        if ((temp & 0x0F == port_pin) {
+        if ((temp & 0x0F) == port_pin) {
           gen = 0x40 + (port << 1);
           _SWAP(port_pin);
-        } else if ((temp & 0xF0 == port_pin)) {
+        } else if ((temp & 0xF0) == port_pin) {
           gen = 0x40 + (port << 1) + 1;
         }
         if (gen == 0xFF)

megaavr/libraries/Logic/src/Logic.cpp

@@ -138,4 +138,5 @@ void Logic::init() {
                  | (enable       ?  CCL_ENABLE_bm : 0    );
 }
 
-/* Generally speaking, in code that is executed often or which isspeed sensitive, you prefer to avoid shift operations where one or both of the operands is not compile time known.
+/* Generally speaking, in code that is executed often or which isspeed sensitive, you prefer to avoid shift operations where one or both of the operands is not compile time known.*/
+