diff --git a/.gitignore b/.gitignore index c021f1b..a1f349c 100755 --- a/.gitignore +++ b/.gitignore @@ -67,4 +67,6 @@ 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 100755 --- 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/platformio.ini b/platformio.ini index 023ef2b..97cb52d 100755 --- a/platformio.ini +++ b/platformio.ini @@ -1,46 +1,44 @@ [platformio] -env_default = basic, chat +default_envs = basic, chat [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 + arkhipenko/TaskScheduler@^3.8.5 ArduinoJson@5.13.4 - https://gitlab.com/wirelos/sprocket-lib.git#develop - https://gitlab.com/wirelos/sprocket-network-wifi.git + 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} - PubSubClient + knolleary/PubSubClient@^2.8 [env:chat] -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} - PubSubClient + knolleary/PubSubClient@^2.8 [env:chat-esp01] -src_filter = +<*> - + +build_src_filter = +<*> - + platform = ${common.platform} board = esp01 upload_speed = ${common.upload_speed} -monitor_baud = ${common.monitor_baud} +monitor_speed = ${common.monitor_speed} framework = ${common.framework} lib_deps = ${common.lib_deps} - PubSubClient \ No newline at end of file + knolleary/PubSubClient@^2.8 \ No newline at end of file