update deps

pin versions
feat: uploadfs
2025-12-18 18:55:50 +01:00 · 2025-08-14 20:19:41 +02:00 · 2025-08-14 20:15:09 +02:00 · 2022-06-22 22:08:04 +02:00 · 2022-06-22 17:32:44 +00:00 · 2021-10-08 18:47:25 +02:00
7 changed files with 170 additions and 87 deletions
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,4 +1,4 @@
-image: python:2.7-stretch
+image: python:3.12.10

 variables:
  S3_BUCKET_NAME: "wirelos"
@@ -12,16 +12,16 @@ stages:
 cache: 
  key: ${CI_COMMIT_REF_SLUG} 
  paths: 
-    - .pioenvs/
+    - .pio/

 firmware:
  stage: build
-  image: python:2.7-stretch
+  image: python:3.12.10
  before_script:
    - pip install -U platformio
  script:
    - pio run -t clean
-    - pio run
+    - pio run -e release
    - pio run -t buildfs

 release:
@@ -30,11 +30,11 @@ release:
    - /^release-.*$/
  image: python:latest
  script:
-    - pip install awscli
+    #- pip install awscli
    - mkdir -p ${PROJECT_NAME}/${CI_COMMIT_TAG}
-    - mv .pioenvs/release/firmware.bin ${PROJECT_NAME}/${CI_COMMIT_TAG}
-    - mv .pioenvs/release/spiffs.bin ${PROJECT_NAME}/${CI_COMMIT_TAG}
-    - aws s3 --endpoint-url=https://$DO_SPACE_ENDPOINT cp ./ s3://$S3_BUCKET_NAME/ --recursive --exclude "*" --include "*.bin"
+    - mv .pio/build/release/firmware.bin ${PROJECT_NAME}/${CI_COMMIT_TAG}
+    - mv .pio/build/release/spiffs.bin ${PROJECT_NAME}/${CI_COMMIT_TAG}
+    #- aws s3 --endpoint-url=https://$DO_SPACE_ENDPOINT cp ./ s3://$S3_BUCKET_NAME/ --recursive --exclude "*" --include "*.bin"
  artifacts:
    paths:
      - ${PROJECT_NAME}/${CI_COMMIT_TAG}
--- a/.gitpod.yml
+++ b/.gitpod.yml
@@ -0,0 +1,8 @@
+# This configuration file was automatically generated by Gitpod.
+# Please adjust to your needs (see https://www.gitpod.io/docs/config-gitpod-file)
+# and commit this file to your remote git repository to share the goodness with others.
+
+tasks:
+  - init: make install
+
+
--- a/3
+++ b/3
@@ -1,3 +0,0 @@
-FROM python:3.6-stretch as builder
-
-RUN pip install -U platformio
--- a/42
+++ b/42
@@ -1,4 +1,40 @@
+PIO ?= platformio
+
+flash: upload uploadfs
+
+install:
+	python3 -c "$(curl -fsSL https://raw.githubusercontent.com/platformio/platformio/master/scripts/get-platformio.py)"
+init:
+	curl -fsSL https://raw.githubusercontent.com/platformio/platformio-core/master/scripts/99-platformio-udev.rules | sudo tee /etc/udev/rules.d/99-platformio-udev.rules
+	sudo udevadm control --reload-rules
+	sudo udevadm trigger
 build:
-	docker build -t wirelos/platformio .
-run-workspace:
-	docker run -it --rm -v $PWD:/project wirelos/platformio bash
+	$(PIO) run -e esp01
+upload:
+	$(PIO) run -e esp01 -t upload
+uploadfs:
+	$(PIO) run -e esp01 -t uploadfs
+
+spiffs.bin:
+	#mkspiffs -c data -p 256 -b 4096 -s 524288 spiffs.bin
+	mkspiffs -c data -p 256 -b 4096 -s 65536  spiffs.bin
+
+upload-esp01:
+	#esptool.py --port /dev/ttyUSB0 --baud 115200 write_flash --flash_size 1MB 0x00000 .pio/build/esp01/firmware.bin
+	#esptool.py --port /dev/ttyUSB0 --baud 57600 write_flash --flash_size 1MB 0x80000 spiffs.bin
+
+	# that almost worked
+	#esptool.py --port /dev/ttyUSB0 --baud 57600  write_flash --flash_mode dio --flash_size 1MB 0x00000 .pio/build/esp01/firmware.bin 0x80000 spiffs.bin
+
+	#pio does this
+	esptool.py --chip esp8266 --port "/dev/ttyUSB0" --baud 921600 write_flash 0x0 .pio/build/esp01/firmware.bin 0x000eb000 spiffs.bin
+	esptool.py --port /dev/ttyUSB0 --baud 57600  write_flash 43827 spiffs.bin
+
+# for 4MB Flash Size, 3MB SPIFFS
+#spiffs.bin:
+#	mkspiffs -c data -p 256 -b 4096 -s 3145728 spiffs.bin
+#
+#upload-spiffs.bin:
+#	esptool --port /dev/ttyUSB0 write_flash 0x300000 spiffs.bin
+
+
--- a/api.md
+++ b/api.md
@@ -51,7 +51,7 @@ Examples:
 curl -v -X POST \
    --data "topic=pixels/colorWheel" \
    --data "payload=20" \
-    http://illucat/pixel/api  
+    http://192.168.4.1/pixel/api  

 # set color only on current node
 curl -v -X POST \
--- a/data/config/wifi.json
+++ b/data/config/wifi.json
@@ -1,9 +1,9 @@
 {
-    "stationMode": 1,
-    "hostname": "bar-light",
-    "apSSID": "bar-light",
-    "apPassword": "th3r31sn0sp00n",
-    "connectTimeout": 5000,
-    "stationSSID": "UPC7823296",
-    "stationPassword": "rthYx4Vnfeza"
-}u
+    "stationMode": 0,
+    "hostname": "illucat",
+    "apSSID": "illucat",
+    "apPassword": "illumination",
+    "connectTimeout": 15000,
+    "stationSSID": "dis-wifi",
+    "stationPassword": "dis-wifi-passwort"
+}
--- a/platformio.ini
+++ b/platformio.ini
@@ -13,36 +13,59 @@ env_default = build

 [common]
 framework = arduino
-platform = espressif8266@2.0.4
+platform = platformio/espressif8266@2.3.2
 board = esp12e
-upload_speed = 921600
+upload_speed = 115200
 monitor_baud = 115200
 lib_deps = 
    Hash
    TaskScheduler
-    SPIFFS
    ArduinoJson@5.13.4
-    Adafruit NeoPixel
-    ESPAsyncTCP
+    adafruit/Adafruit NeoPixel@1.7.0
+    me-no-dev/ESPAsyncTCP@1.2.0
+    me-no-dev/ESPAsyncWebServer@1.2.3
+    me-no-dev/AsyncTCP@1.1.1
    ESP8266mDNS
-    ESP Async WebServer
-    https://gitlab.com/wirelos/sprocket-lib.git#develop
-    https://gitlab.com/wirelos/sprocket-plugin-neopixel.git
+    ;symlink://../../core
+    ;symlink://../../plugins/neopixel
+    https://gitlab.com/wirelos/sprocket-lib.git#master
+    https://gitlab.com/wirelos/sprocket-plugin-neopixel.git#master
    
    
-[env:build-esp32]
-platform = espressif32
-board = esp32dev
+[env:esp01]
 src_filter = +<*> -<var/> +<var/wifi/>
+platform = ${common.platform}
+board = esp01_1m
+board_build.f_cpu = 80000000L
+board_build.flash_mode = qio
+board_build.filesystem = spiffs
+board_build.ldscript = eagle.flash.1m256.ld
 upload_speed = ${common.upload_speed}
 monitor_baud = ${common.monitor_baud}
 framework = ${common.framework}
-build_flags = -DSPROCKET_PRINT=1
+build_flags = -Wl,-Teagle.flash.1m256.ld -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
+    ;symlink://../../network/wifi
+    ;symlink://../../plugins/web
+    https://gitlab.com/wirelos/sprocket-network-wifi.git#master
+    https://gitlab.com/wirelos/sprocket-plugin-web.git#master
    

+;[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}
+;    symlink://../../network/wifi
+;    symlink://../../plugins/web
+;    ;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}
@@ -53,22 +76,10 @@ framework = ${common.framework}
 build_flags = -Wl,-Teagle.flash.4m1m.ld
    -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-mesh]
-src_filter = +<*> -<var/> +<var/wifiMesh/>
-platform = ${common.platform}
-board = ${common.board}
-upload_speed = ${common.upload_speed}
-monitor_baud = ${common.monitor_baud}
-framework = ${common.framework}
-build_flags = -Wl,-Teagle.flash.4m1m.ld
-    -DSPROCKET_PRINT=1
-lib_deps = ${common.lib_deps}
-    https://gitlab.com/wirelos/painlessMesh.git
-    https://gitlab.com/wirelos/sprocket-network-mesh.git#forked-mesh
+    ;symlink://../../network/wifi
+    ;symlink://../../plugins/web
+    https://gitlab.com/wirelos/sprocket-network-wifi.git#master
+    https://gitlab.com/wirelos/sprocket-plugin-web.git#master

 [env:release]
 src_filter = +<*> -<var/> +<var/wifi/>
@@ -80,38 +91,69 @@ framework = ${common.framework}
 build_flags = -Wl,-Teagle.flash.4m1m.ld
    -DSPROCKET_PRINT=0
 lib_deps = ${common.lib_deps}
-    https://gitlab.com/wirelos/sprocket-network-wifi.git#next
-    https://gitlab.com/wirelos/sprocket-plugin-web.git#next
+    ;symlink://../../network/wifi
+    ;symlink://../../plugins/web
+    https://gitlab.com/wirelos/sprocket-network-wifi.git#master
+    https://gitlab.com/wirelos/sprocket-plugin-web.git#master

-
-[env:mqcatt]
-src_filter = +<*> -<var/> +<var/mqcatt/>
-platform = ${common.platform}
-board = ${common.board}
-upload_speed = ${common.upload_speed}
-monitor_baud = ${common.monitor_baud}
-framework = ${common.framework}
-build_flags = -Wl,-Teagle.flash.4m1m.ld
-    -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
-    https://gitlab.com/wirelos/sprocket-plugin-mqtt.git#next
-    PubSubClient
-
-[env:illuchat]
-src_filter = +<*> -<var/> +<var/illuchat/>
-platform = ${common.platform}
-board = ${common.board}
-upload_speed = ${common.upload_speed}
-monitor_baud = ${common.monitor_baud}
-framework = ${common.framework}
-build_flags = -Wl,-Teagle.flash.4m1m.ld
-    -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
-    https://gitlab.com/wirelos/sprocket-plugin-irc.git
-    https://gitlab.com/wirelos/sprocket-plugin-mqtt.git#next
-    PubSubClient
-    ArduinoIRC
+    
+;[env:build-mesh]
+;src_filter = +<*> -<var/> +<var/wifiMesh/>
+;platform = ${common.platform}
+;board = ${common.board}
+;upload_speed = ${common.upload_speed}
+;monitor_baud = ${common.monitor_baud}
+;framework = ${common.framework}
+;build_flags = -Wl,-Teagle.flash.4m1m.ld
+;    -DSPROCKET_PRINT=1
+;lib_deps = ${common.lib_deps}
+;    https://gitlab.com/wirelos/painlessMesh.git
+;    https://gitlab.com/wirelos/sprocket-network-mesh.git#forked-mesh
+;
+;[env:release]
+;src_filter = +<*> -<var/> +<var/wifi/>
+;platform = ${common.platform}
+;board = ${common.board}
+;upload_speed = ${common.upload_speed}
+;monitor_baud = ${common.monitor_baud}
+;framework = ${common.framework}
+;build_flags = -Wl,-Teagle.flash.4m1m.ld
+;    -DSPROCKET_PRINT=0
+;lib_deps = ${common.lib_deps}
+;    symlink://../../network/wifi
+;    symlink://../../plugins/web
+;    ;https://gitlab.com/wirelos/sprocket-network-wifi.git#next
+;    ;https://gitlab.com/wirelos/sprocket-plugin-web.git#next
+;
+;[env:mqcatt]
+;src_filter = +<*> -<var/> +<var/mqcatt/>
+;platform = ${common.platform}
+;board = ${common.board}
+;upload_speed = ${common.upload_speed}
+;monitor_baud = ${common.monitor_baud}
+;framework = ${common.framework}
+;build_flags = -Wl,-Teagle.flash.4m1m.ld
+;    -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
+;    https://gitlab.com/wirelos/sprocket-plugin-mqtt.git#next
+;    PubSubClient
+;
+;[env:illuchat]
+;src_filter = +<*> -<var/> +<var/illuchat/>
+;platform = ${common.platform}
+;board = ${common.board}
+;upload_speed = ${common.upload_speed}
+;monitor_baud = ${common.monitor_baud}
+;framework = ${common.framework}
+;build_flags = -Wl,-Teagle.flash.4m1m.ld
+;    -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
+;    https://gitlab.com/wirelos/sprocket-plugin-irc.git
+;    https://gitlab.com/wirelos/sprocket-plugin-mqtt.git#next
+;    PubSubClient
+;    ArduinoIRC
+;
Author	SHA1	Message	Date
Patrick Balsiger	d815117179	update deps	2025-08-14 20:19:41 +02:00
Patrick Balsiger	22004ba8e6	pin versions	2025-08-14 20:15:09 +02:00
Patrick balsiger	210e32eb5a	feat: uploadfs	2022-06-22 22:08:04 +02:00
0x1d	23ba26bc21	feat: pio install	2022-06-22 17:32:44 +00:00
Zwirbel	05fbbe90ea	fix: neopixel version, add makefile	2021-10-08 18:47:25 +02:00