Better design

itschina · Feb 14, 2022 · ddeb3a8 · ddeb3a8
1 parent 27f6e53
commit ddeb3a8
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 7 deletions.
diff --git a/Firmware/ATC_Paper.bin b/Firmware/ATC_Paper.bin
diff --git a/Firmware/src/app.c b/Firmware/src/app.c
@@ -19,6 +19,7 @@ RAM uint16_t battery_mv;
 RAM int16_t temperature;
 
 RAM uint8_t count_epd_refresh = 60;
+RAM uint8_t hour_refresh = 0;
 
 // Settings
 extern settings_struct settings;
@@ -54,15 +55,17 @@ _attribute_ram_code_ void main_loop(void)
         temperature = get_temperature_c();
         set_adv_data(temperature, battery_level, battery_mv);
         ble_send_battery(battery_level);
-        ble_send_temp(temperature);
+        ble_send_temp(EPD_read_temp()*10);
     }
 
     if (time_reached_period(Timer_CH_2, 60))
     {
         count_epd_refresh++;
-        if (count_epd_refresh > 60)
+        uint8_t current_hour = ((get_time() / 60) / 60) % 24;
+        if ((count_epd_refresh > 60) || (current_hour != hour_refresh))
         {
             count_epd_refresh = 0;
+            hour_refresh = current_hour;
             epd_display(get_time(), battery_mv, temperature, 1);
         }
         else

diff --git a/Firmware/src/epd.c b/Firmware/src/epd.c
@@ -382,11 +382,9 @@ _attribute_ram_code_ void epd_display(uint32_t time_is, uint16_t battery_mv, int
 
     char buff[25];
     sprintf(buff, "%02d:%02d", ((time_is / 60) / 60) % 24, (time_is / 60) % 60);
-    obdWriteStringCustom(&obd, (GFXfont *)&Special_Elite_Regular_30, 10, 45, (char *)buff, 1);
-    sprintf(buff, "Temperature %d C", temperature);
-    obdWriteStringCustom(&obd, (GFXfont *)&Dialog_plain_16, 10, 80, (char *)buff, 1);
-    sprintf(buff, "EPD Temperature %d C", EPD_read_temp());
-    obdWriteStringCustom(&obd, (GFXfont *)&Dialog_plain_16, 10, 100, (char *)buff, 1);
+    obdWriteStringCustom(&obd, (GFXfont *)&DSEG14_Classic_Mini_Regular_40, 50, 45, (char *)buff, 1);
+    sprintf(buff, "%d'C", EPD_read_temp());
+    obdWriteStringCustom(&obd, (GFXfont *)&Special_Elite_Regular_30, 10, 95, (char *)buff, 1);
     sprintf(buff, "Battery %dmV", battery_mv);
     obdWriteStringCustom(&obd, (GFXfont *)&Dialog_plain_16, 10, 120, (char *)buff, 1);
     FixBuffer(epd_temp, epd_buffer);