DEFINES for different devices added

Author: Def3nder

platformio.ini

@@ -88,8 +88,8 @@ build_flags =
   ; -D WLED_DISABLE_ALEXA
   -D WLED_DISABLE_BLYNK
   -D WLED_DISABLE_CRONIXIE
-  ; -D WLED_DISABLE_HUESYNC
-  -D WLED_DISABLE_INFRARED
+  -D WLED_DISABLE_HUESYNC
+  ; -D WLED_DISABLE_INFRARED
 
 [common:esp32]
 platform = [email protected]
@@ -123,7 +123,21 @@ build_flags =
 lib_deps =
   ${common.lib_deps_external}
 
-[env:esp8285]
+[env:esp8285_4CH_H801]
+board = esp8285
+platform = ${common:esp8266_1M.platform}
+monitor_speed = ${common.monitor_speed}
+upload_speed = ${common.upload_speed}
+framework = ${common.framework}
+build_flags =
+  ${common.build_flags}
+  ${common:esp8266_1M.build_flags}
+  -D WLED_USE_ANALOG_LEDS
+  -D WLED_USE_H801
+lib_deps =
+  ${common.lib_deps_external}
+
+[env:esp8285_4CH_MagicHome]
 board = esp8285
 platform = ${common:esp8266_1M.platform}
 monitor_speed = ${common.monitor_speed}
@@ -133,11 +147,10 @@ build_flags =
   ${common.build_flags}
   ${common:esp8266_1M.build_flags}
   -D WLED_USE_ANALOG_LEDS
-  -D WLED_DEBUG
 lib_deps =
   ${common.lib_deps_external}
 
-[env:esp8285_5CH]
+[env:esp8285_5CH_H801]
 board = esp8285
 platform = ${common:esp8266_1M.platform}
 monitor_speed = ${common.monitor_speed}
@@ -147,8 +160,8 @@ build_flags =
   ${common.build_flags}
   ${common:esp8266_1M.build_flags}
   -D WLED_USE_ANALOG_LEDS
-  -D WLED_USE_5CH_LEDS
-  -D WLED_DEBUG
+  -D WLED_USE_5CH_LEDS 
+  -D WLED_USE_H801
 lib_deps =
   ${common.lib_deps_external}
 
@@ -175,6 +188,7 @@ framework = ${common.framework}
 build_flags =
   ${common.build_flags}
   ${common:esp8266_512k.build_flags}
+  -D WLED_DISABLE_INFRARED
 lib_deps =
   ${common.lib_deps_external}
 

wled00/NpbWrapper.h

@@ -5,8 +5,13 @@
 //PIN CONFIGURATION
 #define LEDPIN 2  //strip pin. Any for ESP32, gpio2 or 3 is recommended for ESP8266 (gpio2/3 are labeled D4/RX on NodeMCU and Wemos)
 //#define USE_APA102 // Uncomment for using APA102 LEDs.
-#define BTNPIN -1 //button pin. Needs to have pullup (gpio0 recommended)
-#define IR_PIN  0 //infrared pin (-1 to disable)  MagicHome: 4, H801 Wifi: 0
+#ifdef WLED_USE_H801
+  #define BTNPIN -1 //button pin. Needs to have pullup (gpio0 recommended)
+  #define IR_PIN  0 //infrared pin (-1 to disable)  MagicHome: 4, H801 Wifi: 0
+#else
+  #define BTNPIN  0 //button pin. Needs to have pullup (gpio0 recommended)
+  #define IR_PIN  4 //infrared pin (-1 to disable)  MagicHome: 4, H801 Wifi: 0
+#endif
 #define RLYPIN -1 //pin for relay, will be set HIGH if LEDs are on (-1 to disable). Also usable for standby leds, triggers,...
 #define AUXPIN -1 //debug auxiliary output pin (-1 to disable)
 
@@ -20,20 +25,21 @@
  #endif
 #endif
 
-#ifndef WLED_DISABLE_ANALOG_LEDS
+#ifdef WLED_USE_ANALOG_LEDS
   //PWM pins - PINs 15,13,12,14 (W2 = 04)are used with H801 Wifi LED Controller
-  #define RPIN 15   //R pin for analog LED strip   
-  #define GPIN 13   //G pin for analog LED strip
-  #define BPIN 12   //B pin for analog LED strip
-  #define WPIN 14   //W pin for analog LED strip (W1: 14, W2: 04)
-  #define W2PIN 04  //W2 pin for analog LED strip 
-  //
-  /*PWM pins - PINs 5,12,13,15 are used with Magic Home LED Controller
-  #define RPIN 5   //R pin for analog LED strip   
-  #define GPIN 12   //G pin for analog LED strip
-  #define BPIN 13   //B pin for analog LED strip
-  #define WPIN 15   //W pin for analog LED strip (W1: 14, W2: 04)
-  */
+  #ifdef WLED_USE_H801
+    #define RPIN 15   //R pin for analog LED strip   
+    #define GPIN 13   //G pin for analog LED strip
+    #define BPIN 12   //B pin for analog LED strip
+    #define WPIN 14   //W pin for analog LED strip (W1: 14, W2: 04)
+    #define W2PIN 04  //W2 pin for analog LED strip 
+  #else
+  //PWM pins - PINs 5,12,13,15 are used with Magic Home LED Controller
+    #define RPIN 5   //R pin for analog LED strip   
+    #define GPIN 12   //G pin for analog LED strip
+    #define BPIN 15   //B pin for analog LED strip
+    #define WPIN 13   //W pin for analog LED strip (W1: 14, W2: 04)
+  #endif
 #endif
 
 //automatically uses the right driver method for each platform
@@ -120,7 +126,7 @@ class NeoPixelWrapper
         _pGrbw->Begin();
       break;
 
-        #ifndef WLED_DISABLE_ANALOG_LEDS      
+        #ifdef WLED_USE_ANALOG_LEDS      
           //init PWM pins - PINs 5,12,13,15 are used with Magic Home LED Controller
           pinMode(RPIN, OUTPUT);
           pinMode(GPIN, OUTPUT);
@@ -140,7 +146,7 @@ class NeoPixelWrapper
     }
   }
 
-#ifndef WLED_DISABLE_ANALOG_LEDS      
+#ifdef WLED_USE_ANALOG_LEDS      
     void SetRgbwPwm(uint8_t r, uint8_t g, uint8_t b, uint8_t w, uint8_t w2=0)
     {
       analogWrite(RPIN, r);
@@ -164,7 +170,7 @@ class NeoPixelWrapper
     {
       case NeoPixelType_Grb: {
         _pGrb->Show();
-        #ifndef WLED_DISABLE_ANALOG_LEDS      
+        #ifdef WLED_USE_ANALOG_LEDS      
           RgbColor color = _pGrb->GetPixelColor(0);
           b = _pGrb->GetBrightness();
           SetRgbwPwm(color.R * b / 255, color.G * b / 255, color.B * b / 255, 0);
@@ -173,7 +179,7 @@ class NeoPixelWrapper
       break;
       case NeoPixelType_Grbw: {
         _pGrbw->Show();
-        #ifndef WLED_DISABLE_ANALOG_LEDS      
+        #ifdef WLED_USE_ANALOG_LEDS      
           RgbwColor colorW = _pGrbw->GetPixelColor(0);
           b = _pGrbw->GetBrightness();
           // check color values for Warm / COld white mix (for RGBW)  // EsplanexaDevice.cpp