From ac368b004810894c3db6d5d0e3bfb2ce21bcc59d Mon Sep 17 00:00:00 2001 From: Patrick Balsiger Date: Thu, 14 Aug 2025 22:19:29 +0200 Subject: [PATCH] pin versions --- .gitignore | 3 ++- .gitlab-ci.yml | 8 ++++---- data/config.json | 4 ++-- platformio.ini | 26 +++++++++++--------------- 4 files changed, 19 insertions(+), 22 deletions(-) diff --git a/.gitignore b/.gitignore index 8dcb28b..8f82854 100644 --- a/.gitignore +++ b/.gitignore @@ -69,4 +69,5 @@ typings/ .gcc-flags.json .pioenvs .piolibdeps - data/config.json \ No newline at end of file +data/config.json +.pio \ No newline at end of file diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 00f20b5..e123e35 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,4 +1,4 @@ -image: python:2.7-stretch +image: python:3.12.10 stages: - build @@ -8,7 +8,7 @@ before_script: examples: stage: build - image: python:2.7-stretch + image: python:3.12.10 script: - - pio run -t clean - - pio run -e basic \ No newline at end of file + - pio run --target clean + - pio run \ No newline at end of file diff --git a/data/config.json b/data/config.json index 82c9e85..69fee34 100644 --- a/data/config.json +++ b/data/config.json @@ -2,10 +2,10 @@ "stationMode": 1, "hostname": "sprocket", "apSSID": "sprocket", - "apPassword": "th3r31sn0Sp00n", + "apPassword": "somethingSneaky", "connectTimeout": 20000, "stationSSID": "MyAP", - "stationPassword": "th3r31sn0Sp00n", + "stationPassword": "somethingSneaky", "meshSSID": "whateverYouLike", "meshPassword": "somethingSneaky", "meshPort": 5555, diff --git a/platformio.ini b/platformio.ini index 02b0afc..ac6382d 100644 --- a/platformio.ini +++ b/platformio.ini @@ -1,28 +1,24 @@ [platformio] -env_default = basic +default_envs = basic [common] framework = arduino -platform = espressif8266 +platform = platformio/espressif8266@2.6.3 board = esp12e upload_speed = 921600 -monitor_baud = 115200 +monitor_speed = 115200 lib_deps = - Hash - TaskScheduler - SPIFFS - ArduinoJson - ArduinoOTA - https://gitlab.com/wirelos/sprocket-lib.git#develop - https://gitlab.com/wirelos/sprocket-network-wifi.git + arkhipenko/TaskScheduler@^3.8.5 + bblanchon/ArduinoJson@5.13.4 + fredimachado/ArduinoIRC@^0.2.0 + https://gitlab.com/wirelos/sprocket-lib.git#master + https://gitlab.com/wirelos/sprocket-network-wifi.git#master [env:basic] -src_filter = +<*> - + +build_src_filter = +<*> - + platform = ${common.platform} board = ${common.board} upload_speed = ${common.upload_speed} -monitor_baud = ${common.monitor_baud} +monitor_speed = ${common.monitor_speed} framework = ${common.framework} -lib_deps = ${common.lib_deps} - ESP8266mDNS - ArduinoIRC \ No newline at end of file +lib_deps = ${common.lib_deps} \ No newline at end of file