ise-senior-iot
/
iot-firmware
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

Compare commits

base: ise-senior-iot:39a08fadceeb9c6545f25f9a16bf0037641072e7
Branches Tags
ise-senior-iot:main
ise-senior-iot:ise
ise-senior-iot:new_ise
ise-senior-iot:ise_dbg
ise-senior-iot:ise-debug
ise-senior-iot:cud
ise-senior-iot:modbus
ise-senior-iot:lcd_upload
ise-senior-iot:homeassistant
ise-senior-iot:iot-ay2023
ise-senior-iot:smart-meeting
ise-senior-iot:core
ise-senior-iot:1.0
..
compare: ise-senior-iot:41131514cbc324505a58d8e0fcd6d194a8d0fc3c
Branches Tags
ise-senior-iot:ise
ise-senior-iot:main
ise-senior-iot:new_ise
ise-senior-iot:ise_dbg
ise-senior-iot:ise-debug
ise-senior-iot:cud
ise-senior-iot:modbus
ise-senior-iot:lcd_upload
ise-senior-iot:homeassistant
ise-senior-iot:iot-ay2023
ise-senior-iot:smart-meeting
ise-senior-iot:core
ise-senior-iot:1.0

No commits in common. "39a08fadceeb9c6545f25f9a16bf0037641072e7" and "41131514cbc324505a58d8e0fcd6d194a8d0fc3c" have entirely different histories.
39a08fadce ... 41131514cb

2 changed files with 2 additions and 4 deletions
Show Stats Expand all files Collapse all files

5
src/espmega_iot_core.cpp
View File

@ -289,8 +289,8 @@ void ota_begin()
{ {
lcd_send_stop_bit(); lcd_send_stop_bit();
uint32_t totalsize_kb = upload.totalSize / 1000; uint32_t totalsize_kb = upload.totalSize / 1000;
uint32_t upload_pct = 100 * upload.totalSize / 1000000; uint32_t upload_pct = 100 * upload.totalSize/1000000;
String otafiletxt = "Downloading File : " + upload.filename + " (" + String(totalsize_kb) + "KB)"; String otafiletxt = "Downloading File : " + upload.filename + " ("+String(totalsize_kb) + "KB)";
panel.writeNum("prog.val", upload_pct); panel.writeNum("prog.val", upload_pct);
panel.writeStr("otatxt.txt", otafiletxt); panel.writeStr("otatxt.txt", otafiletxt);
} }
@ -726,7 +726,6 @@ void ac_set_state(int mode, int temperature, int fan_speed)
IrSender.sendRaw(ir_code_fan[fan_speed], sizeof(ir_code_fan[fan_speed]) / sizeof(ir_code_fan[fan_speed][0]), NEC_KHZ); IrSender.sendRaw(ir_code_fan[fan_speed], sizeof(ir_code_fan[fan_speed]) / sizeof(ir_code_fan[fan_speed][0]), NEC_KHZ);
break; break;
} }
ac_changed_user_callback(mode, temperature, fan_speed);
} }
void publish_env_state() void publish_env_state()

1
src/user_code.hpp
View File

@ -47,7 +47,6 @@ void user_init();
void user_loop(); void user_loop();
void virtual_interrupt_user_callback(int pin, int state); void virtual_interrupt_user_callback(int pin, int state);
void pwm_changed_user_callback(int pin); void pwm_changed_user_callback(int pin);
void ac_changed_user_callback(int mode, int temperature, int fan_speed);
void timer_tick_callback(); void timer_tick_callback();
void lt_btn_cb(void *comp); void lt_btn_cb(void *comp);
void fan_btn_cb(void *comp); void fan_btn_cb(void *comp);