From 675588e7a5a85f423c25233d6ad2eafcd8a6148f Mon Sep 17 00:00:00 2001 From: Theo Arends <11044339+arendst@users.noreply.github.com> Date: Thu, 6 Dec 2018 11:17:25 +0100 Subject: [PATCH] 6.3.0.16 - Bump version 6.3.0.16 20181201 * Add support for iFan02 Fanspeed in Domoticz using a selector (#4517) * Add Announce Switches to MQTT Discovery (#4531) --- sonoff/_changelog.ino | 9 ++++++--- sonoff/sonoff.ino | 6 +++--- sonoff/sonoff_version.h | 2 +- 3 files changed, 10 insertions(+), 7 deletions(-) diff --git a/sonoff/_changelog.ino b/sonoff/_changelog.ino index 22641b3bc3e7..b962b13de24f 100644 --- a/sonoff/_changelog.ino +++ b/sonoff/_changelog.ino @@ -1,12 +1,15 @@ -/* 6.3.0.15 20181201 +/* 6.3.0.16 20181201 + * Add support for iFan02 Fanspeed in Domoticz using a selector (#4517) + * Add Announce Switches to MQTT Discovery (#4531) + * + * 6.3.0.15 20181201 * Removed command SetOption36 (#4497) * Add command SetOption60 0/1 to select dynamic sleep (0) or sleep (1) (#4497) * Update SR-04 driver to use NewPing library (#4488) * Add support for GPIO02 for newer Sonoff Basic (#4518) - * Add support for iFan02 Fanspeed in Domoticz using a selector (#4517) * * 6.3.0.14 20181127 - * Add Command CalcRes to set number of decimals (0 - 7) used in commands ADD, SUB, MULT and SCALE (#4420) + * Add command CalcRes to set number of decimals (0 - 7) used in commands ADD, SUB, MULT and SCALE (#4420) * Add support for SM Smart Wifi Dimmer PS-16-DZ (#4465) * Move some static (serial) buffers to dynamic buffers * Update display and epaper drivers diff --git a/sonoff/sonoff.ino b/sonoff/sonoff.ino index c9882902a70f..5260900a3fad 100755 --- a/sonoff/sonoff.ino +++ b/sonoff/sonoff.ino @@ -1307,9 +1307,9 @@ boolean SendKey(byte key, byte device, byte state) char *tmp = (key) ? Settings.switch_topic : Settings.button_topic; Format(key_topic, tmp, sizeof(key_topic)); if (Settings.flag.mqtt_enabled && MqttIsConnected() && (strlen(key_topic) != 0) && strcmp(key_topic, "0")) { - if (!key && (device > devices_present)) device = 1; // Only allow number of buttons up to number of devices - GetTopic_P(stopic, CMND, key_topic, GetPowerDevice(scommand, device, sizeof(scommand), - (key + Settings.flag.device_index_enable))); // cmnd/switchtopic/POWERx + if (!key && (device > devices_present)) { device = 1; } // Only allow number of buttons up to number of devices + GetTopic_P(stopic, CMND, key_topic, + GetPowerDevice(scommand, device, sizeof(scommand), (key + Settings.flag.device_index_enable))); // cmnd/switchtopic/POWERx if (9 == state) { mqtt_data[0] = '\0'; } else { diff --git a/sonoff/sonoff_version.h b/sonoff/sonoff_version.h index d6b82d881056..9c41f022011b 100644 --- a/sonoff/sonoff_version.h +++ b/sonoff/sonoff_version.h @@ -20,7 +20,7 @@ #ifndef _SONOFF_VERSION_H_ #define _SONOFF_VERSION_H_ -#define VERSION 0x0603000F +#define VERSION 0x06030010 #define D_PROGRAMNAME "Sonoff-Tasmota" #define D_AUTHOR "Theo Arends"