Merge pull request #148 from wangxiangwangeuse/master

fixed some bugs
HelTecAutomation · May 8, 2024 · 549b403 · 549b403
2 parents 3dd5262 + 97b88b7
commit 549b403
Show file tree

Hide file tree

Showing 20 changed files with 26 additions and 123 deletions.
diff --git a/examples/Factory_Test/Wireless_Paper_V1.0_FactoryTest/Wireless_Paper_V1.0_FactoryTest.ino b/examples/Factory_Test/Wireless_Paper_V1.0_FactoryTest/Wireless_Paper_V1.0_FactoryTest.ino
@@ -349,28 +349,17 @@ void loop()
     VextOFF();
     Radio.Sleep();
     SPI.end();
-    Serial.printf("1");
      pinMode(RADIO_DIO_1, ANALOG);
       digitalWrite(RADIO_NSS, HIGH);
-     gpio_hold_en((gpio_num_t)RADIO_NSS);
-//  pinMode(RADIO_NSS, ANALOG);
-//    digitalWrite(RADIO_NSS, HIGH);
+    //  gpio_hold_en((gpio_num_t)RADIO_NSS);
+ pinMode(RADIO_NSS, ANALOG);
+   digitalWrite(RADIO_NSS, HIGH);
 
   pinMode(RADIO_RESET, ANALOG); 
   pinMode(RADIO_BUSY, ANALOG);
   pinMode(LORA_CLK, ANALOG);
   pinMode(LORA_MISO, ANALOG);
   pinMode(LORA_MOSI, ANALOG);
-//    pinMode(2, ANALOG);
-//    pinMode(3, ANALOG);
-//    pinMode(4, ANALOG);
-//    pinMode(5, ANALOG);
-//    pinMode(6, ANALOG);
-//    pinMode(7, ANALOG);
-//    pinMode(43, ANALOG);
-//    pinMode(44, ANALOG);
-//    pinMode(47, ANALOG);
-//    pinMode(48, ANALOG);
 
     esp_sleep_enable_timer_wakeup(600 * 1000 * (uint64_t)1000);
   esp_sleep_pd_config(ESP_PD_DOMAIN_RTC_PERIPH, ESP_PD_OPTION_OFF);

diff --git a/examples/Factory_Test/Wireless_Paper_V1.1_FactoryTest/Wireless_Paper_V1.1_FactoryTest.ino b/examples/Factory_Test/Wireless_Paper_V1.1_FactoryTest/Wireless_Paper_V1.1_FactoryTest.ino
@@ -166,29 +166,8 @@ int i=0;
           pix ^= 0x0F;
 
           i++;
-          /* Convert rgb color to gray scale
-          memcpy(rgb_color, src, 3);
-          src += 3;
-            gs_clr = (GS_FACT_R * rgb_color[0]) + (GS_FACT_G * rgb_color[1]) + (GS_FACT_B * rgb_color[2]);
-            if (gs_clr > 255) gs_clr = 255;
-            // Use only 4 bits & invert
-            //pix = ((uint8_t)gs_clr >> 4) ^ 0x0F;
-            pix = (uint8_t)gs_clr;
-
-            // Using gray scale lookup table
-            last_lvl = 0;
-            i = 0;
-            for (i=0; i<16; i++) {
-              if ((pix > last_lvl) && (pix <= lvl_buf_jpg[i])) {
-                pix = 15 - i;
-                  last_lvl = lvl_buf[i];
-                  break;
-                }
-                last_lvl = lvl_buf[i];
-            }
-          */
+
             get_buff[i] = pix;
-//            gs_used_shades |= (1 << pix);
         }
         else src += 3; // skip
       }
@@ -406,28 +385,18 @@ void loop()
     VextOFF();
     Radio.Sleep();
     SPI.end();
-    Serial.printf("1");
     pinMode(RADIO_DIO_1, ANALOG);
     digitalWrite(RADIO_NSS, HIGH);
-    gpio_hold_en((gpio_num_t)RADIO_NSS);
-    //  pinMode(RADIO_NSS, ANALOG);
-    //    digitalWrite(RADIO_NSS, HIGH);
+    // gpio_hold_en((gpio_num_t)RADIO_NSS);
+     pinMode(RADIO_NSS, ANALOG);
+       digitalWrite(RADIO_NSS, HIGH);
 
     pinMode(RADIO_RESET, ANALOG);
     pinMode(RADIO_BUSY, ANALOG);
     pinMode(LORA_CLK, ANALOG);
     pinMode(LORA_MISO, ANALOG);
     pinMode(LORA_MOSI, ANALOG);
-    //    pinMode(2, ANALOG);
-    //    pinMode(3, ANALOG);
-    //    pinMode(4, ANALOG);
-    //    pinMode(5, ANALOG);
-    //    pinMode(6, ANALOG);
-    //    pinMode(7, ANALOG);
-    //    pinMode(43, ANALOG);
-    //    pinMode(44, ANALOG);
-    //    pinMode(47, ANALOG);
-    //    pinMode(48, ANALOG);
+
 
     esp_sleep_enable_timer_wakeup(600 * 1000 * (uint64_t)1000);
     esp_sleep_pd_config(ESP_PD_DOMAIN_RTC_PERIPH, ESP_PD_OPTION_OFF);

diff --git a/src/LoRaWan_APP.cpp b/src/LoRaWan_APP.cpp
@@ -1,7 +1,4 @@
-#if defined(WIFI_LORA_32_V3)||defined(WIFI_LORA_32_V2)||defined(WIFI_LORA_32)\
-||defined(WIRELESS_TRACKER)||defined(WIRELESS_STICK_V3)||defined(WIRELESS_STICK_LITE_V3)\
-||defined(WIRELESS_PAPER)||defined(CAPSULE_SENSOR_V3)||defined(WIRELESS_SHELL_V3)||defined(WIRELESS_BRIDGE)\
-||defined(WIRELESS_MINI_SHELL)||defined(Wireless_Stick)
+#if defined(WIFI_LORA_32_V3)||defined(WIFI_LORA_32_V2)||defined(WIFI_LORA_32)||defined(WIRELESS_TRACKER)||defined(WIRELESS_STICK_V3)||defined(WIRELESS_STICK_LITE_V3)||defined(WIRELESS_PAPER)||defined(CAPSULE_SENSOR_V3)||defined(WIRELESS_SHELL_V3)
 
 
 #include <LoRaWan_APP.h>

diff --git a/src/driver/board-config.h b/src/driver/board-config.h
@@ -31,10 +31,6 @@
  * \author    Johannes Bruder ( STACKFORCE )
  */
 
-#if defined(WIFI_LORA_32_V3)||defined(WIFI_LORA_32_V2)||defined(WIFI_LORA_32)\
-||defined(WIRELESS_TRACKER)||defined(WIRELESS_STICK_V3)||defined(WIRELESS_STICK_LITE_V3)\
-||defined(WIRELESS_PAPER)||defined(CAPSULE_SENSOR_V3)||defined(WIRELESS_SHELL_V3)||defined(WIRELESS_BRIDGE)\
-||defined(WIRELESS_MINI_SHELL)||defined(Wireless_Stick)
 
 #ifndef __BOARD_CONFIG_H__
 #define __BOARD_CONFIG_H__
@@ -101,4 +97,3 @@
 
 
 #endif // __BOARD_CONFIG_H__
-#endif
diff --git a/src/driver/board.c b/src/driver/board.c
@@ -15,10 +15,7 @@ Maintainer: Miguel Luis and Gregory Cristian
 
 
 
-#if defined(WIFI_LORA_32_V3)||defined(WIFI_LORA_32_V2)||defined(WIFI_LORA_32)\
-||defined(WIRELESS_TRACKER)||defined(WIRELESS_STICK_V3)||defined(WIRELESS_STICK_LITE_V3)\
-||defined(WIRELESS_PAPER)||defined(CAPSULE_SENSOR_V3)||defined(WIRELESS_SHELL_V3)||defined(WIRELESS_BRIDGE)\
-||defined(WIRELESS_MINI_SHELL)||defined(Wireless_Stick)
+#if defined(WIFI_LORA_32_V3)||defined(WIFI_LORA_32_V2)||defined(WIRELESS_TRACKER)||defined(WIRELESS_STICK_V3)||defined(WIRELESS_STICK_LITE_V3)||defined(WIRELESS_PAPER)||defined(CAPSULE_SENSOR_V3)||defined(WIRELESS_SHELL_V3)
 
 #include "../driver/board.h"
 #include "Arduino.h"

diff --git a/src/driver/gpio-board.c b/src/driver/gpio-board.c
@@ -20,10 +20,7 @@
  *
  * \author    Gregory Cristian ( Semtech )
  */
-#if defined(WIFI_LORA_32_V3)||defined(WIFI_LORA_32_V2)||defined(WIFI_LORA_32)\
-||defined(WIRELESS_TRACKER)||defined(WIRELESS_STICK_V3)||defined(WIRELESS_STICK_LITE_V3)\
-||defined(WIRELESS_PAPER)||defined(CAPSULE_SENSOR_V3)||defined(WIRELESS_SHELL_V3)||defined(WIRELESS_BRIDGE)\
-||defined(WIRELESS_MINI_SHELL)||defined(Wireless_Stick)
+#if defined(WIFI_LORA_32_V3)||defined(WIFI_LORA_32_V2)||defined(WIRELESS_TRACKER)||defined(WIRELESS_STICK_V3)||defined(WIRELESS_STICK_LITE_V3)||defined(WIRELESS_PAPER)||defined(CAPSULE_SENSOR_V3)||defined(WIRELESS_SHELL_V3)
 
 
 #include "../loramac/utilities.h"

diff --git a/src/driver/gpio.c b/src/driver/gpio.c
@@ -24,10 +24,7 @@
  *
  * \author    Gregory Cristian ( Semtech )
  */
-#if defined(WIFI_LORA_32_V3)||defined(WIFI_LORA_32_V2)||defined(WIFI_LORA_32)\
-||defined(WIRELESS_TRACKER)||defined(WIRELESS_STICK_V3)||defined(WIRELESS_STICK_LITE_V3)\
-||defined(WIRELESS_PAPER)||defined(CAPSULE_SENSOR_V3)||defined(WIRELESS_SHELL_V3)||defined(WIRELESS_BRIDGE)\
-||defined(WIRELESS_MINI_SHELL)||defined(Wireless_Stick)
+#if defined(WIFI_LORA_32_V3)||defined(WIFI_LORA_32_V2)||defined(WIRELESS_TRACKER)||defined(WIRELESS_STICK_V3)||defined(WIRELESS_STICK_LITE_V3)||defined(WIRELESS_PAPER)||defined(CAPSULE_SENSOR_V3)||defined(WIRELESS_SHELL_V3)
 
 #include "../driver/gpio-board.h"
 

diff --git a/src/driver/timer.h b/src/driver/timer.h
@@ -39,7 +39,7 @@
 /* Includes ------------------------------------------------------------------*/
 
 #include <stdbool.h>     
-#if defined(WIFI_LORA_32_V3)||defined(WIRELESS_TRACKER)||defined(WIRELESS_STICK_V3)||defined(WIRELESS_STICK_LITE_V3)||defined(WIRELESS_PAPER)||defined(CAPSULE_SENSOR_V3)||defined(WIRELESS_SHELL_V3)
+#if defined(WIFI_LORA_32_V3)||defined(WIFI_LORA_32_V2)||defined(WIRELESS_TRACKER)||defined(WIRELESS_STICK_V3)||defined(WIRELESS_STICK_LITE_V3)||defined(WIRELESS_PAPER)||defined(CAPSULE_SENSOR_V3)||defined(WIRELESS_SHELL_V3)
 
 #include "../loramac/utilities.h"
 #endif

diff --git a/src/loramac/LoRaMac.c b/src/loramac/LoRaMac.c
@@ -22,7 +22,7 @@ License: Revised BSD License, see LICENSE.TXT file include in the project
 Maintainer: Miguel Luis ( Semtech ), Gregory Cristian ( Semtech ) and Daniel Jaeckle ( STACKFORCE )
 */
 
-#if defined(WIFI_LORA_32_V3)||defined(WIRELESS_TRACKER)||defined(WIRELESS_STICK_V3)||defined(WIRELESS_STICK_LITE_V3)||defined(WIRELESS_PAPER)||defined(CAPSULE_SENSOR_V3)||defined(WIRELESS_SHELL_V3)
+#if defined(WIFI_LORA_32_V3)||defined(WIFI_LORA_32_V2)||defined(WIRELESS_TRACKER)||defined(WIRELESS_STICK_V3)||defined(WIRELESS_STICK_LITE_V3)||defined(WIRELESS_PAPER)||defined(CAPSULE_SENSOR_V3)||defined(WIRELESS_SHELL_V3)
 
 #include <stdbool.h>
 #include <string.h>

diff --git a/src/loramac/region/Region.c b/src/loramac/region/Region.c
@@ -21,7 +21,7 @@ License: Revised BSD License, see LICENSE.TXT file include in the project
 
 Maintainer: Miguel Luis ( Semtech ), Gregory Cristian ( Semtech ) and Daniel Jaeckle ( STACKFORCE )
 */
-#if defined(WIFI_LORA_32_V3)||defined(WIRELESS_TRACKER)||defined(WIRELESS_STICK_V3)||defined(WIRELESS_STICK_LITE_V3)||defined(WIRELESS_PAPER)||defined(CAPSULE_SENSOR_V3)||defined(WIRELESS_SHELL_V3)
+#if defined(WIFI_LORA_32_V3)||defined(WIFI_LORA_32_V2)||defined(WIRELESS_TRACKER)||defined(WIRELESS_STICK_V3)||defined(WIRELESS_STICK_LITE_V3)||defined(WIRELESS_PAPER)||defined(CAPSULE_SENSOR_V3)||defined(WIRELESS_SHELL_V3)
 
 
 #include <stdbool.h>

diff --git a/src/loramac/region/RegionAS923.c b/src/loramac/region/RegionAS923.c
@@ -21,10 +21,8 @@ License: Revised BSD License, see LICENSE.TXT file include in the project
 
 Maintainer: Miguel Luis ( Semtech ), Gregory Cristian ( Semtech ) and Daniel Jaeckle ( STACKFORCE )
 */
-#if defined(WIFI_LORA_32_V3)||defined(WIFI_LORA_32_V2)||defined(WIFI_LORA_32)\
-||defined(WIRELESS_TRACKER)||defined(WIRELESS_STICK_V3)||defined(WIRELESS_STICK_LITE_V3)\
-||defined(WIRELESS_PAPER)||defined(CAPSULE_SENSOR_V3)||defined(WIRELESS_SHELL_V3)||defined(WIRELESS_BRIDGE)\
-||defined(WIRELESS_MINI_SHELL)||defined(Wireless_Stick)
+#if defined(WIFI_LORA_32_V3)||defined(WIFI_LORA_32_V2)||defined(WIRELESS_TRACKER)||defined(WIRELESS_STICK_V3)||defined(WIRELESS_STICK_LITE_V3)||defined(WIRELESS_PAPER)||defined(CAPSULE_SENSOR_V3)||defined(WIRELESS_SHELL_V3)
+
 #include <stdbool.h>
 #include <string.h>
 #include <stdint.h>

diff --git a/src/loramac/region/RegionAU915.c b/src/loramac/region/RegionAU915.c
@@ -21,11 +21,7 @@ License: Revised BSD License, see LICENSE.TXT file include in the project
 
 Maintainer: Miguel Luis ( Semtech ), Gregory Cristian ( Semtech ) and Daniel Jaeckle ( STACKFORCE )
 */
-#if defined(WIFI_LORA_32_V3)||defined(WIFI_LORA_32_V2)||defined(WIFI_LORA_32)\
-||defined(WIRELESS_TRACKER)||defined(WIRELESS_STICK_V3)||defined(WIRELESS_STICK_LITE_V3)\
-||defined(WIRELESS_PAPER)||defined(CAPSULE_SENSOR_V3)||defined(WIRELESS_SHELL_V3)||defined(WIRELESS_BRIDGE)\
-||defined(WIRELESS_MINI_SHELL)||defined(Wireless_Stick)
-
+#if defined(WIFI_LORA_32_V3)||defined(WIFI_LORA_32_V2)||defined(WIRELESS_TRACKER)||defined(WIRELESS_STICK_V3)||defined(WIRELESS_STICK_LITE_V3)||defined(WIRELESS_PAPER)||defined(CAPSULE_SENSOR_V3)||defined(WIRELESS_SHELL_V3)
 #include <stdbool.h>
 #include <string.h>
 #include <stdint.h>

diff --git a/src/loramac/region/RegionCN470.c b/src/loramac/region/RegionCN470.c
@@ -22,11 +22,7 @@ License: Revised BSD License, see LICENSE.TXT file include in the project
 Maintainer: Miguel Luis ( Semtech ), Gregory Cristian ( Semtech ) and Daniel Jaeckle ( STACKFORCE )
 */
 
-#if defined(WIFI_LORA_32_V3)||defined(WIFI_LORA_32_V2)||defined(WIFI_LORA_32)\
-||defined(WIRELESS_TRACKER)||defined(WIRELESS_STICK_V3)||defined(WIRELESS_STICK_LITE_V3)\
-||defined(WIRELESS_PAPER)||defined(CAPSULE_SENSOR_V3)||defined(WIRELESS_SHELL_V3)||defined(WIRELESS_BRIDGE)\
-||defined(WIRELESS_MINI_SHELL)||defined(Wireless_Stick)
-
+#if defined(WIFI_LORA_32_V3)||defined(WIFI_LORA_32_V2)||defined(WIRELESS_TRACKER)||defined(WIRELESS_STICK_V3)||defined(WIRELESS_STICK_LITE_V3)||defined(WIRELESS_PAPER)||defined(CAPSULE_SENSOR_V3)||defined(WIRELESS_SHELL_V3)
 #include <stdbool.h>
 #include <string.h>
 #include <stdint.h>

diff --git a/src/loramac/region/RegionCN779.c b/src/loramac/region/RegionCN779.c
@@ -21,10 +21,7 @@ License: Revised BSD License, see LICENSE.TXT file include in the project
 
 Maintainer: Miguel Luis ( Semtech ), Gregory Cristian ( Semtech ) and Daniel Jaeckle ( STACKFORCE )
 */
-#if defined(WIFI_LORA_32_V3)||defined(WIFI_LORA_32_V2)||defined(WIFI_LORA_32)\
-||defined(WIRELESS_TRACKER)||defined(WIRELESS_STICK_V3)||defined(WIRELESS_STICK_LITE_V3)\
-||defined(WIRELESS_PAPER)||defined(CAPSULE_SENSOR_V3)||defined(WIRELESS_SHELL_V3)||defined(WIRELESS_BRIDGE)\
-||defined(WIRELESS_MINI_SHELL)||defined(Wireless_Stick)
+#if defined(WIFI_LORA_32_V3)||defined(WIFI_LORA_32_V2)||defined(WIRELESS_TRACKER)||defined(WIRELESS_STICK_V3)||defined(WIRELESS_STICK_LITE_V3)||defined(WIRELESS_PAPER)||defined(CAPSULE_SENSOR_V3)||defined(WIRELESS_SHELL_V3)
 
 #include <stdbool.h>
 #include <string.h>

diff --git a/src/loramac/region/RegionEU433.c b/src/loramac/region/RegionEU433.c
@@ -22,11 +22,7 @@ License: Revised BSD License, see LICENSE.TXT file include in the project
 Maintainer: Miguel Luis ( Semtech ), Gregory Cristian ( Semtech ) and Daniel Jaeckle ( STACKFORCE )
 */
 
-#if defined(WIFI_LORA_32_V3)||defined(WIFI_LORA_32_V2)||defined(WIFI_LORA_32)\
-||defined(WIRELESS_TRACKER)||defined(WIRELESS_STICK_V3)||defined(WIRELESS_STICK_LITE_V3)\
-||defined(WIRELESS_PAPER)||defined(CAPSULE_SENSOR_V3)||defined(WIRELESS_SHELL_V3)||defined(WIRELESS_BRIDGE)\
-||defined(WIRELESS_MINI_SHELL)||defined(Wireless_Stick)
-
+#if defined(WIFI_LORA_32_V3)||defined(WIFI_LORA_32_V2)||defined(WIRELESS_TRACKER)||defined(WIRELESS_STICK_V3)||defined(WIRELESS_STICK_LITE_V3)||defined(WIRELESS_PAPER)||defined(CAPSULE_SENSOR_V3)||defined(WIRELESS_SHELL_V3)
 #include <stdbool.h>
 #include <string.h>
 #include <stdint.h>

diff --git a/src/loramac/region/RegionEU868.c b/src/loramac/region/RegionEU868.c
@@ -22,11 +22,7 @@ License: Revised BSD License, see LICENSE.TXT file include in the project
 Maintainer: Miguel Luis ( Semtech ), Gregory Cristian ( Semtech ) and Daniel Jaeckle ( STACKFORCE )
 */
 
-#if defined(WIFI_LORA_32_V3)||defined(WIFI_LORA_32_V2)||defined(WIFI_LORA_32)\
-||defined(WIRELESS_TRACKER)||defined(WIRELESS_STICK_V3)||defined(WIRELESS_STICK_LITE_V3)\
-||defined(WIRELESS_PAPER)||defined(CAPSULE_SENSOR_V3)||defined(WIRELESS_SHELL_V3)||defined(WIRELESS_BRIDGE)\
-||defined(WIRELESS_MINI_SHELL)||defined(Wireless_Stick)
-
+#if defined(WIFI_LORA_32_V3)||defined(WIFI_LORA_32_V2)||defined(WIRELESS_TRACKER)||defined(WIRELESS_STICK_V3)||defined(WIRELESS_STICK_LITE_V3)||defined(WIRELESS_PAPER)||defined(CAPSULE_SENSOR_V3)||defined(WIRELESS_SHELL_V3)
 #include <stdbool.h>
 #include <string.h>
 #include <stdint.h>

diff --git a/src/loramac/region/RegionIN865.c b/src/loramac/region/RegionIN865.c
@@ -21,11 +21,7 @@ License: Revised BSD License, see LICENSE.TXT file include in the project
 
 Maintainer: Miguel Luis ( Semtech ), Gregory Cristian ( Semtech ) and Daniel Jaeckle ( STACKFORCE )
 */
-#if defined(WIFI_LORA_32_V3)||defined(WIFI_LORA_32_V2)||defined(WIFI_LORA_32)\
-||defined(WIRELESS_TRACKER)||defined(WIRELESS_STICK_V3)||defined(WIRELESS_STICK_LITE_V3)\
-||defined(WIRELESS_PAPER)||defined(CAPSULE_SENSOR_V3)||defined(WIRELESS_SHELL_V3)||defined(WIRELESS_BRIDGE)\
-||defined(WIRELESS_MINI_SHELL)||defined(Wireless_Stick)
-
+#if defined(WIFI_LORA_32_V3)||defined(WIFI_LORA_32_V2)||defined(WIRELESS_TRACKER)||defined(WIRELESS_STICK_V3)||defined(WIRELESS_STICK_LITE_V3)||defined(WIRELESS_PAPER)||defined(CAPSULE_SENSOR_V3)||defined(WIRELESS_SHELL_V3)
 #include <stdbool.h>
 #include <string.h>
 #include <stdint.h>

diff --git a/src/loramac/region/RegionKR920.c b/src/loramac/region/RegionKR920.c
@@ -21,11 +21,7 @@ License: Revised BSD License, see LICENSE.TXT file include in the project
 
 Maintainer: Miguel Luis ( Semtech ), Gregory Cristian ( Semtech ) and Daniel Jaeckle ( STACKFORCE )
 */
-#if defined(WIFI_LORA_32_V3)||defined(WIFI_LORA_32_V2)||defined(WIFI_LORA_32)\
-||defined(WIRELESS_TRACKER)||defined(WIRELESS_STICK_V3)||defined(WIRELESS_STICK_LITE_V3)\
-||defined(WIRELESS_PAPER)||defined(CAPSULE_SENSOR_V3)||defined(WIRELESS_SHELL_V3)||defined(WIRELESS_BRIDGE)\
-||defined(WIRELESS_MINI_SHELL)||defined(Wireless_Stick)
-
+#if defined(WIFI_LORA_32_V3)||defined(WIFI_LORA_32_V2)||defined(WIRELESS_TRACKER)||defined(WIRELESS_STICK_V3)||defined(WIRELESS_STICK_LITE_V3)||defined(WIRELESS_PAPER)||defined(CAPSULE_SENSOR_V3)||defined(WIRELESS_SHELL_V3)
 #include <stdbool.h>
 #include <string.h>
 #include <stdint.h>

diff --git a/src/loramac/region/RegionUS915-Hybrid.c b/src/loramac/region/RegionUS915-Hybrid.c
@@ -21,11 +21,7 @@ License: Revised BSD License, see LICENSE.TXT file include in the project
 
 Maintainer: Miguel Luis ( Semtech ), Gregory Cristian ( Semtech ) and Daniel Jaeckle ( STACKFORCE )
 */
-#if defined(WIFI_LORA_32_V3)||defined(WIFI_LORA_32_V2)||defined(WIFI_LORA_32)\
-||defined(WIRELESS_TRACKER)||defined(WIRELESS_STICK_V3)||defined(WIRELESS_STICK_LITE_V3)\
-||defined(WIRELESS_PAPER)||defined(CAPSULE_SENSOR_V3)||defined(WIRELESS_SHELL_V3)||defined(WIRELESS_BRIDGE)\
-||defined(WIRELESS_MINI_SHELL)||defined(Wireless_Stick)
-
+#if defined(WIFI_LORA_32_V3)||defined(WIFI_LORA_32_V2)||defined(WIRELESS_TRACKER)||defined(WIRELESS_STICK_V3)||defined(WIRELESS_STICK_LITE_V3)||defined(WIRELESS_PAPER)||defined(CAPSULE_SENSOR_V3)||defined(WIRELESS_SHELL_V3)
 #include <stdbool.h>
 #include <string.h>
 #include <stdint.h>

diff --git a/src/loramac/region/RegionUS915.c b/src/loramac/region/RegionUS915.c
@@ -22,12 +22,7 @@ License: Revised BSD License, see LICENSE.TXT file include in the project
 Maintainer: Miguel Luis ( Semtech ), Gregory Cristian ( Semtech ) and Daniel Jaeckle ( STACKFORCE )
 */
 
-#if defined(WIFI_LORA_32_V3)||defined(WIFI_LORA_32_V2)||defined(WIFI_LORA_32)\
-||defined(WIRELESS_TRACKER)||defined(WIRELESS_STICK_V3)||defined(WIRELESS_STICK_LITE_V3)\
-||defined(WIRELESS_PAPER)||defined(CAPSULE_SENSOR_V3)||defined(WIRELESS_SHELL_V3)||defined(WIRELESS_BRIDGE)\
-||defined(WIRELESS_MINI_SHELL)||defined(Wireless_Stick)
-
-
+#if defined(WIFI_LORA_32_V3)||defined(WIFI_LORA_32_V2)||defined(WIRELESS_TRACKER)||defined(WIRELESS_STICK_V3)||defined(WIRELESS_STICK_LITE_V3)||defined(WIRELESS_PAPER)||defined(CAPSULE_SENSOR_V3)||defined(WIRELESS_SHELL_V3)
 #include <stdbool.h>
 #include <string.h>
 #include <stdint.h>