fix2

.gitlab-ci.yml

@@ -4,7 +4,7 @@ stages:
 
 build:
         stage: build
-        image: registry.gitlab.com/wolutator/build-env-arduino:latest
+        image: registry.hottis.de/dockerized/build-env-arduino:latest
         tags:
                 - hottis
                 - linux
@@ -25,7 +25,7 @@ build:
 
 release:
         stage: release
-        image: registry.gitlab.com/wolutator/base-build-env
+        image: registry.hottis.de/dockerized/base-build-env
         tags:
                 - hottis
                 - linux
@@ -36,6 +36,10 @@ release:
                 refs:
                         - release
         script:
-                - gitlabreleaseuploader.py -p $PRIVATE_TOKEN -i $CI_PROJECT_ID -u $CI_PROJECT_URL
-                  -f sketch.esp8266.esp8266.nodemcu.bin -F releaseInfo.json -T $CI_COMMIT_REF_NAME
+                - gitlabreleaseuploader.py -p $PRIVATE_TOKEN 
+                  -i $CI_PROJECT_ID -u $CI_PROJECT_URL
+                  -f sketch.esp8266.esp8266.nodemcu.bin 
+                  -F releaseInfo.json 
+                  -T $CI_COMMIT_REF_NAME -c
+                  -I $CI_SERVER_URL
 

releaseInfo.json

@@ -1,8 +1,8 @@
 {
-    "releaseTag": "v1.0.4",
+    "releaseTag": "v1.0.8",
     "createReleaseTag": "true",
-    "releaseName": "more LEDs, disable debug",
-    "description": "supports up to 300 LEDs, disable debug"
+    "releaseName": "colorPattern and watchdog",
+    "description": "introduce the colorPattern config option (swap R and G) and use the mqtt boilerplate code with watchdog support"
   }
   
   

sketch/ConfigDataStructure.py

@@ -11,8 +11,10 @@ configItems = [
     {"label":"MQTT Topic Color Command", "key":"mqttTopicColorCommand", "type":"C", "length":64, "default":"IoT/RgbLed1/ColorCommand"},
     {"label":"MQTT Topic Command", "key":"mqttTopicCommand", "type":"C", "length":64, "default":"IoT/RgbLed1/Command"},
     {"label":"MQTT DebugTopic", "key":"mqttDebugTopic", "type":"C", "length":64, "default":"IoT/RgbLed1/Debug"},
+    {"label":"MQTT WatchdogTopic", "key":"mqttWatchdogTopic", "type":"C", "length":64, "default":"IoT/Watchdog"},
+    {"label":"Color pattern (rgb=0, grb=1", "key":"colorPattern", "type":"I", "default":0},
     {"label":"DebugMode", "key":"debugMode", "type":"I", "default":0}
 ]
 
-magic = 3235774470
+magic = 3235774471
 appName = "ESP8266 based RGB-LED-Light"

sketch/application.cpp

@@ -43,7 +43,7 @@ typedef struct {
 
 
 // Adafruit_NeoPixel pixels(NUM_OF_LEDs, PIXEL_PIN, NEO_RGB + NEO_KHZ400);
-Adafruit_NeoPixel pixels(NUM_OF_LEDs, PIXEL_PIN, NEO_GRB + NEO_KHZ800);
+Adafruit_NeoPixel pixels(NUM_OF_LEDs, PIXEL_PIN, NEO_RGB + NEO_KHZ800);
 #endif
 
 bool show = false;
@@ -102,7 +102,23 @@ void subscribeApplication() {
 
 
 
-static void setColor(int16_t ledNumber, uint8_t red, uint8_t green, uint8_t blue) {
+static void setColor(int16_t ledNumber, uint8_t x, uint8_t y, uint8_t z) {
+	uint8_t red, green, blue;
+
+	switch (configBlock.colorPattern) {
+		case 1:
+		    red = y;
+			green = x;
+			blue = z;
+			break;
+		case 0:
+		default:
+		    red = x;
+			green = y;
+			blue = z;
+			break;
+	}
+
 	if (ledNumber == -1) {
 		for (uint16_t i = 0; i < NUM_OF_LEDs; i++) {
 #ifdef WS2811
@@ -188,6 +204,7 @@ void callbackApplication(char *topic, uint8_t tokenCnt, char **tokens) {
 void setupApplication() {
 	mqttSetup();
 
+
 #ifdef WS2811
 	FastLED.addLeds<NEOPIXEL, PIXEL_PIN>(leds, NUM_OF_LEDs);
 #endif