Browse Source

Use uint16_t for temps

Scott Lahteine 7 years ago
parent
commit
b29dbbd5e4
2 changed files with 8 additions and 8 deletions
  1. 4
    4
      Marlin/temperature.cpp
  2. 4
    4
      Marlin/temperature.h

+ 4
- 4
Marlin/temperature.cpp View File

@@ -103,24 +103,24 @@ int16_t Temperature::current_temperature_raw[HOTENDS] = { 0 },
103 103
 #endif
104 104
 
105 105
 #if WATCH_HOTENDS
106
-  int Temperature::watch_target_temp[HOTENDS] = { 0 };
106
+  uint16_t Temperature::watch_target_temp[HOTENDS] = { 0 };
107 107
   millis_t Temperature::watch_heater_next_ms[HOTENDS] = { 0 };
108 108
 #endif
109 109
 
110 110
 #if WATCH_THE_BED
111
-  int Temperature::watch_target_bed_temp = 0;
111
+  uint16_t Temperature::watch_target_bed_temp = 0;
112 112
   millis_t Temperature::watch_bed_next_ms = 0;
113 113
 #endif
114 114
 
115 115
 #if ENABLED(PREVENT_COLD_EXTRUSION)
116 116
   bool Temperature::allow_cold_extrude = false;
117
-  float Temperature::extrude_min_temp = EXTRUDE_MINTEMP;
117
+  uint16_t Temperature::extrude_min_temp = EXTRUDE_MINTEMP;
118 118
 #endif
119 119
 
120 120
 // private:
121 121
 
122 122
 #if ENABLED(TEMP_SENSOR_1_AS_REDUNDANT)
123
-  int Temperature::redundant_temperature_raw = 0;
123
+  uint16_t Temperature::redundant_temperature_raw = 0;
124 124
   float Temperature::redundant_temperature = 0.0;
125 125
 #endif
126 126
 

+ 4
- 4
Marlin/temperature.h View File

@@ -158,18 +158,18 @@ class Temperature {
158 158
     #endif
159 159
 
160 160
     #if WATCH_HOTENDS
161
-      static int watch_target_temp[HOTENDS];
161
+      static uint16_t watch_target_temp[HOTENDS];
162 162
       static millis_t watch_heater_next_ms[HOTENDS];
163 163
     #endif
164 164
 
165 165
     #if WATCH_THE_BED
166
-      static int watch_target_bed_temp;
166
+      static uint16_t watch_target_bed_temp;
167 167
       static millis_t watch_bed_next_ms;
168 168
     #endif
169 169
 
170 170
     #if ENABLED(PREVENT_COLD_EXTRUSION)
171 171
       static bool allow_cold_extrude;
172
-      static float extrude_min_temp;
172
+      static uint16_t extrude_min_temp;
173 173
       static bool tooColdToExtrude(uint8_t e) {
174 174
         #if HOTENDS == 1
175 175
           UNUSED(e);
@@ -183,7 +183,7 @@ class Temperature {
183 183
   private:
184 184
 
185 185
     #if ENABLED(TEMP_SENSOR_1_AS_REDUNDANT)
186
-      static int redundant_temperature_raw;
186
+      static uint16_t redundant_temperature_raw;
187 187
       static float redundant_temperature;
188 188
     #endif
189 189
 

Loading…
Cancel
Save