mirror of
https://gitlab.com/zwirbel/illucat.git
synced 2025-12-14 09:26:49 +01:00
pin versions
This commit is contained in:
@@ -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}
|
||||
|
||||
30
Makefile
30
Makefile
@@ -9,8 +9,32 @@ init:
|
||||
sudo udevadm control --reload-rules
|
||||
sudo udevadm trigger
|
||||
build:
|
||||
$(PIO) run -e build
|
||||
$(PIO) run -e esp01
|
||||
upload:
|
||||
$(PIO) run -e build -t upload
|
||||
$(PIO) run -e esp01 -t upload
|
||||
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
2
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 \
|
||||
|
||||
171
platformio.ini
171
platformio.ini
@@ -13,36 +13,60 @@ 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
|
||||
;SPIFFS
|
||||
ArduinoJson@5.13.4
|
||||
Adafruit NeoPixel@1.8.0
|
||||
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#develop
|
||||
;https://gitlab.com/wirelos/sprocket-plugin-neopixel.git
|
||||
|
||||
|
||||
[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#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]
|
||||
src_filter = +<*> -<var/> +<var/wifi/>
|
||||
platform = ${common.platform}
|
||||
@@ -53,22 +77,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#next
|
||||
;https://gitlab.com/wirelos/sprocket-plugin-web.git#next
|
||||
|
||||
[env:release]
|
||||
src_filter = +<*> -<var/> +<var/wifi/>
|
||||
@@ -80,38 +92,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
|
||||
;
|
||||
Reference in New Issue
Block a user