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

Small refactors

This commit is contained in:
Theo Arends 2022-08-27 12:28:34 +02:00
parent 7e34936e6b
commit e06793eb8c
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tasmota/tasmota_support/support_button _v3.ino
View File

@ -224,13 +224,13 @@ void ButtonInit(void) {
// Button.last_state[i] = digitalRead(Pin(GPIO_KEY1, i)); // Set global now so doesn't change the saved power state on first button check
Button.last_state[i] = (digitalRead(Pin(GPIO_KEY1, i)) != bitRead(Button.inverted_mask, i));
}
Button.virtual_state[i] = Button.last_state[i];
}
#ifdef USE_ADC
else if (PinUsed(GPIO_ADC_BUTTON, i) || PinUsed(GPIO_ADC_BUTTON_INV, i)) {
Button.present++;
}
#endif // USE_ADC
Button.virtual_state[i] = Button.last_state[i];
}
if (Button.present) {
Button.first_change = true;

2
tasmota/tasmota_support/support_switch.ino
View File

@ -197,7 +197,7 @@ void SwitchInit(void) {
Switch.present = 0;
for (uint32_t i = 0; i < MAX_SWITCHES; i++) {
Switch.last_state[i] = 1; // Init global to virtual switch state;
Switch.last_state[i] = NOT_PRESSED; // Init global to virtual switch state;
if (PinUsed(GPIO_SWT1, i)) {
Switch.present++;
#ifdef ESP8266

4
tasmota/tasmota_xdrv_driver/xdrv_03_energy.ino
View File

@ -266,9 +266,9 @@ void EnergyUpdateToday(void) {
}
if (delta_sum_balanced > 0) {
Energy.daily_sum_import_balanced += (float) delta_sum_balanced / 100000;
Energy.daily_sum_import_balanced += (float)delta_sum_balanced / 100000;
} else {
Energy.daily_sum_export_balanced += (float) abs(delta_sum_balanced) / 100000;
Energy.daily_sum_export_balanced += (float)abs(delta_sum_balanced) / 100000;
}
if (RtcTime.valid){ // We calc the difference only if we have a valid RTC time.