Skip to content

Commit

Permalink
Fix restore parameters
Browse files Browse the repository at this point in the history
Fix restore ShutterAccuracy, MqttLog, WifiConfig, WifiPower and SerialConfig (#7281)
  • Loading branch information
arendst committed Dec 21, 2019
1 parent 5e4c5f6 commit 257f3d2
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 5 deletions.
3 changes: 3 additions & 0 deletions RELEASENOTES.md
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,9 @@ The following binary downloads have been compiled with ESP8266/Arduino library c
- Fix Gui Timer when using a negative zero offset of -00:00 by Peter Ooms (#7174)
- Fix DeepSleep in case there is no wifi by Stefan Bode (#7213)
- Fix Fade would ignore ``savedata 0`` and store to flash anyways (#7262)
- Fix Arduino IDE compile error (#7277)
- Fix restore ShutterAccuracy, MqttLog, WifiConfig, WifiPower and SerialConfig (#7281)
- Fix no AP on initial install (#7282)
- Add command ``SerialConfig 0..23`` or ``SerialConfig 8N1`` to select Serial Config based in PR by Luis Teixeira (#7108)
- Add command ``Sensor34 9 <weight code>`` to set minimum delta to trigger JSON message by @tobox (#7188)
- Add rule var ``%topic%`` by Adrian Scillato (#5522)
Expand Down
3 changes: 3 additions & 0 deletions tasmota/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,9 @@
### 7.2.0 20191221

- Release
- Fix Arduino IDE compile error (#7277)
- Fix restore ShutterAccuracy, MqttLog, WifiConfig, WifiPower and SerialConfig (#7281)
- Fix no AP on initial install (#7282)

### 7.1.2.6 20191214

Expand Down
10 changes: 5 additions & 5 deletions tasmota/settings.ino
Original file line number Diff line number Diff line change
Expand Up @@ -1327,8 +1327,8 @@ void SettingsDelta(void)
memset((char*)&Settings +0x1D6, 0x00, 16);
}
if (Settings.version < 0x0606000F) {
Settings.shutter_accuracy = 0;
Settings.mqttlog_level = MQTT_LOG_LEVEL;
Settings.ex_shutter_accuracy = 0;
Settings.ex_mqttlog_level = MQTT_LOG_LEVEL;
}
if (Settings.version < 0x06060011) {
Settings.param[P_BACKLOG_DELAY] = MIN_BACKLOG_DELAY;
Expand Down Expand Up @@ -1368,7 +1368,7 @@ void SettingsDelta(void)
}
if (Settings.version < 0x06060015) {
if ((EX_WIFI_SMARTCONFIG == Settings.sta_config) || (EX_WIFI_WPSCONFIG == Settings.sta_config)) {
Settings.sta_config = WIFI_MANAGER;
Settings.ex_sta_config = WIFI_MANAGER;
}
}

Expand All @@ -1381,10 +1381,10 @@ void SettingsDelta(void)
SettingsEnableAllI2cDrivers();
}
if (Settings.version < 0x07000004) {
Settings.wifi_output_power = 170;
Settings.ex_wifi_output_power = 170;
}
if (Settings.version < 0x07010202) {
Settings.serial_config = TS_SERIAL_8N1;
Settings.ex_serial_config = TS_SERIAL_8N1;
}
if (Settings.version < 0x07010204) {
if (Settings.flag3.ex_cors_enabled == 1) {
Expand Down

0 comments on commit 257f3d2

Please sign in to comment.