Pwm support with web config

ESPixelStick.h

@@ -31,10 +31,21 @@ const char BUILD_DATE[] = __DATE__ " " __TIME__;
 #define ESPS_MODE_PIXEL
 //#define ESPS_MODE_SERIAL
 
+/* Include support for PWM */
+#define ESPS_SUPPORT_PWM
+
 /*****************************************/
 /*         END - Configuration           */
 /*****************************************/
 
+#include <ESP8266WiFi.h>
+#include <Ticker.h>
+#include <AsyncMqttClient.h>
+#include <ESP8266mDNS.h>
+#include <ESPAsyncTCP.h>
+#include <ESPAsyncUDP.h>
+#include <ESPAsyncWebServer.h>
+
 #if defined(ESPS_MODE_PIXEL)
 #include "PixelDriver.h"
 #elif defined(ESPS_MODE_SERIAL)
@@ -64,11 +75,22 @@ const char BUILD_DATE[] = __DATE__ " " __TIME__;
 #define CONFIG_MAX_SIZE 2048    /* Sanity limit for config file */
 
 /* Pixel Types */
+class DevCap {
+public:
+    bool MPIXEL : 1;
+    bool MSERIAL : 1;
+    bool MPWM : 1;
+    uint8_t toInt() {
+      return (MPWM<<2 | MSERIAL<<1 | MPIXEL);
+    }
+
+};
+/*
 enum class DevMode : uint8_t {
     MPIXEL,
     MSERIAL
 };
-
+*/
 /* Test Modes */
 enum class TestMode : uint8_t {
     DISABLED,
@@ -89,7 +111,7 @@ typedef struct {
 typedef struct {
     /* Device */
     String      id;             /* Device ID */
-    DevMode     devmode;        /* Device Mode - used for reporting mode, can't be set */
+    DevCap      devmode;        /* Device Mode - used for reporting mode, can't be set */
     TestMode    testmode;       /* Testing mode */
 
     /* Network */
@@ -122,12 +144,22 @@ typedef struct {
     PixelType   pixel_type;     /* Pixel type */
     PixelColor  pixel_color;    /* Pixel color order */
     bool        gamma;          /* Use gamma map? */
-
+    float       gammaVal;       /* gamma value to use */
+    float       briteVal;       /* brightness lto use */
 #elif defined(ESPS_MODE_SERIAL)
     /* Serial */
     SerialType  serial_type;    /* Serial type */
     BaudRate    baudrate;       /* Baudrate */
 #endif
+#if defined(ESPS_SUPPORT_PWM)
+    bool        pwm_global_enabled;    /* is pwm runtime enabled? */
+    int         pwm_freq;       /* pwm frequency */
+    bool        pwm_gamma;      /* is pwm runtime enabled? */
+    uint16_t    pwm_gpio_dmx[17];    /* which dmx channel is gpio[n] mapped to? */
+    uint32_t    pwm_gpio_enabled;      /* is gpio[n] enabled? */
+    uint32_t    pwm_gpio_invert;       /* is gpio[n] active high or active low? */
+    uint32_t    pwm_gpio_digital;      /* is gpio[n] digital or "analog"? */
+#endif
 } config_t;
 
 /* Forward Declarations */
@@ -136,4 +168,17 @@ void dsNetworkConfig(JsonObject &json);
 void dsDeviceConfig(JsonObject &json);
 void saveConfig();
 
+void connectWifi();
+void onWifiConnect(const WiFiEventStationModeGotIP &event);
+void onWiFiDisconnect(const WiFiEventStationModeDisconnected &event);
+void connectToMqtt();
+void onMqttConnect(bool sessionPresent);
+void onMqttDisconnect(AsyncMqttClientDisconnectReason reason);
+void onMqttMessage(char* topic, char* p_payload,
+        AsyncMqttClientMessageProperties properties, size_t len, size_t index, size_t total);
+void publishRGBState();
+void publishRGBBrightness();
+void publishRGBColor();
+void setStatic(uint8_t r, uint8_t g, uint8_t b);
+
 #endif /* ESPIXELSTICK_H_ */

ESPixelStick.ino

@@ -23,6 +23,7 @@
 
 /* Output Mode has been moved to ESPixelStick.h */
 
+
 /* Fallback configuration if config.json is empty or fails */
 const char ssid[] = "ENTER_SSID_HERE";
 const char passphrase[] = "ENTER_PASSPHRASE_HERE";
@@ -43,8 +44,12 @@ const char passphrase[] = "ENTER_PASSPHRASE_HERE";
 #include <Hash.h>
 #include <SPI.h>
 #include "ESPixelStick.h"
+#include "udpraw.h"
 #include "EFUpdate.h"
 #include "wshandler.h"
+#include "pwm.h"
+#include "gamma.h"
+#include "gpio.h"
 
 extern "C" {
 #include <user_interface.h>
@@ -122,11 +127,14 @@ SerialDriver    serial;         // Serial object
 #error "No valid output mode defined."
 #endif
 
+
+
 /////////////////////////////////////////////////////////
 // 
 //  Forward Declarations
 //
 /////////////////////////////////////////////////////////
+
 void loadConfig();
 void initWifi();
 void initWeb();
@@ -142,7 +150,7 @@ RF_PRE_INIT() {
 void setup() {
     // Configure SDK params
     wifi_set_sleep_type(NONE_SLEEP_T);
-
+    ToggleSetup();
     // Initial pin states
     pinMode(DATA_PIN, OUTPUT);
     digitalWrite(DATA_PIN, LOW);
@@ -228,6 +236,11 @@ void setup() {
     }
 
     // Configure the outputs
+#if defined (ESPS_SUPPORT_PWM)
+    setupPWM();
+
+#endif
+
 #if defined (ESPS_MODE_PIXEL)
     pixels.setPin(DATA_PIN);
     updateConfig();
@@ -395,7 +408,7 @@ Serial.println(payload);
             config.testmode = TestMode::MQTT;
             if (m_rgb_state != true) {
                 m_rgb_state = true;
-                setStatic(m_rgb_red, m_rgb_green, m_rgb_blue);
+                setStatic(m_rgb_red*m_rgb_brightness/100, m_rgb_green*m_rgb_brightness/100, m_rgb_blue*m_rgb_brightness/100);
                 publishRGBState();
             }
         } else if (payload.equals(String(LIGHT_OFF))) {
@@ -412,7 +425,7 @@ Serial.println(payload);
             return;
         } else {
             m_rgb_brightness = brightness;
-            setStatic(m_rgb_red, m_rgb_green, m_rgb_blue);
+            setStatic(m_rgb_red*m_rgb_brightness/100, m_rgb_green*m_rgb_brightness/100, m_rgb_blue*m_rgb_brightness/100);
             publishRGBBrightness();
         }
     } else if (String(config.mqtt_topic + MQTT_LIGHT_RGB_COMMAND_TOPIC).equals(topic)) {
@@ -424,7 +437,7 @@ Serial.println(payload);
         m_rgb_green = payload.substring(firstIndex + 1, lastIndex).toInt();
         m_rgb_blue = payload.substring(lastIndex + 1).toInt();
 
-        setStatic(m_rgb_red, m_rgb_green, m_rgb_blue);
+        setStatic(m_rgb_red*m_rgb_brightness/100, m_rgb_green*m_rgb_brightness/100, m_rgb_blue*m_rgb_brightness/100);
         publishRGBColor();
     }
 }
@@ -478,22 +491,42 @@ void initWeb() {
     // JSON Config Handler
     web.on("/conf", HTTP_GET, [](AsyncWebServerRequest *request) {
         String jsonString;
-        serializeConfig(jsonString);
+        serializeConfig(jsonString, true);
         request->send(200, "text/json", jsonString);
     });
 
+    // gamma debugging Config Handler
+    web.on("/gamma", HTTP_GET, [](AsyncWebServerRequest *request) {
+        AsyncResponseStream *response = request->beginResponseStream("text/plain");
+        for (int i=0; i<256; i++) {
+          response->printf ("%5d,", GAMMA_TABLE[i]);
+          if (i%16 == 15) {
+            response->printf("\r\n");
+          }
+        }
+        request->send(response);
+    });
+
     // Firmware upload handler
     web.on("/updatefw", HTTP_POST, [](AsyncWebServerRequest *request) {
         ws.textAll("X6");
     }, handle_fw_upload);
 
     // Static Handler
     web.serveStatic("/", SPIFFS, "/www/").setDefaultFile("index.html");
+    web.serveStatic("/config.json", SPIFFS, "/config.json");
 
     web.onNotFound([](AsyncWebServerRequest *request) {
-        request->send(404, "text/plain", "Page not found");
+        if (request->method() == HTTP_OPTIONS) {
+            AsyncWebServerResponse *response = request->beginResponse(200);
+            request->send(response);
+        } else {
+            request->send(404, "text/plain", "Page not found");          
+        }
     });
 
+    DefaultHeaders::Instance().addHeader(F("Access-Control-Allow-Origin"), "*");
+
     web.begin();
 
     LOG_PORT.print(F("- Web Server started on port "));
@@ -531,10 +564,15 @@ void validateConfig() {
         config.mqtt_topic = "diy/esps/" + String(chipId);
     }
 
+#if defined(ESPS_SUPPORT_PWM)
+    config.devmode.MPWM = true;
+#endif
 
 #if defined(ESPS_MODE_PIXEL)
     // Set Mode
-    config.devmode = DevMode::MPIXEL;
+//    config.devmode = DevMode::MPIXEL;
+    config.devmode.MPIXEL = true;
+    config.devmode.MSERIAL = false;
 
     // Generic channel limits for pixels
     if (config.channel_count % 3)
@@ -552,9 +590,19 @@ void validateConfig() {
             config.channel_count = 63 * 3;
     }
 
+    // gamma value
+    if (config.gammaVal <= 0) {
+        config.gammaVal = 2.2;
+    }
+    // default gamma value
+    if (config.briteVal <= 0) {
+        config.briteVal = 1.0;
+    }
 #elif defined(ESPS_MODE_SERIAL)
     // Set Mode
-    config.devmode = DevMode::MSERIAL;
+//    config.devmode = DevMode::MSERIAL;
+    config.devmode.MPIXEL = false;
+    config.devmode.MSERIAL = true;
 
     // Generic serial channel limits
     if (config.channel_count > RENARD_LIMIT)
@@ -602,6 +650,8 @@ void updateConfig() {
 #if defined(ESPS_MODE_PIXEL)
     pixels.begin(config.pixel_type, config.pixel_color, config.channel_count / 3);
     pixels.setGamma(config.gamma);
+    updateGammaTable(config.gammaVal, config.briteVal);
+
 #elif defined(ESPS_MODE_SERIAL)
     serial.begin(&SEROUT_PORT, config.serial_type, config.channel_count, config.baudrate);
 #endif
@@ -671,12 +721,38 @@ void dsDeviceConfig(JsonObject &json) {
     config.pixel_type = PixelType(static_cast<uint8_t>(json["pixel"]["type"]));
     config.pixel_color = PixelColor(static_cast<uint8_t>(json["pixel"]["color"]));
     config.gamma = json["pixel"]["gamma"];
+    config.gammaVal = json["pixel"]["gammaVal"];
+    config.briteVal = json["pixel"]["briteVal"];
 
 #elif defined(ESPS_MODE_SERIAL)
     /* Serial */
     config.serial_type = SerialType(static_cast<uint8_t>(json["serial"]["type"]));
     config.baudrate = BaudRate(static_cast<uint32_t>(json["serial"]["baudrate"]));
 #endif
+
+#if defined(ESPS_SUPPORT_PWM)
+    config.pwm_global_enabled = json["pwm"]["enabled"];
+    config.pwm_freq = json["pwm"]["freq"];
+    config.pwm_gamma = json["pwm"]["gamma"];
+    config.pwm_gpio_invert = 0;
+    config.pwm_gpio_digital = 0;
+    config.pwm_gpio_enabled = 0;
+    for (int gpio=0; gpio < NUM_GPIO; gpio++ ) {
+      if ( valid_gpio_mask & 1<<gpio ) {
+        config.pwm_gpio_dmx[gpio] = json["pwm"]["gpio" + (String)gpio + "_channel"];
+        if (json["pwm"]["gpio" + (String)gpio + "_invert"]) {
+          config.pwm_gpio_invert |= 1<<gpio;
+        }
+        if (json["pwm"]["gpio" + (String)gpio + "_digital"]) {
+          config.pwm_gpio_digital |= 1<<gpio;
+        }
+        if (json["pwm"]["gpio" + (String)gpio + "_enabled"]) {
+          config.pwm_gpio_enabled |= 1<<gpio;
+        }
+      }
+    }
+#endif
+
 }
 
 // Load configugration JSON file
@@ -728,7 +804,7 @@ void serializeConfig(String &jsonString, bool pretty, bool creds) {
     // Device
     JsonObject &device = json.createNestedObject("device");
     device["id"] = config.id.c_str();
-    device["mode"] = static_cast<uint8_t>(config.devmode);
+    device["mode"] = config.devmode.toInt();
 
     // Network
     JsonObject &network = json.createNestedObject("network");
@@ -770,6 +846,8 @@ void serializeConfig(String &jsonString, bool pretty, bool creds) {
     pixel["type"] = static_cast<uint8_t>(config.pixel_type);
     pixel["color"] = static_cast<uint8_t>(config.pixel_color);
     pixel["gamma"] = config.gamma;
+    pixel["gammaVal"] = config.gammaVal;
+    pixel["briteVal"] = config.briteVal;
 
 #elif defined(ESPS_MODE_SERIAL)
     // Serial
@@ -778,6 +856,22 @@ void serializeConfig(String &jsonString, bool pretty, bool creds) {
     serial["baudrate"] = static_cast<uint32_t>(config.baudrate);
 #endif
 
+#if defined(ESPS_SUPPORT_PWM)
+    JsonObject &pwm = json.createNestedObject("pwm");
+    pwm["enabled"] = config.pwm_global_enabled;
+    pwm["freq"] = config.pwm_freq;
+    pwm["gamma"] = config.pwm_gamma;
+
+    for (int gpio=0; gpio < NUM_GPIO; gpio++ ) {
+      if ( valid_gpio_mask & 1<<gpio ) {
+        pwm["gpio" + (String)gpio + "_channel"] = static_cast<uint16_t>(config.pwm_gpio_dmx[gpio]);
+        pwm["gpio" + (String)gpio + "_enabled"] = static_cast<bool>(config.pwm_gpio_enabled & 1<<gpio);
+        pwm["gpio" + (String)gpio + "_invert"] = static_cast<bool>(config.pwm_gpio_invert & 1<<gpio);
+        pwm["gpio" + (String)gpio + "_digital"] = static_cast<bool>(config.pwm_gpio_digital & 1<<gpio);
+      }
+    }
+#endif
+
     if (pretty)
         json.prettyPrintTo(jsonString);
     else
@@ -833,6 +927,9 @@ void setStatic(uint8_t r, uint8_t g, uint8_t b) {
 //
 /////////////////////////////////////////////////////////
 void loop() {
+   /* check for raw packets on port 2801 */
+    handle_raw_port();
+
     e131_packet_t packet;
 
     // Reboot handler
@@ -977,6 +1074,8 @@ void loop() {
         }
     }
 
+  ToggleTime();
+
 
 /* Streaming refresh */
 #if defined(ESPS_MODE_PIXEL)
@@ -986,4 +1085,12 @@ void loop() {
     if (serial.canRefresh())
         serial.show();
 #endif
+
+
+/* update the PWM outputs */
+#if defined(ESPS_SUPPORT_PWM)
+  handlePWM();
+#endif
 }
+
+