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

Merge branch 'main' into cud

This commit is contained in:
Siwat Sirichai 2023-10-02 18:03:40 +07:00
parent 41131514cb 36a5af164e
commit 39a08fadce
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File 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,6 +726,7 @@ 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,6 +47,7 @@ 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);