changes

.gitlab-ci.yml

@@ -39,7 +39,6 @@ release:
                 - gitlabreleaseuploader.py -p $PRIVATE_TOKEN 
                   -i $CI_PROJECT_ID -u $CI_PROJECT_URL
                   -f sketch.esp8266.esp8266.nodemcu.bin 
-                  -F releaseInfo.json 
+                  -F releaseInfo.json -T $CI_COMMIT_REF_NAME
-                  -T $CI_COMMIT_REF_NAME -c
                   -I $CI_SERVER_URL
 

build.sh

@@ -17,7 +17,8 @@ fi
 
 if [ "$1" == "build" ]; then
   pushd $PROJECT_DIR/libraries/esp8266boilerplate/ConfigGenerator && ./configGen.sh && popd
-  env ARDUINO_SKETCHBOOK_DIR=$PROJECT_DIR arduino-cli compile --fqbn=esp8266:esp8266:nodemcu $PROJECT_DIR/sketch
+  # env ARDUINO_SKETCHBOOK_DIR=$PROJECT_DIR arduino-cli compile --fqbn=esp8266:esp8266:nodemcu $PROJECT_DIR/sketch
+  docker run -it --rm -v $PWD:/mnt registry.hottis.de/dockerized/build-env-arduino:latest env ARDUINO_SKETCHBOOK_DIR=/mnt arduino-cli compile -v --fqbn=esp8266:esp8266:nodemcu /mnt/sketch
   cp sketch/sketch.esp8266.esp8266.nodemcu.* .
 elif [ "$1" == "clean" ]; then
   for D in libraries/includes/configuration.h libraries/includes/configuration.cpp sketch/sketch.esp8266.esp8266.nodemcu.bin sketch/sketch.esp8266.esp8266.nodemcu.elf sketch.esp8266.esp8266.nodemcu.bin sketch.esp8266.esp8266.nodemcu.elf; do
@@ -26,7 +27,7 @@ elif [ "$1" == "clean" ]; then
   done
 elif [ "$1" == "upload" ]; then
   echo "About to upload to device"
-  esptool.py --port /dev/ttyUSB1 write_flash 0 sketch.esp8266.esp8266.nodemcu.bin
+  esptool --port /dev/ttyUSB0 write_flash 0 sketch.esp8266.esp8266.nodemcu.bin
 else
   echo "Unknown subcommand '$1'"
   exit 1

libraries/includes/defines.h

@@ -8,7 +8,7 @@
 #ifndef DEFINES_H_
 #define DEFINES_H_
 
-// #define DEBUG
+#define DEBUG
 
 
 
@@ -29,7 +29,12 @@
 #endif
 
 #ifdef WS2811
-#define PIXEL_PIN 1 // NODEMCU numbering
+#ifdef ESP01
+#define PIXEL_PIN 2
+#endif
+#ifdef NODEMCU
+#define PIXEL_PIN D1
+#endif
 #endif
 
 #ifdef PL9823

releaseInfo.json

@@ -1,5 +1,5 @@
 {
-    "releaseTag": "v1.0.8",
+    "releaseTag": "v1.0.7",
     "createReleaseTag": "true",
     "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

@@ -16,5 +16,5 @@ configItems = [
     {"label":"DebugMode", "key":"debugMode", "type":"I", "default":0}
 ]
 
-magic = 3235774471
+magic = 3235774475
 appName = "ESP8266 based RGB-LED-Light"