diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml new file mode 100644 index 0000000..817061a --- /dev/null +++ b/.gitlab-ci.yml @@ -0,0 +1,44 @@ +stages: + - build + - release + +build: + stage: build + image: registry.hottis.de/dockerized/build-env-arduino:latest + tags: + - hottis + - linux + - docker + variables: + GIT_SUBMODULE_STRATEGY: recursive + artifacts: + name: "$CI_JOB_NAME-$CI_COMMIT_REF_NAME" + paths: + - sketch.esp8266.esp8266.nodemcu.bin + except: + - tags + script: + - pushd $CI_PROJECT_DIR/libraries/esp8266boilerplate/ConfigGenerator && ./configGen.sh && popd + - env ARDUINO_SKETCHBOOK_DIR=$CI_PROJECT_DIR arduino-cli compile --fqbn=esp8266:esp8266:nodemcu $CI_PROJECT_DIR/sketch + - cp sketch/sketch.esp8266.esp8266.nodemcu.* . + + +release: + stage: release + image: registry.hottis.de/dockerized/base-build-env + tags: + - hottis + - linux + - docker + dependencies: + - build + only: + 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 + -I $CI_SERVER_URL + diff --git a/sketch/ConfigDataStructure.py b/sketch/ConfigDataStructure.py index 78a87fa..48473a7 100644 --- a/sketch/ConfigDataStructure.py +++ b/sketch/ConfigDataStructure.py @@ -6,15 +6,13 @@ configItems = [ {"label":"Wifi SSID", "key":"wifiSsid", "type":"C", "length":32, "default":"test"}, {"label":"Wifi Key", "key":"wifiKey", "type":"C", "length":64, "default":"geheim"}, {"label":"MQTT Broker", "key":"mqttBroker", "type":"C", "length":32, "default":"broker.hottis.de"}, - {"label":"MQTT ClientId", "key":"mqttClientId", "type":"C", "length":32, "default":"RgbLed1"}, + {"label":"MQTT ClientId", "key":"mqttClientId", "type":"C", "length":32, "default":"RainSensor2"}, {"label":"MQTT Port", "key":"mqttPort", "type":"I", "default":1883}, - {"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 ValuesTopic", "key":"mqttValuesTopic", "type":"C", "length":64, "default":"IoT/RainSensor2/Values"}, + {"label":"MQTT DebugTopic", "key":"mqttDebugTopic", "type":"C", "length":64, "default":"IoT/RainSensor2/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 = 3235774471 -appName = "ESP8266 based RGB-LED-Light" +appName = "ESP8266 based RainSensor/Counter" diff --git a/sketch/application.cpp b/sketch/application.cpp index 1c967a1..758e606 100644 --- a/sketch/application.cpp +++ b/sketch/application.cpp @@ -1,7 +1,7 @@ /* * productionMode.cpp * - * Created on: Apr 05, 2019 + * Created on: Jul 26, 2020 * Author: wn */ @@ -17,222 +17,31 @@ #include -#ifdef WS2811 -#define FASTLED_ESP8266_NODEMCU_PIN_ORDER -#include -#endif - -#ifdef PL9823 -#include -#endif #include "configuration.h" -#ifdef WS2811 -CRGB leds[NUM_OF_LEDs]; -#endif - -#ifdef PL9823 -typedef struct { - uint8_t r; - uint8_t g; - uint8_t b; -} CRGB; - - -// Adafruit_NeoPixel pixels(NUM_OF_LEDs, PIXEL_PIN, NEO_RGB + NEO_KHZ400); -Adafruit_NeoPixel pixels(NUM_OF_LEDs, PIXEL_PIN, NEO_RGB + NEO_KHZ800); -#endif - -bool show = false; -static CRGB evaluationColorWord(char* cmd) { - uint8_t red = 0, green = 0, blue = 0; - if ((! strcmp(cmd, "on")) || (! strcmp(cmd, "white"))) { - red = 255; - green = 255; - blue = 255; - } else if (! strcmp(cmd, "off")) { - red = 0; - green = 0; - blue = 0; - } else if (! strcmp(cmd, "warmwhite")) { - red = 0; - green = 0; - blue = 0; - } else if (! strcmp(cmd, "red")) { - red = 255; - green = 0; - blue = 0; - } else if (! strcmp(cmd, "green")) { - red = 0; - green = 255; - blue = 0; - } else if (! strcmp(cmd, "blue")) { - red = 0; - green = 0; - blue = 255; - } else if (! strcmp(cmd, "purple")) { - red = 255; - green = 0; - blue = 255; - } else if (! strcmp(cmd, "yellow")) { - red = 255; - green = 255; - blue = 0; - } - - CRGB res; - res.r = red; - res.g = green; - res.b = blue; - return res; -} +// void subscribeApplication() { +// } - -void subscribeApplication() { - mqttClient.subscribe(configBlock.mqttTopicColorCommand); - mqttClient.subscribe(configBlock.mqttTopicCommand); -} - - - -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 - leds[i].r = red; - leds[i].g = green; - leds[i].b = blue; -#endif -#ifdef PL9823 - pixels.setPixelColor(i, pixels.Color(red, green, blue)); -#endif - } - show = true; - } else { - if (ledNumber >= 0 && ledNumber < NUM_OF_LEDs) { - -#ifdef WS2811 - leds[ledNumber].r = red; - leds[ledNumber].g = green; - leds[ledNumber].b = blue; -#endif -#ifdef PL9823 - pixels.setPixelColor(ledNumber, pixels.Color(red, green, blue)); -#endif - show = true; - } - } -} - - - -void callbackApplication(char *topic, uint8_t tokenCnt, char **tokens) { - if (! strcmp(topic, configBlock.mqttTopicCommand)) { - int32_t n, b; - CRGB pseudoColors; - switch (tokenCnt) { - case 1: - // set brightness - b = strtol(tokens[0], NULL, 10); - setColor(-1, b, b, b); - break; - case 2: - // set brightness for one LED - n = strtol(tokens[0], NULL, 10); - b = strtol(tokens[1], NULL, 10); - setColor(n, b, b, b); - break; - } - } else if (! strcmp(topic, configBlock.mqttTopicColorCommand)) { - int32_t n, red, green, blue; - CRGB colors; - switch (tokenCnt) { - case 1: - // on, off, color word for all LEDs - colors = evaluationColorWord(tokens[0]); - setColor(-1, colors.r, colors.g, colors.b); - break; - case 2: - // token0 = LED number, token1 = color - n = strtol(tokens[0], NULL, 10); - colors = evaluationColorWord(tokens[1]); - setColor(n, colors.r, colors.g, colors.b); - break; - case 3: - // token0 = red, token1 = green, token2 = blue - red = strtol(tokens[0], NULL, 10); - green = strtol(tokens[1], NULL, 10); - blue = strtol(tokens[2], NULL, 10); - setColor(-1, red, green, blue); - break; - case 4: - // token0 = LED number, token1 = red, token2 = green, token3 = blue - n = strtol(tokens[0], NULL, 10); - red = strtol(tokens[1], NULL, 10); - green = strtol(tokens[2], NULL, 10); - blue = strtol(tokens[3], NULL, 10); - setColor(n, red, green, blue); - break; - } - } -} +// void callbackApplication(char *topic, uint8_t tokenCnt, char **tokens) { +// } void setupApplication() { mqttSetup(); - -#ifdef WS2811 - FastLED.addLeds(leds, NUM_OF_LEDs); -#endif -#ifdef PL9823 - pixels.begin(); - - for (uint16_t i = 0; i < NUM_OF_LEDs; i++) { - pixels.setPixelColor(i, pixels.Color(0,0,0)); - } - pixels.show(); -#endif } void loopApplication() { mqttLoop(); - - - if (show) { - show = false; -#ifdef WS2811 - FastLED.show(); -#endif -#ifdef PL9823 - pixels.show(); -#endif - } }