Sfoglia il codice sorgente

Temperature report followup (#20687)

Co-authored-by: Scott Lahteine <thinkyhead@users.noreply.github.com>
Giuliano Zaro 4 anni fa
parent
commit
1eb592550c
Nessun account collegato all'indirizzo email del committer
1 ha cambiato i file con 9 aggiunte e 6 eliminazioni
  1. 9
    6
      Marlin/src/module/temperature.cpp

+ 9
- 6
Marlin/src/module/temperature.cpp Vedi File

1404
       SERIAL_ECHOPGM("  M305 ");
1404
       SERIAL_ECHOPGM("  M305 ");
1405
     else
1405
     else
1406
       SERIAL_ECHO_START();
1406
       SERIAL_ECHO_START();
1407
-    SERIAL_CHAR('P');
1408
-    SERIAL_CHAR('0' + t_index);
1407
+    SERIAL_CHAR('P', '0' + t_index);
1409
 
1408
 
1410
     const user_thermistor_t &t = user_thermistor[t_index];
1409
     const user_thermistor_t &t = user_thermistor[t_index];
1411
 
1410
 
3001
         default: k = 'B'; break;
3000
         default: k = 'B'; break;
3002
       #endif
3001
       #endif
3003
     }
3002
     }
3004
-    SERIAL_CHAR(' ');
3005
-    SERIAL_CHAR(k);
3003
+    SERIAL_CHAR(' ', k);
3006
     #if HAS_MULTI_HOTEND
3004
     #if HAS_MULTI_HOTEND
3007
       if (e >= 0) SERIAL_CHAR('0' + e);
3005
       if (e >= 0) SERIAL_CHAR('0' + e);
3008
     #endif
3006
     #endif
3007
+    #ifdef SERIAL_FLOAT_PRECISION
3008
+      #define SFP _MIN(SERIAL_FLOAT_PRECISION, 2)
3009
+    #else
3010
+      #define SFP 2
3011
+    #endif
3009
     SERIAL_CHAR(':');
3012
     SERIAL_CHAR(':');
3010
-    SERIAL_PRINT(c, _MIN(SERIAL_FLOAT_PRECISION, 2));
3013
+    SERIAL_PRINT(c, SFP);
3011
     SERIAL_ECHOPGM(" /");
3014
     SERIAL_ECHOPGM(" /");
3012
-    SERIAL_PRINT(t, _MIN(SERIAL_FLOAT_PRECISION, 2));
3015
+    SERIAL_PRINT(t, SFP);
3013
     #if ENABLED(SHOW_TEMP_ADC_VALUES)
3016
     #if ENABLED(SHOW_TEMP_ADC_VALUES)
3014
       SERIAL_ECHOPAIR(" (", r * RECIPROCAL(OVERSAMPLENR));
3017
       SERIAL_ECHOPAIR(" (", r * RECIPROCAL(OVERSAMPLENR));
3015
       SERIAL_CHAR(')');
3018
       SERIAL_CHAR(')');

Loading…
Annulla
Salva