Prevent classes defined in UNO_Compat.h (DDRBClass, PORTBClass, ...) from being visible when ATMEGA328P compatibility mode is not selected. Otherwise it multiple definition errors arise when having the Arduino Nano 4809 compatibility mode enabled (-DAVR_NANO_4809_328MODE)

Author: aentinger

cores/arduino/UNO_compat.cpp

@@ -13,10 +13,10 @@
   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 */
 
-#ifdef UNO_WIFI_REV2_328MODE
-
 #include "UNO_compat.h"
 
+#ifdef UNO_WIFI_REV2_328MODE
+
 #warning "ATMEGA328 registers emulation is enabled. You may encounter some speed issue. Please consider to disable it in the Tools menu"
 
 PORTBClass PORTB;
@@ -27,4 +27,4 @@ DDRBClass DDRB;
 DDRCClass DDRC;
 DDRDClass DDRD;
 
-#endif
+#endif /* #ifdef UNO_WIFI_REV2_328MODE */

cores/arduino/UNO_compat.h

@@ -16,6 +16,8 @@
 #pragma once
 #include "Arduino.h"
 
+#ifdef UNO_WIFI_REV2_328MODE
+
 /*
   ARDUINO PIN  ATMEGA 328  ATMEGA 4809
   0            PD0         PC5
@@ -283,3 +285,5 @@ extern PORTDClass PORTD;
 extern DDRBClass DDRB;
 extern DDRCClass DDRC;
 extern DDRDClass DDRD;
+
+#endif /* #ifdef UNO_WIFI_REV2_328MODE */