fix 1060

SpenceKonde · Mar 28, 2024 · dc86020 · dc86020
1 parent 7e836cd
commit dc86020
Showing 1 changed file with 23 additions and 8 deletions.
diff --git a/megaavr/libraries/Event/src/Event_parts.h b/megaavr/libraries/Event/src/Event_parts.h
@@ -1046,6 +1046,11 @@ namespace event {
   };
     #endif // defined (__AVR_EB__)
   #elif MEGATINYCORE_SERIES == 2
+    #if defined(PIN_PB1)
+      #define HAS_SEPARATE_GEN1
+      #define HAS_SEPARATE_GEN3
+      #define HAS_SEPARATE_GEN4
+    #endif
     namespace gen {
       enum generator_t : uint8_t {
         disable         = 0x00,
@@ -1092,10 +1097,12 @@ namespace event {
         pin_pa5     = 0x45,
         pin_pa6     = 0x46,
         pin_pa7     = 0x47,
+#if defined(PIN_PB0)
         pin_pb0     = 0x40,
         pin_pb1     = 0x41,
         pin_pb2     = 0x42,
         pin_pb3     = 0x43,
+#endif
 #if defined(PIN_PB4)
         pin_pb4     = 0x44,
         pin_pb5     = 0x45,
@@ -1122,10 +1129,12 @@ namespace event {
         pin_pa5     = 0x45,
         pin_pa6     = 0x46,
         pin_pa7     = 0x47,
+#if defined(PIN_PB0)
         pin_pb0     = 0x40,
         pin_pb1     = 0x41,
         pin_pb2     = 0x42,
         pin_pb3     = 0x43,
+#endif
 #if defined(PIN_PB4)
         pin_pb4     = 0x44,
         pin_pb5     = 0x45,
@@ -1200,10 +1209,12 @@ namespace event {
         rtc_div4096 = 0x09,
         rtc_div2048 = 0x0A,
         rtc_div1024 = 0x0B,
+#if defined(PIN_PB0)
         pin_pb0     = 0x40,
         pin_pb1     = 0x41,
         pin_pb2     = 0x42,
         pin_pb3     = 0x43,
+#endif
 #if defined(PIN_PB4)
         pin_pb4     = 0x44,
         pin_pb5     = 0x45,
@@ -1232,10 +1243,12 @@ namespace event {
         rtc_div256  = 0x09,
         rtc_div128  = 0x0A,
         rtc_div64   = 0x0B,
+#if defined(PIN_PB0)
         pin_pb0     = 0x40,
         pin_pb1     = 0x41,
         pin_pb2     = 0x42,
         pin_pb3     = 0x43,
+#endif
 #if defined(PIN_PB4)
         pin_pb4     = 0x44,
         pin_pb5     = 0x45,
@@ -1271,7 +1284,9 @@ namespace event {
         adc0_start              = 0x08,
         evouta_pin_pa2          = 0x09,
         evouta_pin_pa7          = 0x89,
+#if defined(PIN_PB2)
         evoutb_pin_pb2          = 0x0A,
+#endif
 #if defined(PIN_PB7)
         evoutb_pin_pb7          = 0x8A,
 #endif
@@ -1368,27 +1383,27 @@ namespace event {
        * and only parts with 20/24 pins, or the 1614 have any items on this list available
        * since it's all PORTC or the second and third AC.
        */
-#if defined(TINY_1_16K_PLUS) || defined(PIN_PC0)
+  #if defined(TINY_1_16K_PLUS) || defined(PIN_PC0)
       #define HAS_SEPARATE_GEN4
       namespace gen4 {
         enum generator_t : uint8_t {
-#if defined(PIN_PC0)
+    #if defined(PIN_PC0)
           pin_pc0      = 0x0A,
           pin_pc1      = 0x0B,
           pin_pc2      = 0x0C,
           pin_pc3      = 0x0D,
-#endif
-#if defined(PIN_PC4)
+    #endif
+    #if defined(PIN_PC4)
           pin_pc4      = 0x0E,
           pin_pc5      = 0x0F,
-#endif
-#if defined(TINY_1_16K_PLUS)
+    #endif
+    #if defined(TINY_1_16K_PLUS)
           ac1_out      = 0x10,
           ac2_out      = 0x11,
-#endif
+    #endif
         };
       };
-#endif
+  #endif
     namespace gen5 {
       enum generator_t : uint8_t {
         rtc_div8192       = 0x0A,