jeans/Tasmota
jeans/Tasmota
1
0
Fork 0
mirror of https://github.com/arendst/Tasmota.git synced 2025-07-24 03:06:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

Bump version 7.0.0.1

Browse Source 
Remove references to versions before 6.x
This commit is contained in:
Theo Arends 2019-10-27 14:04:07 +01:00
parent 1a148311e1
commit 51a6aceaa8
3 changed files with 4 additions and 100 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
tasmota/_changelog.ino
View File

@ -1,4 +1,7 @@
/*********************************************************************************************\
* 7.0.0.1 20191027
* Remove references to versions before 6.x
*
* 6.7.1.1 20191026
* Change ArduinoSlave to TasmotaSlave (Experimental)
* Add support for Tuya battery powered devices (#6735)

99
tasmota/settings.ino
View File

@ -938,105 +938,6 @@ void SettingsDefaultWebColor(void)
void SettingsDelta(void)
{
if (Settings.version != VERSION) { // Fix version dependent changes
if (Settings.version < 0x05050000) {
for (uint32_t i = 0; i < 17; i++) { Settings.rf_code[i][0] = 0; }
memcpy_P(Settings.rf_code[0], kDefaultRfCode, 9);
}
if (Settings.version < 0x05080000) {
Settings.light_pixels = WS2812_LEDS;
Settings.light_width = 1;
Settings.light_color[0] = 255;
Settings.light_color[1] = 0;
Settings.light_color[2] = 0;
Settings.light_dimmer = 10;
Settings.light_correction = 1;
Settings.light_fade = 0;
Settings.light_speed = 1;
Settings.light_scheme = 0;
Settings.light_width = 1;
Settings.light_wakeup = 0;
}
if (Settings.version < 0x0508000A) {
Settings.power = 0;
Settings.altitude = 0;
}
if (Settings.version < 0x0508000B) {
for (uint32_t i = 0; i < sizeof(Settings.my_gp); i++) { // Move GPIO_LEDs
if ((Settings.my_gp.io[i] >= 25) && (Settings.my_gp.io[i] <= 32)) { // Was GPIO_LED1
Settings.my_gp.io[i] += 23; // Move GPIO_LED1
}
}
for (uint32_t i = 0; i < MAX_PWMS; i++) { // Move pwm_value and reset additional pulse_timerrs
Settings.pwm_value[i] = Settings.pulse_timer[4 +i];
Settings.pulse_timer[4 +i] = 0;
}
}
if (Settings.version < 0x0508000D) {
Settings.pwm_frequency = PWM_FREQ;
Settings.pwm_range = PWM_RANGE;
}
if (Settings.version < 0x0508000E) {
SettingsDefaultSet_5_8_1();
}
if (Settings.version < 0x05090102) {
Settings.flag2.data = Settings.flag.data;
Settings.flag2.data &= 0xFFE80000;
Settings.flag2.voltage_resolution = Settings.flag.not_power_linked;
Settings.flag2.current_resolution = 3;
Settings.ina219_mode = 0;
}
if (Settings.version < 0x050A0009) {
SettingsDefaultSet_5_10_1();
}
if (Settings.version < 0x050B0107) {
Settings.flag.not_power_linked = 0;
}
if (Settings.version < 0x050C0005) {
Settings.light_rotation = 0;
Settings.energy_power_delta = 0;
char fingerprint[60];
memcpy(fingerprint, Settings.mqtt_fingerprint, sizeof(fingerprint));
char *p = fingerprint;
for (uint32_t i = 0; i < 20; i++) {
Settings.mqtt_fingerprint[0][i] = strtol(p, &p, 16);
Settings.mqtt_fingerprint[1][i] = Settings.mqtt_fingerprint[0][i];
}
}
if (Settings.version < 0x050C0007) {
Settings.baudrate = APP_BAUDRATE / 300;
}
if (Settings.version < 0x050C0008) {
Settings.sbaudrate = SOFT_BAUDRATE / 300;
Settings.serial_delimiter = 0xff;
}
if (Settings.version < 0x050C000A) {
Settings.latitude = (int)((double)LATITUDE * 1000000);
Settings.longitude = (int)((double)LONGITUDE * 1000000);
}
if (Settings.version < 0x050C000B) {
Settings.rules[0][0] = '\0';
}
if (Settings.version < 0x050C000D) {
memmove(Settings.rules, Settings.rules -256, sizeof(Settings.rules)); // move rules up by 256 bytes
memset(&Settings.timer, 0x00, sizeof(Timer) * MAX_TIMERS); // Reset timers as layout has changed from v5.12.0i
Settings.knx_GA_registered = 0;
Settings.knx_CB_registered = 0;
memset(&Settings.knx_physsical_addr, 0x00, 0x800 - 0x6b8); // Reset until 0x800 for future use
}
if (Settings.version < 0x050C000F) {
Settings.energy_kWhtoday /= 1000;
Settings.energy_kWhyesterday /= 1000;
RtcSettings.energy_kWhtoday /= 1000;
}
if (Settings.version < 0x050D0103) {
SettingsDefaultSet_5_13_1c();
}
if (Settings.version < 0x050E0002) {
for (uint32_t i = 1; i < MAX_RULE_SETS; i++) { Settings.rules[i][0] = '\0'; }
Settings.rule_enabled = Settings.flag.mqtt_serial_raw; // Was rules_enabled until 5.14.0b
Settings.rule_once = Settings.flag.pressure_conversion; // Was rules_once until 5.14.0b
}
if (Settings.version < 0x06000000) {
Settings.cfg_size = sizeof(SYSCFG);
Settings.cfg_crc = GetSettingsCrc();

2
tasmota/tasmota_version.h
View File

@ -20,6 +20,6 @@
#ifndef _TASMOTA_VERSION_H_
#define _TASMOTA_VERSION_H_
const uint32_t VERSION = 0x06070101;
const uint32_t VERSION = 0x07000001;
#endif // _TASMOTA_VERSION_H_