From ddd9af2bf73379e2888383197b4e856c97534a66 Mon Sep 17 00:00:00 2001 From: Maxim Prokhorov Date: Sat, 26 May 2018 06:10:26 +0300 Subject: [PATCH 1/2] Cover more modules with travis --- code/espurna/config/hardware.h | 16 +++++++++++++++- code/platformio.ini | 8 ++++---- 2 files changed, 19 insertions(+), 5 deletions(-) diff --git a/code/espurna/config/hardware.h b/code/espurna/config/hardware.h index 067a02dc..6dd2e260 100644 --- a/code/espurna/config/hardware.h +++ b/code/espurna/config/hardware.h @@ -2355,6 +2355,8 @@ #define EMON_ADS1X15_SUPPORT 1 #define SHT3X_I2C_SUPPORT 1 #define SI7021_SUPPORT 1 + #define PMSX003_SUPPORT 1 + #define SENSEAIR_SUPPORT 1 // A bit of lights - pin 5 @@ -2435,7 +2437,7 @@ #define MHZ19_TX_PIN 10 // PZEM004T - #define PZEM004T_SUPPORT 0 // not working? + #define PZEM004T_SUPPORT 1 #define PZEM004T_RX_PIN 11 #define PZEM004T_TX_PIN 12 @@ -2447,6 +2449,13 @@ #define GUVAS12SD_SUPPORT 1 #define GUVAS12SD_PIN 14 + // Test non-default modules + #define MDNS_CLIENT_SUPPORT 1 + #define NOFUSS_SUPPORT 1 + #define UART_MQTT_SUPPORT 1 + #define INFLUXDB_SUPPORT 1 + #define IR_SUPPORT 1 + #elif defined(TRAVIS03) // Relay provider light/my92XX @@ -2470,6 +2479,11 @@ #define EMON_ANALOG_SUPPORT 1 #endif + // Test non-default modules + #define LLMNR_SUPPORT 1 + #define NETBIOS_SUPPORT 1 + #define SSDP_SUPPORT 1 + #endif // ----------------------------------------------------------------------------- diff --git a/code/platformio.ini b/code/platformio.ini index a3018e64..5f25c995 100644 --- a/code/platformio.ini +++ b/code/platformio.ini @@ -154,7 +154,7 @@ monitor_speed = 115200 extra_scripts = ${common.extra_scripts} [env:travis02] -platform = ${common.platform} +platform = ${common.platform_172} framework = arduino board = esp12e lib_deps = ${common.lib_deps} @@ -164,7 +164,7 @@ monitor_speed = 115200 extra_scripts = ${common.extra_scripts} [env:travis03] -platform = espressif8266@1.6.0 +platform = ${common.platform_172} framework = arduino board = esp12e lib_deps = ${common.lib_deps} @@ -190,7 +190,7 @@ extra_scripts = ${common.extra_scripts} modules = ${common.modules} [env:wemos-d1mini-relayshield-ssl] -platform = espressif8266@1.6.0 +platform = ${common.platform_172} framework = arduino board = d1_mini lib_deps = ${common.lib_deps} @@ -227,7 +227,7 @@ extra_scripts = ${common.extra_scripts} modules = ${common.modules} [env:nodemcu-lolin-ssl] -platform = espressif8266@1.6.0 +platform = ${common.platform_172} framework = arduino board = nodemcuv2 lib_deps = ${common.lib_deps} From e400cbb2be2f2cb8d8deae7a6ca4197d228ac3ed Mon Sep 17 00:00:00 2001 From: gn0st1c Date: Sun, 24 Jun 2018 14:47:45 +0300 Subject: [PATCH 2/2] Update platformio.ini *new platform 1.7.3 * changed remaining upload_port/upload_flags to get values from ENV ota.py --- code/platformio.ini | 140 ++++++++++++++++++++++---------------------- 1 file changed, 70 insertions(+), 70 deletions(-) diff --git a/code/platformio.ini b/code/platformio.ini index d4fcae6b..dfe24b42 100644 --- a/code/platformio.ini +++ b/code/platformio.ini @@ -11,11 +11,11 @@ data_dir = espurna/data # # platformIO 1.5.0 = arduino core 2.3.0 # platformIO 1.6.0 = arduino core 2.4.0 -# platformIO 1.7.2 = arduino core 2.4.1 +# platformIO 1.7.3 = arduino core 2.4.1 # ------------------------------------------------------------------------------ platform_150 = espressif8266@1.5.0 platform_160 = espressif8266@1.6.0 -platform_172 = espressif8266@1.7.2 +platform_173 = espressif8266@1.7.3 platform = ${common.platform_150} # ------------------------------------------------------------------------------ @@ -48,10 +48,10 @@ build_flags_4m3m = ${common.build_flags} -Wl,-Teagle.flash.4m3m4s.ld # GLOBALS: # ------------------------------------------------------------------------------ # IP address when using OTA -upload_port = "192.168.4.1" -upload_flags = --auth=fibonacci --port 8266 -#upload_port = "${env.ESPURNA_IP}" -#upload_flags = --auth=${env.ESPURNA_AUTH} --port 8266 +#upload_port = "192.168.4.1" +#upload_flags = --auth=fibonacci --port 8266 +upload_port = "${env.ESPURNA_IP}" +upload_flags = --auth=${env.ESPURNA_AUTH} --port 8266 # ------------------------------------------------------------------------------ # LIBRARIES: required dependencies @@ -123,8 +123,8 @@ lib_deps = ${common.lib_deps} lib_ignore = ${common.lib_ignore} build_flags = ${common.build_flags_1m0m} -D${env.ESPURNA_BOARD} upload_speed = 115200 -upload_port = "${env.ESPURNA_IP}" -upload_flags = --auth=${env.ESPURNA_AUTH} --port 8266 +upload_port = ${common.upload_port} +upload_flags = ${common.upload_flags} extra_scripts = ${common.extra_scripts} [env:esp8266-4m-ota] @@ -136,8 +136,8 @@ lib_deps = ${common.lib_deps} lib_ignore = ${common.lib_ignore} build_flags = ${common.build_flags_4m1m} -D${env.ESPURNA_BOARD} upload_speed = 115200 -upload_port = "${env.ESPURNA_IP}" -upload_flags = --auth=${env.ESPURNA_AUTH} --port 8266 +upload_port = ${common.upload_port} +upload_flags = ${common.upload_flags} extra_scripts = ${common.extra_scripts} # ------------------------------------------------------------------------------ @@ -154,7 +154,7 @@ monitor_speed = 115200 extra_scripts = ${common.extra_scripts} [env:travis02] -platform = ${common.platform_172} +platform = ${common.platform_173} framework = arduino board = esp12e lib_deps = ${common.lib_deps} @@ -164,7 +164,7 @@ monitor_speed = 115200 extra_scripts = ${common.extra_scripts} [env:travis03] -platform = ${common.platform_172} +platform = ${common.platform_173} framework = arduino board = esp12e lib_deps = ${common.lib_deps} @@ -189,7 +189,7 @@ monitor_speed = 115200 extra_scripts = ${common.extra_scripts} [env:wemos-d1mini-relayshield-ssl] -platform = ${common.platform_172} +platform = ${common.platform_173} framework = arduino board = d1_mini lib_deps = ${common.lib_deps} @@ -223,7 +223,7 @@ monitor_speed = 115200 extra_scripts = ${common.extra_scripts} [env:nodemcu-lolin-ssl] -platform = ${common.platform_172} +platform = ${common.platform_173} framework = arduino board = nodemcuv2 lib_deps = ${common.lib_deps} @@ -770,8 +770,8 @@ lib_deps = ${common.lib_deps} lib_ignore = ${common.lib_ignore} build_flags = ${common.build_flags_1m0m} -DITEAD_SONOFF_RFBRIDGE -DRFB_DIRECT upload_speed = 115200 -upload_port = "${env.ESPURNA_IP}" -upload_flags = --auth=${env.ESPURNA_AUTH} --port 8266 +upload_port = ${common.upload_port} +upload_flags = ${common.upload_flags} monitor_speed = 19200 extra_scripts = ${common.extra_scripts} @@ -920,8 +920,8 @@ board_build.flash_mode = dout lib_deps = ${common.lib_deps} lib_ignore = ${common.lib_ignore} build_flags = ${common.build_flags_1m0m} -DITEAD_SONOFF_S31 -upload_port = "${env.ESPURNA_IP}" -upload_flags = --auth=${env.ESPURNA_AUTH} --port 8266 +upload_port = ${common.upload_port} +upload_flags = ${common.upload_flags} monitor_speed = 115200 extra_scripts = ${common.extra_scripts} @@ -1669,8 +1669,8 @@ lib_deps = ${common.lib_deps} lib_ignore = ${common.lib_ignore} build_flags = ${common.build_flags_4m1m} -DGIZWITS_WITTY_CLOUD upload_speed = 115200 -upload_port = "${env.ESPURNA_IP}" -upload_flags = --auth=${env.ESPURNA_AUTH} --port 8266 +upload_port = ${common.upload_port} +upload_flags = ${common.upload_flags} extra_scripts = ${common.extra_scripts} [env:euromate-wifi-stecker-shuko] @@ -1693,8 +1693,8 @@ lib_deps = ${common.lib_deps} lib_ignore = ${common.lib_ignore} build_flags = ${common.build_flags_4m1m} -DEUROMATE_WIFI_STECKER_SCHUKO upload_speed = 115200 -upload_port = "${env.ESPURNA_IP}" -upload_flags = --auth=${env.ESPURNA_AUTH} --port 8266 +upload_port = ${common.upload_port} +upload_flags = ${common.upload_flags} extra_scripts = ${common.extra_scripts} [env:tonbux-powerstrip02] @@ -1717,8 +1717,8 @@ lib_deps = ${common.lib_deps} lib_ignore = ${common.lib_ignore} build_flags = ${common.build_flags_4m1m} -DTONBUX_POWERSTRIP02 upload_speed = 115200 -upload_port = "${env.ESPURNA_IP}" -upload_flags = --auth=${env.ESPURNA_AUTH} --port 8266 +upload_port = ${common.upload_port} +upload_flags = ${common.upload_flags} extra_scripts = ${common.extra_scripts} [env:lingan-swa1] @@ -1741,8 +1741,8 @@ lib_deps = ${common.lib_deps} lib_ignore = ${common.lib_ignore} build_flags = ${common.build_flags_4m1m} -DLINGAN_SWA1 upload_speed = 115200 -upload_port = "${env.ESPURNA_IP}" -upload_flags = --auth=${env.ESPURNA_AUTH} --port 8266 +upload_port = ${common.upload_port} +upload_flags = ${common.upload_flags} extra_scripts = ${common.extra_scripts} [env:stm-relay] @@ -1790,8 +1790,8 @@ lib_deps = ${common.lib_deps} lib_ignore = ${common.lib_ignore} build_flags = ${common.build_flags_1m0m} -DHEYGO_HY02 upload_speed = 115200 -upload_port = "${env.ESPURNA_IP}" -upload_flags = --auth=${env.ESPURNA_AUTH} --port 8266 +upload_port = ${common.upload_port} +upload_flags = ${common.upload_flags} extra_scripts = ${common.extra_scripts} [env:maxcio-wus002s] @@ -1814,8 +1814,8 @@ lib_deps = ${common.lib_deps} lib_ignore = ${common.lib_ignore} build_flags = ${common.build_flags_1m0m} -DMAXCIO_WUS002S upload_speed = 115200 -upload_port = "${env.ESPURNA_IP}" -upload_flags = --auth=${env.ESPURNA_AUTH} --port 8266 +upload_port = ${common.upload_port} +upload_flags = ${common.upload_flags} extra_scripts = ${common.extra_scripts} [env:yidian-xsssa05] @@ -1838,8 +1838,8 @@ lib_deps = ${common.lib_deps} lib_ignore = ${common.lib_ignore} build_flags = ${common.build_flags_1m0m} -DYIDIAN_XSSSA05 upload_speed = 115200 -upload_port = "${env.ESPURNA_IP}" -upload_flags = --auth=${env.ESPURNA_AUTH} --port 8266 +upload_port = ${common.upload_port} +upload_flags = ${common.upload_flags} extra_scripts = ${common.extra_scripts} [env:tonbux-xsssa06] @@ -1862,8 +1862,8 @@ lib_deps = ${common.lib_deps} lib_ignore = ${common.lib_ignore} build_flags = ${common.build_flags_1m0m} -DTONBUX_XSSSA06 upload_speed = 115200 -upload_port = "${env.ESPURNA_IP}" -upload_flags = --auth=${env.ESPURNA_AUTH} --port 8266 +upload_port = ${common.upload_port} +upload_flags = ${common.upload_flags} extra_scripts = ${common.extra_scripts} [env:green-esp8266relay] @@ -1886,8 +1886,8 @@ lib_deps = ${common.lib_deps} lib_ignore = ${common.lib_ignore} build_flags = ${common.build_flags_4m1m} -DGREEN_ESP8266RELAY upload_speed = 115200 -upload_port = "${env.ESPURNA_IP}" -upload_flags = --auth=${env.ESPURNA_AUTH} --port 8266 +upload_port = ${common.upload_port} +upload_flags = ${common.upload_flags} extra_scripts = ${common.extra_scripts} [env:ike-espike] @@ -1910,8 +1910,8 @@ lib_deps = ${common.lib_deps} lib_ignore = ${common.lib_ignore} build_flags = ${common.build_flags_4m1m} -DIKE_ESPIKE upload_speed = 115200 -upload_port = "${env.ESPURNA_IP}" -upload_flags = --auth=${env.ESPURNA_AUTH} --port 8266 +upload_port = ${common.upload_port} +upload_flags = ${common.upload_flags} extra_scripts = ${common.extra_scripts} [env:arniex-swifitch] @@ -1934,8 +1934,8 @@ lib_deps = ${common.lib_deps} lib_ignore = ${common.lib_ignore} build_flags = ${common.build_flags_1m0m} -DARNIEX_SWIFITCH upload_speed = 115200 -upload_port = "${env.ESPURNA_IP}" -upload_flags = --auth=${env.ESPURNA_AUTH} --port 8266 +upload_port = ${common.upload_port} +upload_flags = ${common.upload_flags} extra_scripts = ${common.extra_scripts} [env:zhilde-eu44-w] @@ -1958,8 +1958,8 @@ lib_deps = ${common.lib_deps} lib_ignore = ${common.lib_ignore} build_flags = ${common.build_flags_1m0m} -DZHILDE_EU44_W upload_speed = 115200 -upload_port = "${env.ESPURNA_IP}" -upload_flags = --auth=${env.ESPURNA_AUTH} --port 8266 +upload_port = ${common.upload_port} +upload_flags = ${common.upload_flags} monitor_speed = 115200 extra_scripts = ${common.extra_scripts} @@ -1983,8 +1983,8 @@ lib_deps = ${common.lib_deps} lib_ignore = ${common.lib_ignore} build_flags = ${common.build_flags_1m0m} -DZLUANI_HVIO upload_speed = 115200 -upload_port = "${env.ESPURNA_IP}" -upload_flags = --auth=${env.ESPURNA_AUTH} --port 8266 +upload_port = ${common.upload_port} +upload_flags = ${common.upload_flags} monitor_speed = 115200 extra_scripts = ${common.extra_scripts} @@ -2008,8 +2008,8 @@ lib_deps = ${common.lib_deps} lib_ignore = ${common.lib_ignore} build_flags = ${common.build_flags_4m1m} -DNEO_COOLCAM_NAS_WR01W upload_speed = 115200 -upload_port = "${env.ESPURNA_IP}" -upload_flags = --auth=${env.ESPURNA_AUTH} --port 8266 +upload_port = ${common.upload_port} +upload_flags = ${common.upload_flags} extra_scripts = ${common.extra_scripts} [env:estink-wifi-power-strip] @@ -2032,8 +2032,8 @@ lib_deps = ${common.lib_deps} lib_ignore = ${common.lib_ignore} build_flags = ${common.build_flags_4m1m} -DESTINK_WIFI_POWER_STRIP upload_speed = 115200 -upload_port = "${env.ESPURNA_IP}" -upload_flags = --auth=${env.ESPURNA_AUTH} --port 8266 +upload_port = ${common.upload_port} +upload_flags = ${common.upload_flags} extra_scripts = ${common.extra_scripts} # ------------------------------------------------------------------------------ @@ -2060,8 +2060,8 @@ lib_deps = ${common.lib_deps} lib_ignore = ${common.lib_ignore} build_flags = ${common.build_flags_1m0m} -DGENERIC_ESP01S_RELAY_V40 upload_speed = 115200 -upload_port = "${env.ESPURNA_IP}" -upload_flags = --auth=${env.ESPURNA_AUTH} --port 8266 +upload_port = ${common.upload_port} +upload_flags = ${common.upload_flags} extra_scripts = ${common.extra_scripts} [env:generic-esp01s-rgbled-10] @@ -2084,8 +2084,8 @@ lib_deps = ${common.lib_deps} lib_ignore = ${common.lib_ignore} build_flags = ${common.build_flags_1m0m} -DGENERIC_ESP01S_RGBLED_V10 upload_speed = 115200 -upload_port = "${env.ESPURNA_IP}" -upload_flags = --auth=${env.ESPURNA_AUTH} --port 8266 +upload_port = ${common.upload_port} +upload_flags = ${common.upload_flags} extra_scripts = ${common.extra_scripts} [env:generic-esp01s-dht11-10] @@ -2108,8 +2108,8 @@ lib_deps = ${common.lib_deps} lib_ignore = ${common.lib_ignore} build_flags = ${common.build_flags_1m0m} -DGENERIC_ESP01S_DHT11_V10 upload_speed = 115200 -upload_port = "${env.ESPURNA_IP}" -upload_flags = --auth=${env.ESPURNA_AUTH} --port 8266 +upload_port = ${common.upload_port} +upload_flags = ${common.upload_flags} extra_scripts = ${common.extra_scripts} [env:generic-esp01s-ds18b20-10] @@ -2132,8 +2132,8 @@ lib_deps = ${common.lib_deps} lib_ignore = ${common.lib_ignore} build_flags = ${common.build_flags_1m0m} -DGENERIC_ESP01S_DS18B20_V10 upload_speed = 115200 -upload_port = "${env.ESPURNA_IP}" -upload_flags = --auth=${env.ESPURNA_AUTH} --port 8266 +upload_port = ${common.upload_port} +upload_flags = ${common.upload_flags} extra_scripts = ${common.extra_scripts} [env:heltec-touch-relay] @@ -2156,8 +2156,8 @@ lib_deps = ${common.lib_deps} lib_ignore = ${common.lib_ignore} build_flags = ${common.build_flags_1m0m} -DHELTEC_TOUCHRELAY upload_speed = 115200 -upload_port = "${env.ESPURNA_IP}" -upload_flags = --auth=${env.ESPURNA_AUTH} --port 8266 +upload_port = ${common.upload_port} +upload_flags = ${common.upload_flags} extra_scripts = ${common.extra_scripts} [env:allnet-4duino-iot-wlan-relais] @@ -2180,8 +2180,8 @@ lib_deps = ${common.lib_deps} lib_ignore = ${common.lib_ignore} build_flags = ${common.build_flags_1m0m} -DALLNET_4DUINO_IOT_WLAN_RELAIS upload_speed = 115200 -upload_port = "${env.ESPURNA_IP}" -upload_flags = --auth=${env.ESPURNA_AUTH} --port 8266 +upload_port = ${common.upload_port} +upload_flags = ${common.upload_flags} extra_scripts = ${common.extra_scripts} [env:tonbux-mosquito-killer] @@ -2204,8 +2204,8 @@ lib_deps = ${common.lib_deps} lib_ignore = ${common.lib_ignore} build_flags = ${common.build_flags_1m0m} -DTONBUX_MOSQUITO_KILLER upload_speed = 115200 -upload_port = "${env.ESPURNA_IP}" -upload_flags = --auth=${env.ESPURNA_AUTH} --port 8266 +upload_port = ${common.upload_port} +upload_flags = ${common.upload_flags} extra_scripts = ${common.extra_scripts} [env:pilotak-esp-din-v1] @@ -2228,8 +2228,8 @@ lib_deps = ${common.lib_deps} lib_ignore = ${common.lib_ignore} build_flags = ${common.build_flags_1m0m} -DPILOTAK_ESP_DIN_V1 upload_speed = 115200 -upload_port = "${env.ESPURNA_IP}" -upload_flags = --auth=${env.ESPURNA_AUTH} --port 8266 +upload_port = ${common.upload_port} +upload_flags = ${common.upload_flags} extra_scripts = ${common.extra_scripts} [env:nodemcu-geiger] @@ -2252,8 +2252,8 @@ lib_ignore = ${common.lib_ignore} build_flags = ${common.build_flags_1m0m} -DNODEMCU_BASIC -DGEIGER_SUPPORT=1 -DEVENTS_SUPPORT=0 -DINFLUXDB_SUPPORT=1 -DALEXA_SUPPORT=0 -DALEXA_ENABLED=0 upload_speed = 460800 monitor_speed = 115200 -upload_port = "${env.ESPURNA_IP}" -upload_flags = --auth=${env.ESPURNA_AUTH} --port 8266 +upload_port = ${common.upload_port} +upload_flags = ${common.upload_flags} extra_scripts = ${common.extra_scripts} [env:blitzwolf-bwshp2] @@ -2276,8 +2276,8 @@ lib_ignore = ${common.lib_ignore} build_flags = ${common.build_flags_1m0m} -DBLITZWOLF_BWSHP2 upload_speed = 115200 monitor_speed = 115200 -upload_port = "${env.ESPURNA_IP}" -upload_flags = --auth=${env.ESPURNA_AUTH} --port 8266 +upload_port = ${common.upload_port} +upload_flags = ${common.upload_flags} extra_scripts = ${common.extra_scripts} [env:bh-onofre] @@ -2300,6 +2300,6 @@ lib_ignore = ${common.lib_ignore} build_flags = ${common.build_flags_1m0m} -DBH_ONOFRE upload_speed = 460800 monitor_speed = 115200 -upload_port = "${env.ESPURNA_IP}" -upload_flags = --auth=${env.ESPURNA_AUTH} --port 8266 +upload_port = ${common.upload_port} +upload_flags = ${common.upload_flags} extra_scripts = ${common.extra_scripts}