From bcd3d38b195064ffad2d98e6e423434329cc251a Mon Sep 17 00:00:00 2001 From: Julien Cabillot Date: Wed, 8 Nov 2017 10:15:02 +0100 Subject: [PATCH 1/6] use stable version --- .gitlab-ci.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index d1b19dd..2da694e 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -7,16 +7,16 @@ inocode: BOARD: "${INSTBOARD}:nodemcuv2" before_script: - cd / - - wget --quiet "https://www.arduino.cc/download.php?f=/arduino-nightly-linux64.tar.xz" -O "arduino-nightly-linux64.tar.xz" - - tar axf "arduino-nightly-linux64.tar.xz" - - /arduino-nightly/arduino --pref "boardsmanager.additional.urls=${ESPURL}" - - /arduino-nightly/arduino --install-boards "${INSTBOARD}" + - wget --quiet "https://downloads.arduino.cc/arduino-1.8.5-linux64.tar.xz" -O "arduino-1.8.5-linux64.tar.xz" + - tar axf "arduino-1.8.5-linux64.tar.xz" + - /arduino-1.8.5/arduino --pref "boardsmanager.additional.urls=${ESPURL}" + - /arduino-1.8.5/arduino --install-boards "${INSTBOARD}" script: - cd "${CI_PROJECT_DIR}/arduino/${CI_PROJECT_NAME}" - cp "${CI_PROJECT_NAME}.example.h" "${CI_PROJECT_NAME}.h" - - /arduino-nightly/arduino --install-library "FastLED" - - /arduino-nightly/arduino --install-library "PubSubClient" - - /arduino-nightly/arduino --pref "${MEMORY}" --board "${BOARD}" --verify "${CI_PROJECT_NAME}.ino" + - /arduino-1.8.5/arduino --install-library "FastLED" + - /arduino-1.8.5/arduino --install-library "PubSubClient" + - /arduino-1.8.5/arduino --pref "${MEMORY}" --board "${BOARD}" --verify "${CI_PROJECT_NAME}.ino" yaml: image: "python:alpine" From 7175e6b0ba72ac98056f32f284b71584d213eb58 Mon Sep 17 00:00:00 2001 From: Julien Cabillot Date: Wed, 8 Nov 2017 10:23:21 +0100 Subject: [PATCH 2/6] necessite Xvfb --- .gitlab-ci.yml | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 2da694e..2628f85 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -5,18 +5,24 @@ inocode: MEMORY: "custom_FlashSize=nodemcuv2_4M3M" INSTBOARD: "esp8266:esp8266" BOARD: "${INSTBOARD}:nodemcuv2" + ARDVER: "1.8.5" before_script: + - apt update + - apt -y install xvfb + - Xvfb :1 -nolisten tcp -screen :1 1280x800x24 & + - export DISPLAY=":1" - cd / - - wget --quiet "https://downloads.arduino.cc/arduino-1.8.5-linux64.tar.xz" -O "arduino-1.8.5-linux64.tar.xz" - - tar axf "arduino-1.8.5-linux64.tar.xz" - - /arduino-1.8.5/arduino --pref "boardsmanager.additional.urls=${ESPURL}" - - /arduino-1.8.5/arduino --install-boards "${INSTBOARD}" + - wget --quiet "https://downloads.arduino.cc/arduino-${ARDVER}-linux64.tar.xz" -O "arduino-${ARDVER}-linux64.tar.xz" + - tar axf "arduino-${ARDVER}-linux64.tar.xz" + - /arduino-${ARDVER}/arduino --pref "boardsmanager.additional.urls=${ESPURL}" --save-prefs + - /arduino-${ARDVER}/arduino --install-boards "${INSTBOARD}" + - /arduino-${ARDVER}/arduino --pref "compiler.warning_level=all" --pref "${MEMORY}" --pref "${FLASHFREQ}" --board "${BOARD}" --save-prefs script: - cd "${CI_PROJECT_DIR}/arduino/${CI_PROJECT_NAME}" - cp "${CI_PROJECT_NAME}.example.h" "${CI_PROJECT_NAME}.h" - - /arduino-1.8.5/arduino --install-library "FastLED" - - /arduino-1.8.5/arduino --install-library "PubSubClient" - - /arduino-1.8.5/arduino --pref "${MEMORY}" --board "${BOARD}" --verify "${CI_PROJECT_NAME}.ino" + - /arduino-${ARDVER}/arduino --install-library "FastLED" + - /arduino-${ARDVER}/arduino --install-library "PubSubClient" + - /arduino-${ARDVER}/arduino --verify "${CI_PROJECT_NAME}.ino" yaml: image: "python:alpine" From 8df3b724854e99a4567b1dc875096d49bf0ca10e Mon Sep 17 00:00:00 2001 From: Julien Cabillot Date: Wed, 8 Nov 2017 10:27:48 +0100 Subject: [PATCH 3/6] pas besoin de flashfreq --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 2628f85..bbae3f2 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -16,7 +16,7 @@ inocode: - tar axf "arduino-${ARDVER}-linux64.tar.xz" - /arduino-${ARDVER}/arduino --pref "boardsmanager.additional.urls=${ESPURL}" --save-prefs - /arduino-${ARDVER}/arduino --install-boards "${INSTBOARD}" - - /arduino-${ARDVER}/arduino --pref "compiler.warning_level=all" --pref "${MEMORY}" --pref "${FLASHFREQ}" --board "${BOARD}" --save-prefs + - /arduino-${ARDVER}/arduino --pref "compiler.warning_level=all" --pref "${MEMORY}" --board "${BOARD}" --save-prefs script: - cd "${CI_PROJECT_DIR}/arduino/${CI_PROJECT_NAME}" - cp "${CI_PROJECT_NAME}.example.h" "${CI_PROJECT_NAME}.h" From 18191801553589dc0afe1e7e0fdc05c7b8d444cd Mon Sep 17 00:00:00 2001 From: Julien Cabillot Date: Wed, 8 Nov 2017 10:34:54 +0100 Subject: [PATCH 4/6] ajout de RemoteDebug --- .gitlab-ci.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index bbae3f2..7795979 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -6,6 +6,7 @@ inocode: INSTBOARD: "esp8266:esp8266" BOARD: "${INSTBOARD}:nodemcuv2" ARDVER: "1.8.5" + GITREMDEB: "https://github.com/JoaoLopesF/ESP8266-RemoteDebug-Telnet.git" before_script: - apt update - apt -y install xvfb @@ -18,6 +19,8 @@ inocode: - /arduino-${ARDVER}/arduino --install-boards "${INSTBOARD}" - /arduino-${ARDVER}/arduino --pref "compiler.warning_level=all" --pref "${MEMORY}" --board "${BOARD}" --save-prefs script: + - cd "/root/Arduino/libraries/" + - git clone "${GITREMDEB}" - cd "${CI_PROJECT_DIR}/arduino/${CI_PROJECT_NAME}" - cp "${CI_PROJECT_NAME}.example.h" "${CI_PROJECT_NAME}.h" - /arduino-${ARDVER}/arduino --install-library "FastLED" From 196d6cb4778970131c5e38fc91dbef940ba94117 Mon Sep 17 00:00:00 2001 From: Julien Cabillot Date: Wed, 8 Nov 2017 10:41:52 +0100 Subject: [PATCH 5/6] changement de check pour homeassistant --- .gitlab-ci.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 7795979..2d3a1f3 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -30,7 +30,6 @@ inocode: yaml: image: "python:alpine" before_script: - - pip install "PyYAML" + - pip install "homeassistant" script: - - cd "${CI_PROJECT_DIR}/home-assistant" - - python -c "from yaml import load, Loader; load(open('configuration.yaml'), Loader=Loader)" + - hass --config "${CI_PROJECT_DIR}/home-assistant" --script check_config From d8cd9401b9dcf19afe9c04cf0bad394467203622 Mon Sep 17 00:00:00 2001 From: Julien Cabillot Date: Wed, 8 Nov 2017 10:47:12 +0100 Subject: [PATCH 6/6] input_slider a disparu et deviens input_number --- home-assistant/conf_input_slider.d/strip1.yaml | 6 ------ home-assistant/configuration.yaml | 8 ++++---- 2 files changed, 4 insertions(+), 10 deletions(-) delete mode 100644 home-assistant/conf_input_slider.d/strip1.yaml diff --git a/home-assistant/conf_input_slider.d/strip1.yaml b/home-assistant/conf_input_slider.d/strip1.yaml deleted file mode 100644 index 87a0dae..0000000 --- a/home-assistant/conf_input_slider.d/strip1.yaml +++ /dev/null @@ -1,6 +0,0 @@ -strip1_animation_speed: - name: "Strip1 Animation Speed" - initial: 120 - min: 1 - max: 150 - step: 8 diff --git a/home-assistant/configuration.yaml b/home-assistant/configuration.yaml index 0446c29..3fdbcd3 100644 --- a/home-assistant/configuration.yaml +++ b/home-assistant/configuration.yaml @@ -5,7 +5,7 @@ mqtt: username: "XXX" password: "XXX" -input_slider: !include_dir_merge_named "conf_input_slider.d/" -light: !include_dir_merge_list "conf_light.d/" -automation: !include_dir_merge_list "conf_automation.d/" -group: !include_dir_merge_named "conf_group.d/" +input_number: !include_dir_merge_named "conf_input_number.d/" +light: !include_dir_merge_list "conf_light.d/" +automation: !include_dir_merge_list "conf_automation.d/" +group: !include_dir_merge_named "conf_group.d/"