mirrors
/
Tasmota
mirror of https://github.com/arendst/Tasmota.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Add configuration persistence fixing variable alignment problem

This commit is contained in:
Matteo Albinola 2020-04-26 19:21:10 +02:00
parent 1b7ca00714
commit b9aa6fe19d
2 changed files with 22 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
tasmota/settings.h
View File

@ -525,13 +525,12 @@ struct {
uint8_t zb_free_byte; // F33 uint8_t zb_free_byte; // F33
uint16_t pms_wake_interval; // F34 uint16_t pms_wake_interval; // F34
uint8_t config_version; // F36 uint8_t config_version; // F36
// uint16_t windmeter_radius; // F37 uint8_t windmeter_pulses_x_rot; // F37
// uint8_t windmeter_pulses_x_rot; // F39 uint16_t windmeter_radius; // F38
// uint16_t windmeter_pulse_debounce; // F3A uint16_t windmeter_pulse_debounce; // F3A
// int16_t windmeter_speed_factor; // F3C int16_t windmeter_speed_factor; // F3C
// uint8_t free_f37[122]; // F3E - Decrement if adding new Setting variables just above and below uint8_t free_f3e[122]; // F3E - Decrement if adding new Setting variables just above and below
uint8_t free_f37[129]; // F37 - Decrement if adding new Setting variables just above and below
// Only 32 bit boundary variables below // Only 32 bit boundary variables below
uint16_t pulse_counter_debounce_low; // FB8 uint16_t pulse_counter_debounce_low; // FB8

41
tasmota/xsns_68_windmeter.ino
View File

@ -70,13 +70,6 @@ struct WINDMETER {
#endif // USE_WINDMETER_NOSTATISTICS #endif // USE_WINDMETER_NOSTATISTICS
} WindMeter; } WindMeter;
struct WINDMETER_SETTINGS {
uint16_t windmeter_radius;
uint8_t windmeter_pulses_x_rot;
uint16_t windmeter_pulse_debounce;
int16_t windmeter_speed_factor;
} WindMeterSettings;
#ifndef ARDUINO_ESP8266_RELEASE_2_3_0 // Fix core 2.5.x ISR not in IRAM Exception #ifndef ARDUINO_ESP8266_RELEASE_2_3_0 // Fix core 2.5.x ISR not in IRAM Exception
void WindMeterUpdateSpeed(void) ICACHE_RAM_ATTR; void WindMeterUpdateSpeed(void) ICACHE_RAM_ATTR;
#endif // ARDUINO_ESP8266_RELEASE_2_3_0 #endif // ARDUINO_ESP8266_RELEASE_2_3_0
@ -85,7 +78,7 @@ void WindMeterUpdateSpeed(void)
{ {
uint32_t time = micros(); uint32_t time = micros();
uint32_t time_diff = time - WindMeter.counter_time; uint32_t time_diff = time - WindMeter.counter_time;
if (time_diff > WindMeterSettings.windmeter_pulse_debounce * 1000) { if (time_diff > Settings.windmeter_pulse_debounce * 1000) {
WindMeter.counter_time = time; WindMeter.counter_time = time;
WindMeter.counter++; WindMeter.counter++;
AddLog_P2(LOG_LEVEL_DEBUG, PSTR("WMET: Counter %d"), WindMeter.counter); AddLog_P2(LOG_LEVEL_DEBUG, PSTR("WMET: Counter %d"), WindMeter.counter);
@ -99,17 +92,17 @@ void WindMeterInit(void)
if (!Settings.flag2.speed_conversion) { if (!Settings.flag2.speed_conversion) {
Settings.flag2.speed_conversion = 2; // 0 = none, 1 = m/s, 2 = km/h, 3 = kn, 4 = mph, 5 = ft/s, 6 = yd/s Settings.flag2.speed_conversion = 2; // 0 = none, 1 = m/s, 2 = km/h, 3 = kn, 4 = mph, 5 = ft/s, 6 = yd/s
} }
if (!WindMeterSettings.windmeter_radius) { if (!Settings.windmeter_radius) {
WindMeterSettings.windmeter_radius = WINDMETER_DEF_RADIUS; Settings.windmeter_radius = WINDMETER_DEF_RADIUS;
} }
if (!WindMeterSettings.windmeter_pulses_x_rot) { if (!Settings.windmeter_pulses_x_rot) {
WindMeterSettings.windmeter_pulses_x_rot = WINDMETER_DEF_PULSES_X_ROT; Settings.windmeter_pulses_x_rot = WINDMETER_DEF_PULSES_X_ROT;
} }
if (!WindMeterSettings.windmeter_pulse_debounce) { if (!Settings.windmeter_pulse_debounce) {
WindMeterSettings.windmeter_pulse_debounce = WINDMETER_DEF_PULSE_DEBOUNCE; Settings.windmeter_pulse_debounce = WINDMETER_DEF_PULSE_DEBOUNCE;
} }
if (!WindMeterSettings.windmeter_speed_factor) { if (!Settings.windmeter_speed_factor) {
WindMeterSettings.windmeter_speed_factor = (int16_t)(WINDMETER_DEF_COMP_FACTOR * 1000); Settings.windmeter_speed_factor = (int16_t)(WINDMETER_DEF_COMP_FACTOR * 1000);
} }
#ifndef USE_WINDMETER_NOSTATISTICS #ifndef USE_WINDMETER_NOSTATISTICS
@ -128,8 +121,8 @@ void WindMeterEverySecond(void)
//AddLog_P2(LOG_LEVEL_INFO, PSTR("delta_time: %d"), delta_time); //AddLog_P2(LOG_LEVEL_INFO, PSTR("delta_time: %d"), delta_time);
// speed = ( (pulses / pulses_per_rotation) * (2 * pi * radius) ) / delta_time // speed = ( (pulses / pulses_per_rotation) * (2 * pi * radius) ) / delta_time
WindMeter.speed = ((WindMeter.counter / WindMeterSettings.windmeter_pulses_x_rot) * (windmeter_2pi * ((float)WindMeterSettings.windmeter_radius / 1000))) * ((float)WindMeterSettings.windmeter_speed_factor / 1000); WindMeter.speed = ((WindMeter.counter / Settings.windmeter_pulses_x_rot) * (windmeter_2pi * ((float)Settings.windmeter_radius / 1000))) * ((float)Settings.windmeter_speed_factor / 1000);
//WindMeter.speed = (((WindMeter.counter / WindMeterSettings.windmeter_pulses_x_rot) * (windmeter_2pi * ((float)WindMeterSettings.windmeter_radius / 1000))) / ((float)delta_time / 1000000)) * ((float)WindMeterSettings.windmeter_speed_factor / 1000); //WindMeter.speed = (((WindMeter.counter / Settings.windmeter_pulses_x_rot) * (windmeter_2pi * ((float)Settings.windmeter_radius / 1000))) / ((float)delta_time / 1000000)) * ((float)Settings.windmeter_speed_factor / 1000);
WindMeter.counter = 0; WindMeter.counter = 0;
//WindMeter.speed_time = time; //WindMeter.speed_time = time;
@ -271,31 +264,31 @@ bool Xsns68Cmnd(void)
switch (XdrvMailbox.payload) { switch (XdrvMailbox.payload) {
case 1: case 1:
if (strstr(XdrvMailbox.data, ",") != nullptr) { if (strstr(XdrvMailbox.data, ",") != nullptr) {
WindMeterSettings.windmeter_radius = (uint16_t)strtol(subStr(sub_string, XdrvMailbox.data, ",", 2), nullptr, 10); Settings.windmeter_radius = (uint16_t)strtol(subStr(sub_string, XdrvMailbox.data, ",", 2), nullptr, 10);
} }
break; break;
case 2: case 2:
if (strstr(XdrvMailbox.data, ",") != nullptr) { if (strstr(XdrvMailbox.data, ",") != nullptr) {
WindMeterSettings.windmeter_pulses_x_rot = (uint8_t)strtol(subStr(sub_string, XdrvMailbox.data, ",", 2), nullptr, 10); Settings.windmeter_pulses_x_rot = (uint8_t)strtol(subStr(sub_string, XdrvMailbox.data, ",", 2), nullptr, 10);
} }
break; break;
case 3: case 3:
if (strstr(XdrvMailbox.data, ",") != nullptr) { if (strstr(XdrvMailbox.data, ",") != nullptr) {
WindMeterSettings.windmeter_pulse_debounce = (uint16_t)strtol(subStr(sub_string, XdrvMailbox.data, ",", 2), nullptr, 10); Settings.windmeter_pulse_debounce = (uint16_t)strtol(subStr(sub_string, XdrvMailbox.data, ",", 2), nullptr, 10);
} }
break; break;
case 4: case 4:
if (strstr(XdrvMailbox.data, ",") != nullptr) { if (strstr(XdrvMailbox.data, ",") != nullptr) {
WindMeterSettings.windmeter_speed_factor = (int16_t)(CharToFloat(subStr(sub_string, XdrvMailbox.data, ",", 2)) * 1000); Settings.windmeter_speed_factor = (int16_t)(CharToFloat(subStr(sub_string, XdrvMailbox.data, ",", 2)) * 1000);
} }
break; break;
} }
if (show_parms) { if (show_parms) {
char speed_factor_string[FLOATSZ]; char speed_factor_string[FLOATSZ];
dtostrfd((float)WindMeterSettings.windmeter_speed_factor / 1000, 3, speed_factor_string); dtostrfd((float)Settings.windmeter_speed_factor / 1000, 3, speed_factor_string);
Response_P(PSTR("{\"" D_WINDMETER_NAME "\":{\"Radius\":%d,\"PulsesPerRot\":%d,\"PulseDebounce\":%d,\"SpeedFactor\":%s}}"), Response_P(PSTR("{\"" D_WINDMETER_NAME "\":{\"Radius\":%d,\"PulsesPerRot\":%d,\"PulseDebounce\":%d,\"SpeedFactor\":%s}}"),
WindMeterSettings.windmeter_radius, WindMeterSettings.windmeter_pulses_x_rot, WindMeterSettings.windmeter_pulse_debounce, speed_factor_string); Settings.windmeter_radius, Settings.windmeter_pulses_x_rot, Settings.windmeter_pulse_debounce, speed_factor_string);
} }
return serviced; return serviced;
} }