diff --git a/lighthub/dmx.cpp b/lighthub/dmx.cpp
index d604985..9e6ad0c 100644
--- a/lighthub/dmx.cpp
+++ b/lighthub/dmx.cpp
@@ -23,7 +23,7 @@ e-mail    anklimov@gmail.com
 #include "options.h"
 
 #ifdef _dmxin
-#if defined(__AVR__)
+#if defined(ARDUINO_ARCH_AVR)
 #include <DMXSerial.h>
 #endif
 #endif
@@ -207,7 +207,7 @@ void DMXinSetup(int channels)
 
 #if defined(_dmxin)
    DMXin = new uint8_t [channels];
-#if defined(__AVR__)
+#if defined(ARDUINO_ARCH_AVR)
    DMXSerial.init(DMXReceiver,0,channels);
     if (DMXSerial.getBuffer()) {Serial.print(F("Init in ch:"));Serial.println(channels);} else Serial.println(F("DMXin Buffer alloc err"));
    //DMXSerial.maxChannel(channels);
@@ -230,7 +230,7 @@ dmxin.begin();
 void DMXoutSetup(int channels)
 {
 #ifdef _dmxout
-#if defined(__AVR__)
+#if defined(ARDUINO_ARCH_AVR)
  DmxSimple.usePin(AVR_DMXOUT_PIN);
  DmxSimple.maxChannel(channels);
 #endif
diff --git a/lighthub/dmx.h b/lighthub/dmx.h
index f879b16..387aaa7 100644
--- a/lighthub/dmx.h
+++ b/lighthub/dmx.h
@@ -33,7 +33,7 @@ e-mail    anklimov@gmail.com
 
 #if defined(_dmxout)
 
-#if defined(__AVR__)
+#if defined(ARDUINO_ARCH_AVR)
 #include <DmxSimple.h>
 #define DmxWrite DmxSimple.write
 #endif
@@ -56,7 +56,7 @@ extern Artnet *artnet;
 #endif
 
 #ifdef _dmxin
-#if defined(__AVR__)
+#if defined(ARDUINO_ARCH_AVR)
 #include <DMXSerial.h>
 #endif
 #endif
diff --git a/lighthub/inputs.cpp b/lighthub/inputs.cpp
index 6b8fd25..31aed83 100644
--- a/lighthub/inputs.cpp
+++ b/lighthub/inputs.cpp
@@ -37,7 +37,7 @@ extern PubSubClient mqttClient;
 #ifndef DHT_COUNTER_DISABLE
 static volatile unsigned long nextPollMillisValue[5];
 static volatile int nextPollMillisPin[5] = {0,0,0,0,0};
-#if defined(__AVR__)
+#if defined(ARDUINO_ARCH_AVR)
 static volatile long counter_value[6];
 #endif
 
@@ -127,7 +127,7 @@ void Input::counterPoll() {
     if(nextPollTime()>millis())
         return;
     if (store->logicState == 0) {
-#if defined(__AVR__)
+#if defined(ARDUINO_ARCH_AVR)
 #define interrupt_number pin
         if (interrupt_number >= 0 && interrupt_number < 6) {
             const short mega_interrupt_array[6] = {2, 3, 21, 20, 19, 18};
@@ -171,7 +171,7 @@ void Input::counterPoll() {
 void Input::attachInterruptPinIrq(int realPin, int irq) {
     pinMode(realPin, INPUT);
     int real_irq;
-#if defined(__AVR__)
+#if defined(ARDUINO_ARCH_AVR)
     real_irq = irq;
 #endif
 #if defined(__SAM3X8E__)
@@ -293,7 +293,7 @@ void Input::onCounterChanged(int i) {
     counter_value[counter_irq_map[i]]++;
 #endif
 
-#if defined(__AVR__)
+#if defined(ARDUINO_ARCH_AVR)
     counter_value[i]++;
 #endif
 }
@@ -326,7 +326,7 @@ void Input::contactPoll() {
 #if defined(ARDUINO_ARCH_STM32F1)
      WiringPinMode inputPinMode;
 #endif
-#if defined(__SAM3X8E__)||defined(__AVR__)||defined(ARDUINO_ARCH_ESP8266)||defined(ARDUINO_ARCH_ESP32)
+#if defined(__SAM3X8E__)||defined(ARDUINO_ARCH_AVR)||defined(ARDUINO_ARCH_ESP8266)||defined(ARDUINO_ARCH_ESP32)
      uint32_t inputPinMode;
 #endif
 
diff --git a/lighthub/main.cpp b/lighthub/main.cpp
index 90abec1..2b1dbd6 100644
--- a/lighthub/main.cpp
+++ b/lighthub/main.cpp
@@ -76,7 +76,7 @@ DueFlashStorage EEPROM;
 EthernetClient ethClient;
 #endif
 
-#if defined(__AVR__)
+#if defined(ARDUINO_ARCH_AVR)
 EthernetClient ethClient;
 #endif
 
@@ -286,7 +286,7 @@ lan_status lanLoop() {
 
 
     {
-#if defined(__AVR__) || defined(__SAM3X8E__)
+#if defined(ARDUINO_ARCH_AVR) || defined(__SAM3X8E__)
         wdt_dis();
         if (lanStatus > 0)
             switch (Ethernet.maintain()) {
@@ -456,7 +456,7 @@ void onInitialStateInitLAN() {
     }
 #endif
 
-#if defined(__AVR__) || defined(__SAM3X8E__)||defined(ARDUINO_ARCH_STM32F1)
+#if defined(ARDUINO_ARCH_AVR) || defined(__SAM3X8E__)||defined(ARDUINO_ARCH_STM32F1)
 #ifdef W5500_CS_PIN
     Ethernet.w5500_cspin = W5500_CS_PIN;
     debugSerial<<F("Use W5500 pin: "));
@@ -487,7 +487,7 @@ void onInitialStateInitLAN() {
     else {
         debugSerial<<"\nNo IP data found in flash\n";
         wdt_dis();
-#if defined(__AVR__) || defined(__SAM3X8E__)
+#if defined(ARDUINO_ARCH_AVR) || defined(__SAM3X8E__)
         res = Ethernet.begin(mac, 12000);
 #endif
 #if defined(ARDUINO_ARCH_STM32F1)
@@ -519,7 +519,7 @@ void softRebootFunc() {
 }
 #endif
 
-#if defined(__AVR__) || defined(__SAM3X8E__)
+#if defined(ARDUINO_ARCH_AVR) || defined(__SAM3X8E__)
 void (*softRebootFunc)(void) = 0;
 
 void printCurentLanConfig();
@@ -908,7 +908,7 @@ lan_status loadConfigFromHttp(int arg_cnt, char **args)
 #endif
     debugSerial<<F("Config URI: http://")<<configServer<<URI<<eol;
 
-#if defined(__AVR__)
+#if defined(ARDUINO_ARCH_AVR)
     FILE *configStream;
     //byte hserver[] = { 192,168,88,2 };
     wdt_dis();
diff --git a/lighthub/main.h b/lighthub/main.h
index b47984c..65d4e9d 100644
--- a/lighthub/main.h
+++ b/lighthub/main.h
@@ -34,7 +34,7 @@
 //#define wdt_en()
 //#define wdt_dis()
 //#endif
-#if defined(__AVR__)
+#if defined(ARDUINO_ARCH_AVR)
 #if defined(WATCH_DOG_TICKER_DISABLE)
 #define wdt_en() wdt_disable()
 #define wdt_dis() wdt_disable()
@@ -75,7 +75,7 @@
 #include <ArduinoHttpClient.h>
 #endif
 
-#if defined(__AVR__)
+#if defined(ARDUINO_ARCH_AVR)
 #include "HTTPClient.h"
 #include <avr/pgmspace.h>
 #include <avr/wdt.h>
@@ -104,7 +104,7 @@
 
 #endif
 
-#if defined(__AVR__) || defined(__SAM3X8E__) || defined(ESP8266)
+#if defined(ARDUINO_ARCH_AVR) || defined(__SAM3X8E__) || defined(ESP8266)
 #ifdef Wiz5500
 #include <Ethernet2.h>
 #else
diff --git a/lighthub/options.h b/lighthub/options.h
index 9fc627b..31ad60f 100644
--- a/lighthub/options.h
+++ b/lighthub/options.h
@@ -95,7 +95,7 @@
 #define LAN_INIT_DELAY 500
 #endif
 
-#if defined(__AVR__)
+#if defined(ARDUINO_ARCH_AVR)
 //All options available
 #ifdef CONTROLLINO
 #define modbusSerial Serial3
diff --git a/lighthub/utils.cpp b/lighthub/utils.cpp
index feb1351..db88ab5 100644
--- a/lighthub/utils.cpp
+++ b/lighthub/utils.cpp
@@ -86,7 +86,7 @@ unsigned long freeRam ()
 {return system_get_free_heap_size();}
 #endif
 
-#if defined(__AVR__)
+#if defined(ARDUINO_ARCH_AVR)
 unsigned long freeRam ()
 {
   extern int __heap_start, *__brkval;
@@ -141,7 +141,7 @@ void printFloatValueToStr(float value, char *valstr) {
     #if defined(ESP8266) || defined(ARDUINO_ARCH_ESP32)
     sprintf(valstr, "%2.1f", value);
     #endif
-    #if defined(__AVR__)
+    #if defined(ARDUINO_ARCH_AVR)
     sprintf(valstr, "%d", (int)value);
     int fractional = 10.0*((float)abs(value)-(float)abs((int)value));
     int val_len =strlen(valstr);