diff --git a/.gitignore b/.gitignore index 3e2a754..8c6bdbc 100644 --- a/.gitignore +++ b/.gitignore @@ -74,5 +74,6 @@ dist/ /firmware .clang_complete .gcc-flags.json -.pioenvs -.piolibdeps +.pioenvs +.piolibdeps +.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/platformio.ini b/platformio.ini index eda3064..c6e502b 100644 --- a/platformio.ini +++ b/platformio.ini @@ -1,25 +1,23 @@ [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 - rc-switch - https://gitlab.com/wirelos/sprocket-lib.git#develop + arkhipenko/TaskScheduler@^3.8.5 + bblanchon/ArduinoJson@5.13.4 + sui77/rc-switch@^2.6.4 + https://gitlab.com/wirelos/sprocket-lib.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} \ No newline at end of file