Merge branch 'main' into cud

This commit is contained in:
Siwat Sirichai 2023-10-04 13:47:32 +07:00
commit 31cfb252df
1 changed files with 6 additions and 6 deletions

View File

@ -752,9 +752,9 @@ void publish_env_state()
mqtt_client.loop(); mqtt_client.loop();
if (lcd_current_page == 4) if (lcd_current_page == 4)
{ {
Serial.printf("roomtemp.txt=\"%.01fC\"",current_room_temp); Serial.printf("roomtemp.txt=\"%.01fC\"", current_room_temp);
lcd_send_stop_bit(); lcd_send_stop_bit();
Serial.printf("roomhumid.txt=\"%d%\"",current_room_humid); Serial.printf("roomhumid.txt=\"%d%%\"", (int)current_room_humid);
lcd_send_stop_bit(); lcd_send_stop_bit();
} }
break; break;
@ -819,9 +819,9 @@ void lcd_refresh()
} }
break; break;
case 4: case 4:
Serial.printf("roomtemp.txt=\"%.01fC\"",current_room_temp); Serial.printf("roomtemp.txt=\"%.01fC\"", current_room_temp);
lcd_send_stop_bit(); lcd_send_stop_bit();
Serial.printf("roomhumid.txt=\"%.01f%\"",current_room_humid); Serial.printf("roomhumid.txt=\"%d%%\"", (int)current_room_humid);
lcd_send_stop_bit(); lcd_send_stop_bit();
if (ac_mode != 2) if (ac_mode != 2)
panel.writeStr("temp.txt", String(ac_temperature) + "C"); panel.writeStr("temp.txt", String(ac_temperature) + "C");