iot/sprocket-device-illucat
1
0
Fork 0
mirror of https://gitlab.com/zwirbel/illucat.git synced 2025-12-15 09:48:21 +01:00
Code Issues Packages Projects Releases Wiki Activity

pin versions

Browse Source
This commit is contained in:
0x1d
2025-08-14 20:15:09 +02:00
parent 210e32eb5a
commit 22004ba8e6
4 changed files with 143 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
.gitlab-ci.yml
View File

@@ -1,4 +1,4 @@
image: python:2.7-stretch image: python:3.12.10
variables: variables:
S3_BUCKET_NAME: "wirelos" S3_BUCKET_NAME: "wirelos"
@@ -12,16 +12,16 @@ stages:
cache: cache:
key: ${CI_COMMIT_REF_SLUG} key: ${CI_COMMIT_REF_SLUG}
paths: paths:
- .pioenvs/ - .pio/
firmware: firmware:
stage: build stage: build
image: python:2.7-stretch image: python:3.12.10
before_script: before_script:
- pip install -U platformio - pip install -U platformio
script: script:
- pio run -t clean - pio run -t clean
- pio run - pio run -e release
- pio run -t buildfs - pio run -t buildfs
release: release:
@@ -30,11 +30,11 @@ release:
- /^release-.*$/ - /^release-.*$/
image: python:latest image: python:latest
script: script:
- pip install awscli #- pip install awscli
- mkdir -p ${PROJECT_NAME}/${CI_COMMIT_TAG} - mkdir -p ${PROJECT_NAME}/${CI_COMMIT_TAG}
- mv .pioenvs/release/firmware.bin ${PROJECT_NAME}/${CI_COMMIT_TAG} - mv .pio/build/release/firmware.bin ${PROJECT_NAME}/${CI_COMMIT_TAG}
- mv .pioenvs/release/spiffs.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" #- aws s3 --endpoint-url=https://$DO_SPACE_ENDPOINT cp ./ s3://$S3_BUCKET_NAME/ --recursive --exclude "*" --include "*.bin"
artifacts: artifacts:
paths: paths:
- ${PROJECT_NAME}/${CI_COMMIT_TAG} - ${PROJECT_NAME}/${CI_COMMIT_TAG}

30
Makefile
View File

@@ -9,8 +9,32 @@ init:
sudo udevadm control --reload-rules sudo udevadm control --reload-rules
sudo udevadm trigger sudo udevadm trigger
build: build:
$(PIO) run -e build $(PIO) run -e esp01
upload: upload:
$(PIO) run -e build -t upload $(PIO) run -e esp01 -t upload
uploadfs: uploadfs:
$(PIO) run -e build -t 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

2
api.md
View File

@@ -51,7 +51,7 @@ Examples:
curl -v -X POST \ curl -v -X POST \
--data "topic=pixels/colorWheel" \ --data "topic=pixels/colorWheel" \
--data "payload=20" \ --data "payload=20" \
http://illucat/pixel/api http://192.168.4.1/pixel/api
# set color only on current node # set color only on current node
curl -v -X POST \ curl -v -X POST \

171
platformio.ini
View File

@@ -13,36 +13,60 @@ env_default = build
[common] [common]
framework = arduino framework = arduino
platform = espressif8266@2.0.4 platform = platformio/espressif8266@2.3.2
board = esp12e board = esp12e
upload_speed = 921600 upload_speed = 115200
monitor_baud = 115200 monitor_baud = 115200
lib_deps = lib_deps =
Hash Hash
TaskScheduler TaskScheduler
SPIFFS ;SPIFFS
ArduinoJson@5.13.4 ArduinoJson@5.13.4
Adafruit NeoPixel@1.8.0 adafruit/Adafruit NeoPixel@1.7.0
ESPAsyncTCP me-no-dev/ESPAsyncTCP@1.2.0
me-no-dev/ESPAsyncWebServer@1.2.3
me-no-dev/AsyncTCP@1.1.1
ESP8266mDNS ESP8266mDNS
ESP Async WebServer symlink://../../core
https://gitlab.com/wirelos/sprocket-lib.git#develop symlink://../../plugins/neopixel
https://gitlab.com/wirelos/sprocket-plugin-neopixel.git ;https://gitlab.com/wirelos/sprocket-lib.git#develop
;https://gitlab.com/wirelos/sprocket-plugin-neopixel.git
[env:build-esp32] [env:esp01]
platform = espressif32
board = esp32dev
src_filter = +<*> -<var/> +<var/wifi/> 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} upload_speed = ${common.upload_speed}
monitor_baud = ${common.monitor_baud} monitor_baud = ${common.monitor_baud}
framework = ${common.framework} framework = ${common.framework}
build_flags = -DSPROCKET_PRINT=1 build_flags = -Wl,-Teagle.flash.1m256.ld -DSPROCKET_PRINT=1
lib_deps = ${common.lib_deps} lib_deps = ${common.lib_deps}
https://gitlab.com/wirelos/sprocket-network-wifi.git#next symlink://../../network/wifi
https://gitlab.com/wirelos/sprocket-plugin-web.git#next symlink://../../plugins/web
;https://gitlab.com/wirelos/sprocket-network-wifi.git#next
;https://gitlab.com/wirelos/sprocket-plugin-web.git#next
;[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] [env:build]
src_filter = +<*> -<var/> +<var/wifi/> src_filter = +<*> -<var/> +<var/wifi/>
platform = ${common.platform} platform = ${common.platform}
@@ -53,22 +77,10 @@ framework = ${common.framework}
build_flags = -Wl,-Teagle.flash.4m1m.ld build_flags = -Wl,-Teagle.flash.4m1m.ld
-DSPROCKET_PRINT=1 -DSPROCKET_PRINT=1
lib_deps = ${common.lib_deps} lib_deps = ${common.lib_deps}
https://gitlab.com/wirelos/sprocket-network-wifi.git#next symlink://../../network/wifi
https://gitlab.com/wirelos/sprocket-plugin-web.git#next symlink://../../plugins/web
;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
[env:release] [env:release]
src_filter = +<*> -<var/> +<var/wifi/> src_filter = +<*> -<var/> +<var/wifi/>
@@ -80,38 +92,69 @@ framework = ${common.framework}
build_flags = -Wl,-Teagle.flash.4m1m.ld build_flags = -Wl,-Teagle.flash.4m1m.ld
-DSPROCKET_PRINT=0 -DSPROCKET_PRINT=0
lib_deps = ${common.lib_deps} lib_deps = ${common.lib_deps}
https://gitlab.com/wirelos/sprocket-network-wifi.git#next ;symlink://../../network/wifi
https://gitlab.com/wirelos/sprocket-plugin-web.git#next ;symlink://../../plugins/web
https://gitlab.com/wirelos/sprocket-network-wifi.git#master
https://gitlab.com/wirelos/sprocket-plugin-web.git#master
[env:mqcatt] ;[env:build-mesh]
src_filter = +<*> -<var/> +<var/mqcatt/> ;src_filter = +<*> -<var/> +<var/wifiMesh/>
platform = ${common.platform} ;platform = ${common.platform}
board = ${common.board} ;board = ${common.board}
upload_speed = ${common.upload_speed} ;upload_speed = ${common.upload_speed}
monitor_baud = ${common.monitor_baud} ;monitor_baud = ${common.monitor_baud}
framework = ${common.framework} ;framework = ${common.framework}
build_flags = -Wl,-Teagle.flash.4m1m.ld ;build_flags = -Wl,-Teagle.flash.4m1m.ld
-DSPROCKET_PRINT=1 ; -DSPROCKET_PRINT=1
lib_deps = ${common.lib_deps} ;lib_deps = ${common.lib_deps}
https://gitlab.com/wirelos/sprocket-network-wifi.git#next ; https://gitlab.com/wirelos/painlessMesh.git
https://gitlab.com/wirelos/sprocket-plugin-web.git#next ; https://gitlab.com/wirelos/sprocket-network-mesh.git#forked-mesh
https://gitlab.com/wirelos/sprocket-plugin-mqtt.git#next ;
PubSubClient ;[env:release]
;src_filter = +<*> -<var/> +<var/wifi/>
[env:illuchat] ;platform = ${common.platform}
src_filter = +<*> -<var/> +<var/illuchat/> ;board = ${common.board}
platform = ${common.platform} ;upload_speed = ${common.upload_speed}
board = ${common.board} ;monitor_baud = ${common.monitor_baud}
upload_speed = ${common.upload_speed} ;framework = ${common.framework}
monitor_baud = ${common.monitor_baud} ;build_flags = -Wl,-Teagle.flash.4m1m.ld
framework = ${common.framework} ; -DSPROCKET_PRINT=0
build_flags = -Wl,-Teagle.flash.4m1m.ld ;lib_deps = ${common.lib_deps}
-DSPROCKET_PRINT=1 ; symlink://../../network/wifi
lib_deps = ${common.lib_deps} ; symlink://../../plugins/web
https://gitlab.com/wirelos/sprocket-network-wifi.git#next ; ;https://gitlab.com/wirelos/sprocket-network-wifi.git#next
https://gitlab.com/wirelos/sprocket-plugin-web.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 ;[env:mqcatt]
PubSubClient ;src_filter = +<*> -<var/> +<var/mqcatt/>
ArduinoIRC ;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
;