diff --git a/.travis.yml b/.travis.yml index 47d6ac8b9..c57f2e523 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,11 +10,14 @@ install: script: - platformio run +before_deploy: + - for file in .pioenvs/*/firmware.bin; do cp $file ${file%/*}.bin; done deploy: provider: releases api_key: secure: I5x8qJ5+229qJv5jSnNPGERQHl0NSKvrVHdpVzr/HOo2zeZ/Q5sMhHWo3IBD3AKjGdSlpyNApDwYTaGvenMe+xtUWSSxYIy2ptWAWfkpOtUMx3lI3brZJRt8s98xS5m972SC9mlNT2ZU+i6hZ6srYv2w4nDuyX+j7Q6IGqvYtabxUWzza/Zg0yNpPScvvzscW1CVhdEd5qYH6OKfBfuVOj3ZG4pCycvbejhkUJwbCQ5m8+DEXUol8BKeh92+TPC3jDHXWIStdgLIrmkZ3YWxMQBgQ41QIkaf6X1/0WYEcY0DFW6hlDzg2GbJ8tPRRPC9dfgMs3ZMKJkc7e4x7wMvG2QXQ0aO6e7xTMw41JZ/OrIit0JDHB1M8bWDPUhHwjiCht4W77n7KWFk9sIUDzOdMdd69BIMt5IohtkjnIT2dXekB4xiNvfPLYUa70aOuSHWi3HXVSE1R7RX0brmNf/mH1Pm91uun3UqtIwhrpD0gteQnc0EAlHoOJOazdn3cohrtmECZJo+f+EiqFfEHT2hBrHPEvWknNfxAyPS7jYWKQ7pTMk+y/BUkLyIQkimvNz41azA6sA75nnQrZ+ZJQa+KP2cEObMBs/ekzA45nds1UXpolI1W8QIOxJ/Y10C1yxr6V5a3WWg1H8EbF0HaqiyIeQx/UCz7gl62CbLEDui9PA= - file: ".pioenvs/sonoff/firmware.bin" + file_glob: true + file: ".pioenvs/*.bin" skip_cleanup: true on: - tags: true + tags: true \ No newline at end of file diff --git a/README.md b/README.md index efa0760e9..6e30dd0f9 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ ## Sonoff-Tasmota Provide ESP8266 based Sonoff by [iTead Studio](https://www.itead.cc/) and ElectroDragon IoT Relay with Serial, Web and MQTT control allowing 'Over the Air' or OTA firmware updates using Arduino IDE. -Current version is **5.1.3** - See [sonoff/_releasenotes.ino](https://github.com/arendst/Sonoff-Tasmota/blob/master/sonoff/_releasenotes.ino) for change information. +Current version is **5.1.4** - See [sonoff/_releasenotes.ino](https://github.com/arendst/Sonoff-Tasmota/blob/master/sonoff/_releasenotes.ino) for change information. ### **** ATTENTION Version 5.x.x specific information **** diff --git a/api/arduino/sonoff-minimal.ino.bin b/api/arduino/sonoff-minimal.ino.bin deleted file mode 100644 index 92e33feb9..000000000 Binary files a/api/arduino/sonoff-minimal.ino.bin and /dev/null differ diff --git a/api/arduino/sonoff.ino.bin b/api/arduino/sonoff.ino.bin deleted file mode 100644 index 52b7f10ab..000000000 Binary files a/api/arduino/sonoff.ino.bin and /dev/null differ diff --git a/platformio.ini b/platformio.ini index 4dddb2d6d..d19b88c45 100644 --- a/platformio.ini +++ b/platformio.ini @@ -27,3 +27,21 @@ board = esp01_1m board_flash_mode = dout build_flags = -Wl,-Tesp8266.flash.1m0.ld -DMQTT_MAX_PACKET_SIZE=512 lib_deps = PubSubClient, NeoPixelBus, IRremoteESP8266, ArduinoJSON + +; Sonoff minimal (ESP8266 based) +[env:sonoff-minimal] ; Placeholder to be configured +platform = espressif8266 +framework = arduino +board = esp01_1m +board_flash_mode = qio +build_flags = -Wl,-Tesp8266.flash.1m0.ld -DMQTT_MAX_PACKET_SIZE=512 -DBE_MINIMAL +lib_deps = PubSubClient, NeoPixelBus, IRremoteESP8266, ArduinoJSON + +; Sonoff multiple DS18x20 (ESP8266 based) +[env:sonoff-ds18x20] +platform = espressif8266 +framework = arduino +board = esp01_1m +board_flash_mode = qio +build_flags = -Wl,-Tesp8266.flash.1m0.ld -DMQTT_MAX_PACKET_SIZE=758 -DUSE_DS18x20 -DMESSZ=600 +lib_deps = PubSubClient, NeoPixelBus, IRremoteESP8266, ArduinoJSON, OneWire diff --git a/sonoff/_releasenotes.ino b/sonoff/_releasenotes.ino index c14a67400..dcbf8d359 100644 --- a/sonoff/_releasenotes.ino +++ b/sonoff/_releasenotes.ino @@ -1,4 +1,10 @@ -/* 5.1.3 20170520 +/* 5.1.4 20170601 + * Removed pre-compiled versions from repository as they are available within the release + * Changed HUE Device type to color supporting version (#464) + * Fix compile error when BE_MINIMAL is selected (#467, #476) + * Add multiple compiled versions to release using updated Travis script and platformio.ini (#467) + * + * 5.1.3 20170520 * Add Domoticz Counter * * 5.1.2 20170519 diff --git a/sonoff/sonoff.ino b/sonoff/sonoff.ino index c022965e2..e7528ecf7 100644 --- a/sonoff/sonoff.ino +++ b/sonoff/sonoff.ino @@ -24,7 +24,7 @@ - Select IDE Tools - Flash size: "1M (no SPIFFS)" ====================================================*/ -#define VERSION 0x05010300 // 5.1.3 +#define VERSION 0x05010400 // 5.1.4 enum log_t {LOG_LEVEL_NONE, LOG_LEVEL_ERROR, LOG_LEVEL_INFO, LOG_LEVEL_DEBUG, LOG_LEVEL_DEBUG_MORE, LOG_LEVEL_ALL}; enum week_t {Last, First, Second, Third, Fourth}; @@ -153,7 +153,9 @@ enum butt_t {PRESSED, NOT_PRESSED}; #include "support.h" // Global support #include // MQTT -#define MESSZ 360 // Max number of characters in JSON message string (4 x DS18x20 sensors) +#ifndef MESSZ + #define MESSZ 360 // Max number of characters in JSON message string (4 x DS18x20 sensors) +#endif #if (MQTT_MAX_PACKET_SIZE -TOPSZ -7) < MESSZ // If the max message size is too small, throw an error at compile time // See pubsubclient.c line 359 #error "MQTT_MAX_PACKET_SIZE is too small in libraries/PubSubClient/src/PubSubClient.h, increase it to at least 467" @@ -2380,6 +2382,7 @@ void GPIO_init() led_inverted[mpin - GPIO_LED1_INV] = 1; mpin -= 4; } +#ifdef USE_DHT else if ((mpin >= GPIO_DHT11) && (mpin <= GPIO_DHT22)) { if (dht_setup(i, mpin)) { dht_flg = 1; @@ -2388,6 +2391,7 @@ void GPIO_init() mpin = 0; } } +#endif // USE_DHT } if (mpin) { pin[mpin] = i; diff --git a/sonoff/xdrv_wemohue.ino b/sonoff/xdrv_wemohue.ino index 720f1e138..3d4c3c4c0 100644 --- a/sonoff/xdrv_wemohue.ino +++ b/sonoff/xdrv_wemohue.ino @@ -302,18 +302,17 @@ const char HUE_LIGHT_STATUS_JSON[] PROGMEM = "\"bri\":{b}," "\"hue\":{h}," "\"sat\":{s}," - "\"effect\":\"none\"," - "\"ct\":0," + "\"ct\":500," + "\"xy\":[0.5, 0.5]," "\"alert\":\"none\"," "\"colormode\":\"hs\"," "\"reachable\":true" "}," - "\"type\":\"Dimmable light\"," + "\"type\":\"Extended color light\"," "\"name\":\"{j1}\"," - "\"modelid\":\"LWB004\"," - "\"manufacturername\":\"Philips\"," + "\"modelid\":\"LCT007\"," "\"uniqueid\":\"{j2}\"," - "\"swversion\":\"66012040\"" + "\"swversion\":\"5.50.1.19085\"" "}"; const char HUE_LIGHT_RESPONSE_JSON[] PROGMEM = "{\"success\":{\"{api}/{id}/{cmd}\":{res}}}";