Victor 3 лет назад
Родитель
Сommit
76293d5298
2 измененных файлов с 2 добавлено и 17 удалено
  1. 0 1
      Sensors.c
  2. 2 16
      views/General_view.c

+ 0 - 1
Sensors.c

@@ -614,7 +614,6 @@ UnitempStatus unitemp_sensor_updateData(Sensor* sensor) {
     if(app->settings.temp_unit == UT_TEMP_FAHRENHEIT && sensor->status == UT_SENSORSTATUS_OK)
         uintemp_celsiumToFarengate(sensor);
     if(sensor->status == UT_SENSORSTATUS_OK) {
-        FURI_LOG_D(APP_NAME, "Pressure: %f Pa", (double)sensor->pressure);
         if(app->settings.pressure_unit == UT_PRESSURE_MM_HG) {
             unitemp_pascalToMmHg(sensor);
         } else if(app->settings.pressure_unit == UT_PRESSURE_IN_HG) {

+ 2 - 16
views/General_view.c

@@ -59,12 +59,10 @@ static void _draw_temperature(Canvas* canvas, Sensor* sensor, uint8_t x, uint8_t
         (app->settings.temp_unit == UT_TEMP_CELSIUS ? &I_temp_C_11x14 : &I_temp_F_11x14));
 
     if((int16_t)sensor->temp == -128 || sensor->status == UT_SENSORSTATUS_TIMEOUT) {
-        snprintf(app->buff, BUFF_SIZE, "--");
         canvas_set_font(canvas, FontBigNumbers);
-        canvas_draw_str_aligned(canvas, x + 27, y + 10, AlignCenter, AlignCenter, app->buff);
-        snprintf(app->buff, BUFF_SIZE, ". -");
+        canvas_draw_str_aligned(canvas, x + 27, y + 10, AlignCenter, AlignCenter, "--");
         canvas_set_font(canvas, FontPrimary);
-        canvas_draw_str_aligned(canvas, x + 50, y + 10 + 3, AlignRight, AlignCenter, app->buff);
+        canvas_draw_str_aligned(canvas, x + 50, y + 10 + 3, AlignRight, AlignCenter, ". -");
         if(color == ColorBlack) canvas_invert_color(canvas);
         return;
     }
@@ -97,18 +95,6 @@ static void _draw_humidity(Canvas* canvas, Sensor* sensor, const uint8_t pos[2])
     //Рисование иконки
     canvas_draw_icon(canvas, pos[0] + 3, pos[1] + 2, &I_hum_9x15);
 
-    if((int8_t)sensor->hum == -128 || sensor->status == UT_SENSORSTATUS_TIMEOUT) {
-        snprintf(app->buff, BUFF_SIZE, "--");
-        canvas_set_font(canvas, FontBigNumbers);
-        canvas_draw_str_aligned(
-            canvas, pos[0] + 27, pos[1] + 10, AlignCenter, AlignCenter, app->buff);
-        snprintf(app->buff, BUFF_SIZE, ". -");
-        canvas_set_font(canvas, FontPrimary);
-        canvas_draw_str_aligned(
-            canvas, pos[0] + 50, pos[1] + 10 + 3, AlignRight, AlignCenter, app->buff);
-        return;
-    }
-
     //Целая часть влажности
     snprintf(app->buff, BUFF_SIZE, "%d", (uint8_t)sensor->hum);
     canvas_set_font(canvas, FontBigNumbers);