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

Compare commits

base: iot:master
Branches Tags
iot:master iot:branch/docker-build iot:bugfix/mqtt-integration iot:documentation iot:color-pot
iot:release-1.0.0
..
compare: iot:branch/docker-build
Branches Tags
iot:master iot:branch/docker-build iot:bugfix/mqtt-integration iot:documentation iot:color-pot
iot:release-1.0.0

1 Commits
master ... branch/doc

Author SHA1 Message Date
Patrick Balsiger
354564cf62 feat: docker build 2021-02-02 16:27:30 +01:00
7 changed files with 87 additions and 170 deletions
Expand all files Collapse all files

16
.gitlab-ci.yml
View File

@@ -1,4 +1,4 @@
image: python:3.12.10 image: python:2.7-stretch
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:
- .pio/ - .pioenvs/
firmware: firmware:
stage: build stage: build
image: python:3.12.10 image: python:2.7-stretch
before_script: before_script:
- pip install -U platformio - pip install -U platformio
script: script:
- pio run -t clean - pio run -t clean
- pio run -e release - pio run
- 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 .pio/build/release/firmware.bin ${PROJECT_NAME}/${CI_COMMIT_TAG} - mv .pioenvs/release/firmware.bin ${PROJECT_NAME}/${CI_COMMIT_TAG}
- mv .pio/build/release/spiffs.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" - 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}

8
.gitpod.yml
View File

@@ -1,8 +0,0 @@
# 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

3
Dockerfile Normal file
View File

@@ -0,0 +1,3 @@
FROM python:3.6-stretch as builder
RUN pip install -U platformio

42
Makefile
View File

@@ -1,40 +1,4 @@
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: build:
$(PIO) run -e esp01 docker build -t wirelos/platformio .
upload: run-workspace:
$(PIO) run -e esp01 -t upload docker run -it --rm -v $PWD:/project wirelos/platformio bash
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://192.168.4.1/pixel/api http://illucat/pixel/api
# set color only on current node # set color only on current node
curl -v -X POST \ curl -v -X POST \

16
data/config/wifi.json
View File

@@ -1,9 +1,9 @@
{ {
"stationMode": 0, "stationMode": 1,
"hostname": "illucat", "hostname": "bar-light",
"apSSID": "illucat", "apSSID": "bar-light",
"apPassword": "illumination", "apPassword": "th3r31sn0sp00n",
"connectTimeout": 15000, "connectTimeout": 5000,
"stationSSID": "dis-wifi", "stationSSID": "UPC7823296",
"stationPassword": "dis-wifi-passwort" "stationPassword": "rthYx4Vnfeza"
} }u

170
platformio.ini
View File

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