Просмотр исходного кода

Merge unitemp from https://github.com/xMasterX/all-the-plugins

Willy-JL 1 год назад
Родитель
Сommit
cdaeaaf683
3 измененных файлов с 10 добавлено и 2 удалено
  1. 1 1
      unitemp/.gitsubtree
  2. 2 0
      unitemp/Sensors.c
  3. 7 1
      unitemp/views/General_view.c

+ 1 - 1
unitemp/.gitsubtree

@@ -1,2 +1,2 @@
-https://github.com/xMasterX/all-the-plugins dev base_pack/unitemp 4558d74c9da36abc851edd96a95d18f7d5511a75
+https://github.com/xMasterX/all-the-plugins dev base_pack/unitemp 2b434fbfbdbd99396bf7de8b49f64b35dee92c7e
 https://github.com/quen0n/unitemp-flipperzero master /

+ 2 - 0
unitemp/Sensors.c

@@ -651,6 +651,8 @@ UnitempStatus unitemp_sensor_updateData(Sensor* sensor) {
             unitemp_pascalToInHg(sensor);
         } else if(app->settings.pressure_unit == UT_PRESSURE_KPA) {
             unitemp_pascalToKPa(sensor);
+        } else if(app->settings.pressure_unit == UT_PRESSURE_HPA) {
+            unitemp_pascalToHPa(sensor);
         }
     }
     return sensor->status;

+ 7 - 1
unitemp/views/General_view.c

@@ -139,7 +139,13 @@ static void _draw_heat_index(Canvas* canvas, Sensor* sensor, const uint8_t pos[2
 }
 
 static void _draw_pressure(Canvas* canvas, Sensor* sensor) {
-    const uint8_t x = 29, y = 39;
+    uint8_t x = 29, y = 39;
+    //Slide the canvas over slightly to account for the larger hPa values
+    if(app->settings.pressure_unit == UT_PRESSURE_HPA) {
+        x = 21;
+    } else {
+        x = 29;
+    }
     //Рисование рамки
     if(app->settings.pressure_unit == UT_PRESSURE_HPA) {
         canvas_draw_rframe(canvas, x, y, 84, 20, 3);