jeans/Tasmota
jeans/Tasmota
1
0
Fork 0
mirror of https://github.com/arendst/Tasmota.git synced 2025-07-25 11:46:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Prep for user entry STD/DST"

Browse Source 
This reverts commit 42cd1b97dcb5f9f16dd910eb2a6922f68acf7869.
This commit is contained in:
Theo Arends 2018-05-13 18:48:14 +02:00
parent 42cd1b97dc
commit 137ac82654
1 changed files with 7 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
sonoff/settings.h
View File

@ -89,17 +89,6 @@ typedef union {
}; };
} SysBitfield2; } SysBitfield2;
typedef union {
uint16_t data;
struct {
uint32_t hemis : 1; // bit 0 = 0=Northern, 1=Southern Hemisphere (=Opposite DST/STD)
uint32_t week : 3; // bits 1 - 3 = 0=Last week of the month, 1=First, 2=Second, 3=Third, 4=Fourth
uint32_t month : 4; // bits 4 - 7 = 1=Jan, 2=Feb, ... 12=Dec
uint32_t dow : 3; // bits 8 - 10 = day of week, 1=Sun, 2=Mon, ... 7=Sat
uint32_t hour : 5; // bits 11 - 15 = 0-23
};
} TimeRule;
typedef union { typedef union {
uint32_t data; uint32_t data;
struct { struct {
@ -159,8 +148,9 @@ struct SYSCFG {
uint8_t display_address[8]; // 2D8 uint8_t display_address[8]; // 2D8
uint8_t display_dimmer; // 2E0 uint8_t display_dimmer; // 2E0
uint8_t display_size; // 2E1 uint8_t display_size; // 2E1
TimeRule std_flags; // 2E2
int16_t std_offset; // 2E4 offset from UTC in minutes uint8_t free_2E2[4]; // 2E2
uint16_t pwm_frequency; // 2E6 uint16_t pwm_frequency; // 2E6
power_t power; // 2E8 power_t power; // 2E8
uint16_t pwm_value[MAX_PWMS]; // 2EC uint16_t pwm_value[MAX_PWMS]; // 2EC
@ -244,7 +234,9 @@ struct SYSCFG {
char ntp_server[3][33]; // 4CE char ntp_server[3][33]; // 4CE
byte ina219_mode; // 531 byte ina219_mode; // 531
uint16_t pulse_timer[MAX_PULSETIMERS]; // 532 uint16_t pulse_timer[MAX_PULSETIMERS]; // 532
TimeRule dst_flags; // 542
byte free_542[2]; // 542
uint32_t ip_address[4]; // 544 uint32_t ip_address[4]; // 544
unsigned long energy_kWhtotal; // 554 unsigned long energy_kWhtotal; // 554
char mqtt_fulltopic[100]; // 558 char mqtt_fulltopic[100]; // 558
@ -254,9 +246,8 @@ struct SYSCFG {
uint16_t pulse_counter_debounce; // 5D2 uint16_t pulse_counter_debounce; // 5D2
uint8_t rf_code[17][9]; // 5D4 uint8_t rf_code[17][9]; // 5D4
byte free_66d[1]; // 66D byte free_66d[3]; // 66D
int16_t dst_offset; // 66E
Timer timer[MAX_TIMERS]; // 670 Timer timer[MAX_TIMERS]; // 670
int latitude; // 6B0 int latitude; // 6B0
int longitude; // 6B4 int longitude; // 6B4