feat: docker build

Merge branch 'feature/esp32-build' into 'master'
feat: add ESP32 build See merge request 0x1d/illucat!12
2025-12-19 03:05:50 +01:00 · 2021-02-02 16:27:30 +01:00 · 2020-09-27 11:35:07 +00:00 · 2020-09-27 09:20:42 +02:00
13 changed files with 123 additions and 100 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,3 @@
-.pioenvs
-.piolibdeps
 .pio
 .vscode
 data/config.json
--- a/3
+++ b/3
@@ -0,0 +1,3 @@
+FROM python:3.6-stretch as builder
+
+RUN pip install -U platformio
--- a/4
+++ b/4
@@ -0,0 +1,4 @@
+build:
+	docker build -t wirelos/platformio .
+run-workspace:
+	docker run -it --rm -v $PWD:/project wirelos/platformio bash
--- a/data/config/mqtt.json
+++ b/data/config/mqtt.json
@@ -1,9 +0,0 @@
-{
-    "mqttClientName": "illucat1",
-    "mqttBrokerHost": "192.168.88.110",
-    "mqttBrokerPort": 1883,
-    "mqttRootTopic": "wirelos/illucat",
-    "mqttUser": "",
-    "mqttPass": ""
-
-}
--- a/data/config/wifi.json
+++ b/data/config/wifi.json
@@ -1,9 +1,9 @@
 {
    "stationMode": 1,
-    "hostname": "illucat",
-    "apSSID": "illucat",
-    "apPassword": "illumination",
+    "hostname": "bar-light",
+    "apSSID": "bar-light",
+    "apPassword": "th3r31sn0sp00n",
    "connectTimeout": 5000,
-    "stationSSID": "thobens-416257",
-    "stationPassword": "467304645DB5"
-}
+    "stationSSID": "UPC7823296",
+    "stationPassword": "rthYx4Vnfeza"
+}u
--- a/data/mqttConfig.json
+++ b/data/mqttConfig.json
@@ -1,9 +1,6 @@
 {
    "mqttClientName" : "illucat1",
-    "mqttBrokerHost": "192.168.4.1",
+    "mqttBrokerHost" : "192.168.1.2",
    "mqttBrokerPort" : 1883,
-    "mqttRootTopic": "wirelos/illucat",
-    "mqttUser": "foo",
-    "mqttPass": ""
-
+    "mqttRootTopic" : "wirelos/illucat"
 }
--- a/data/pixelConfig.json
+++ b/data/pixelConfig.json
@@ -1,7 +1,7 @@
 {
    "pin": 4,
    "length": 8,
-    "brightness": 127,
+    "brightness": 50,
    "updateInterval": 100,
    "defaultColor": 100
 }
--- a/data/www/index.html
+++ b/data/www/index.html
@@ -16,23 +16,46 @@
      <span class="heading">Pixels</span>
      <div class="content">
        <ul>
-          <li class="form-row ParamSelect" data-label="Hue" data-name="hue" data-topic="pixels/hue" data-default="0"
+            <li class="form-row ParamSelect"
+            data-label="Hue"
+            data-name="hue"
+            data-topic="pixels/hue"
+            data-default="0"
            data-external="/gradients.json">
          </li>
-          <li class="form-row ParamColor" data-name="color" data-topic="pixels/color" data-label="Color">
+          <li class="form-row ParamColor" 
+            data-name="color" 
+            data-topic="pixels/color"
+            data-label="Color">
          </li>
-          <li class="form-row ParamColor" data-name="color" data-topic="pixels/color2" data-label="Color 2">
+          <li class="form-row ParamColor" 
+            data-name="color" 
+            data-topic="pixels/color2"
+            data-label="Color 2">
          </li>
          <!-- data-entries='[{"text": "Color", "value": "0"}, {"text": "Rainbow", "value": "1"}, {"text": "TheaterChase", "value": "2"}, {"text": "Wipe", "value": "3"}, {"text": "Scanner", "value": "4"}, {"text": "Fade", "value": "5"}]' -->
-          <li class="form-row ParamSelect" data-label="Pattern" data-name="pattern" data-topic="pixels/pattern"
+          <li class="form-row ParamSelect"
+          data-label="Pattern"
+          data-name="pattern"
+          data-topic="pixels/pattern"
          data-default="0"
-            data-entries='[{"text": "None", "value": "0"}, {"text": "Rainbow", "value": "1"}, {"text": "TheaterChase", "value": "2"}, {"text": "Color Wipe", "value": "3"}, {"text": "Scanner", "value": "4"}, {"text": "Fade", "value": "5"}, {"text": "Fire", "value": "6"}]'>
+          data-entries='[{"text": "None", "value": "0"}, {"text": "Rainbow", "value": "1"}, {"text": "TheaterChase", "value": "2"}, {"text": "Color Wipe", "value": "3"}, {"text": "Scanner", "value": "4"}, {"text": "Fade", "value": "5"}, {"text": "Fire", "value": "6"}]'
+          ></li>      
+          <li class="form-row ParamSlider" 
+            data-name="brightness" 
+            data-min="0"
+            data-max="255"
+            data-value="64"
+            data-topic="pixels/brightness"
+            data-label="Brightness">
          </li>
-          <li class="form-row ParamSlider" data-name="brightness" data-min="0" data-max="255" data-value="64"
-            data-topic="pixels/brightness" data-label="Brightness">
-          </li>
-          <li class="form-row ParamSlider" data-name="totalSteps" data-min="1" data-max="255" data-value="16"
-            data-topic="pixels/totalSteps" data-label="Steps">
+          <li class="form-row ParamSlider" 
+            data-name="totalSteps" 
+            data-min="1"
+            data-max="255"
+            data-value="16"
+            data-topic="pixels/totalSteps"
+            data-label="Steps">
          </li>    
        </ul>
      </div>
@@ -47,15 +70,12 @@
      <span class="heading">Settings</span>
      <div class="content">
          <h2>Network</h2>
-        <div class="Form" data-fileName="/config/wifi.json" data-name="configForm" data-from="/config/wifi.json"
-          data-endpoint="/config"></div>
+          <div class="Form" data-fileName="/config/wifi.json" data-name="configForm" data-from="/config/wifi.json" data-endpoint="/config"></div>
          <h2>NeoPixel</h2>
-        <div class="Form" data-fileName="/pixelConfig.json" data-name="configForm" data-from="/pixelConfig.json"
-          data-endpoint="/config"></div>
-        <h2>MQTT</h2>
-        <div class="Form" data-fileName="/config/mqtt.json" data-name="configForm" data-from="/config/mqtt.json"
-          data-endpoint="/config"></div>
-        <!-- <h2>IRC</h2>
+          <div class="Form" data-fileName="/pixelConfig.json" data-name="configForm" data-from="/pixelConfig.json" data-endpoint="/config"></div>
+          <!-- <h2>MQTT</h2>
+          <div class="Form" data-fileName="/mqttConfig.json" data-name="configForm" data-from="/mqttConfig.json" data-endpoint="/config"></div>
+          <h2>IRC</h2>
          <div class="Form" data-fileName="/ircConfig.json" data-name="configForm" data-from="/ircConfig.json" data-endpoint="/config"></div> -->
      </div>
    </div>
--- a/platformio.ini
+++ b/platformio.ini
@@ -8,15 +8,15 @@
 ; Please visit documentation for the other options and examples
 ; http://docs.platformio.org/page/projectconf.html

-;[platformio]
-;env_default = build
+[platformio]
+env_default = build

 [common]
 framework = arduino
 platform = espressif8266@2.0.4
 board = esp12e
-upload_speed = 115200
-monitor_baud = 74880
+upload_speed = 921600
+monitor_baud = 115200
 lib_deps = 
    Hash
    TaskScheduler
@@ -30,6 +30,19 @@ lib_deps =
    https://gitlab.com/wirelos/sprocket-plugin-neopixel.git
    
    
+[env:build-esp32]
+platform = espressif32
+board = esp32dev
+src_filter = +<*> -<var/> +<var/wifi/>
+upload_speed = ${common.upload_speed}
+monitor_baud = ${common.monitor_baud}
+framework = ${common.framework}
+build_flags = -DSPROCKET_PRINT=1
+lib_deps = ${common.lib_deps}
+    https://gitlab.com/wirelos/sprocket-network-wifi.git#next
+    https://gitlab.com/wirelos/sprocket-plugin-web.git#next
+    
+
 [env:build]
 src_filter = +<*> -<var/> +<var/wifi/>
 platform = ${common.platform}
--- a/src/config.h
+++ b/src/config.h
@@ -8,8 +8,8 @@

 // Chip config
 #define SPROCKET_TYPE       "ILLUCAT"
-#define SERIAL_BAUD_RATE 74880
-#define STARTUP_DELAY 5000
+#define SERIAL_BAUD_RATE    115200
+#define STARTUP_DELAY       1000

 // Mesh config
 #define SPROCKET_MODE       0
@@ -19,8 +19,8 @@
 #define AP_PASSWORD         "illumination"
 #define MESH_PREFIX         "illucat-mesh"
 #define MESH_PASSWORD       "th3r31sn0sp00n"
-#define STATION_SSID "thobens-416257"
-#define STATION_PASSWORD "467304645DB5"
+#define STATION_SSID        "MyAP"
+#define STATION_PASSWORD    "th3r31sn0sp00n"
 #define HOSTNAME            "illucat"
 #define CONNECT_TIMEOUT  10000
 #define MESH_DEBUG_TYPES    ERROR | STARTUP | CONNECTION
@@ -46,6 +46,5 @@
 #define LED_STRIP_DEFAULT_COLOR 100
 #define COLOR_CONNECTED LED_STRIP_DEFAULT_COLOR
 #define COLOR_NOT_CONNECTED 255
-#define LED_STRIP_DEFAULT_PATTERN 1

 #endif
--- a/src/lib/readme.txt
+++ b/src/lib/readme.txt
--- a/src/var/mqcatt/main.cpp
+++ b/src/var/mqcatt/main.cpp
@@ -1,7 +1,6 @@
 #include "mqcatt_config.h"
 #include <WiFiNet.h>
 #include <Sprocket.h>
-#include "../../IlluCat.h"
 #include <ESPAsyncWebServer.h>
 #include <WebServerConfig.h>
 #include <WebServerPlugin.h>
@@ -22,7 +21,7 @@ void setup()
 {
    sprocket = new Sprocket({STARTUP_DELAY, SERIAL_BAUD_RATE});
    pixelPlugin = new PixelPlugin({LED_STRIP_PIN, LED_STRIP_LENGTH, LED_STRIP_BRIGHTNESS, LED_STRIP_UPDATE_INTERVAL});
-    mqttPlugin = new MqttPlugin({MQTT_CLIENT_NAME, MQTT_HOST, MQTT_PORT, MQTT_ROOT_TOPIC, MQTT_USER, MQTT_PASS});
+    mqttPlugin = new MqttPlugin({MQTT_CLIENT_NAME, MQTT_HOST, MQTT_PORT, MQTT_ROOT_TOPIC});
    webServerPlugin = new WebServerPlugin({WEB_CONTEXT_PATH, WEB_DOC_ROOT, WEB_DEFAULT_FILE, WEB_PORT});
    webConfigPlugin = new WebConfigPlugin(webServerPlugin->server);
    webApiPlugin = new WebApiPlugin(webServerPlugin->server);
@@ -43,7 +42,7 @@ void setup()
    network->connect();

    webServerPlugin->server->serveStatic(PIXEL_CONFIG_FILE, SPIFFS, "pixelConfig.json");
-    webServerPlugin->server->serveStatic(MQTT_CONFIG_FILE, SPIFFS, "config/mqtt.json");
+    webServerPlugin->server->serveStatic(MQTT_CONFIG_FILE, SPIFFS, "mqttConfig.json");

    sprocket->activate();
    sprocket->publish("pixels/pattern", "1");
--- a/src/var/mqcatt/mqcatt_config.h
+++ b/src/var/mqcatt/mqcatt_config.h
@@ -8,8 +8,8 @@

 // Chip config
 #define SPROCKET_TYPE       "ILLUCAT"
-#define SERIAL_BAUD_RATE 74880
-#define STARTUP_DELAY 5000
+#define SERIAL_BAUD_RATE    115200
+#define STARTUP_DELAY       1000

 // Network config
 #define WIFI_MODE           0
@@ -18,14 +18,14 @@
 #define AP_PASSWORD         "illumination"
 #define MESH_PREFIX         "illucat-mesh"
 #define MESH_PASSWORD       "th3r31sn0sp00n"
-#define STATION_SSID "thobens-416257"
-#define STATION_PASSWORD "467304645DB5"
+#define STATION_SSID        "MyAP"
+#define STATION_PASSWORD    "th3r31sn0sp00n"
 #define HOSTNAME            "illucat"
 #define CONNECT_TIMEOUT     10000

 // config files
 #define PIXEL_CONFIG_FILE "/pixelConfig.json"
-#define MQTT_CONFIG_FILE "/config/mqtt.json"
+#define MQTT_CONFIG_FILE "/mqttConfig.json"

 // NeoPixel
 #define LED_STRIP_PIN D2
@@ -35,7 +35,7 @@
 #define LED_STRIP_DEFAULT_COLOR 100
 #define COLOR_CONNECTED LED_STRIP_DEFAULT_COLOR
 #define COLOR_NOT_CONNECTED 255
-#define LED_STRIP_DEFAULT_PATTERN 1
+

 // OTA config
 #define OTA_PORT 8266
@@ -43,11 +43,9 @@

 // mqtt config
 #define MQTT_CLIENT_NAME     "illucat"
-#define MQTT_HOST "192.168.88.110"
+#define MQTT_HOST            "192.168.1.2"
 #define MQTT_PORT            1883
 #define MQTT_ROOT_TOPIC      "wirelos/illucat"
-#define MQTT_USER ""
-#define MQTT_PASS ""

 // WebServer
 #define WEB_CONTEXT_PATH "/"
@@ -55,4 +53,5 @@
 #define WEB_DEFAULT_FILE "index.html"
 #define WEB_PORT 80

+
 #endif
Author	SHA1	Message	Date
Patrick Balsiger	354564cf62	feat: docker build	2021-02-02 16:27:30 +01:00
0x1d	2fa6fadac6	Merge branch 'feature/esp32-build' into 'master' feat: add ESP32 build See merge request 0x1d/illucat!12	2020-09-27 11:35:07 +00:00
Patrick Balsiger	212baf7660	feat: add ESP32 build	2020-09-27 09:20:42 +02:00