thomas
/
marlin
Watch 1
Star 0
Fork 0
Code Issues 0 Pull Requests 0 Releases 0 Wiki Activity
Browse Source

Patch tabs, heater led tests

Scott Lahteine 4 years ago
parent
a89f4703df
commit
e6dfc991ae
3 changed files with 46 additions and 42 deletions
Split View Show Diff Stats
  1. 6
    2
      Marlin/src/lcd/HD44780/ultralcd_HD44780.cpp
  2. 4
    4
      Marlin/src/lcd/ultralcd.cpp
  3. 36
    36
      Marlin/src/module/thermistor/thermistor_99.h

+ 6
- 2
Marlin/src/lcd/HD44780/ultralcd_HD44780.cpp View File 

@@ -1066,9 +1066,13 @@ void MarlinUI::draw_status_screen() {
1066 1066 
       static uint8_t ledsprev = 0;
1067 1067 
       uint8_t leds = 0;
1068 1068
1069 
-      if (thermalManager.degTargetBed() > 0) leds |= LED_A;
1069 
+      #if HAS_HEATED_BED
1070 
+        if (thermalManager.degTargetBed() > 0) leds |= LED_A;
1071 
+      #endif
1070 1072
1071 
-      if (thermalManager.degTargetHotend(0) > 0) leds |= LED_B;
1073 
+      #if HOTENDS
1074 
+        if (thermalManager.degTargetHotend(0) > 0) leds |= LED_B;
1075 
+      #endif
1072 1076
1073 1077 
       #if FAN_COUNT > 0
1074 1078 
         if (0

+ 4
- 4
Marlin/src/lcd/ultralcd.cpp View File 

@@ -1233,11 +1233,11 @@ void MarlinUI::update() {
1233 1233
1234 1234 
         #endif // UP || DWN || LFT || RT
1235 1235
1236 
-        buttons = newbutton
1236 
+        buttons = (newbutton
1237 1237 
           #if HAS_SLOW_BUTTONS
1238 1238 
             | slow_buttons
1239 1239 
           #endif
1240 
-        ;
1240 
+        );
1241 1241
1242 1242 
       #elif HAS_ADC_BUTTONS
1243 1243 
 
@@ -1254,13 +1254,13 @@ void MarlinUI::update() {
1254 1254
1255 1255 
       #if HAS_SHIFT_ENCODER
1256 1256
1257 
-        GET_SHIFT_BUTTON_STATES(
1257 
+        GET_SHIFT_BUTTON_STATES((
1258 1258 
           #if ENABLED(REPRAPWORLD_KEYPAD)
1259 1259 
             keypad_buttons
1260 1260 
           #else
1261 1261 
             buttons
1262 1262 
           #endif
1263 
-        );
1263 
+        ));
1264 1264
1265 1265 
       #endif
1266 1266

+ 36
- 36
Marlin/src/module/thermistor/thermistor_99.h View File 

@@ -25,40 +25,40 @@
25 25 
 // 100k bed thermistor with a 10K pull-up resistor - made by $ buildroot/share/scripts/createTemperatureLookupMarlin.py --rp=10000
26 26
27 27 
 const short temptable_99[][2] PROGMEM = {
28 
-  { OV(  5.81), 350 }, // v=0.028	r=57.081	res=13.433 degC/count
29 
-  { OV(  6.54), 340 }, // v=0.032	r=64.248	res=11.711 degC/count
30 
-  { OV(  7.38), 330 }, // v=0.036	r=72.588	res=10.161 degC/count
31 
-  { OV(  8.36), 320 }, // v=0.041	r=82.336	res=8.772 degC/count
32 
-  { OV(  9.51), 310 }, // v=0.046	r=93.780	res=7.535 degC/count
33 
-  { OV( 10.87), 300 }, // v=0.053	r=107.281	res=6.439 degC/count
34 
-  { OV( 12.47), 290 }, // v=0.061	r=123.286	res=5.473 degC/count
35 
-  { OV( 14.37), 280 }, // v=0.070	r=142.360	res=4.627 degC/count
36 
-  { OV( 16.64), 270 }, // v=0.081	r=165.215	res=3.891 degC/count
37 
-  { OV( 19.37), 260 }, // v=0.095	r=192.758	res=3.253 degC/count
38 
-  { OV( 22.65), 250 }, // v=0.111	r=226.150	res=2.705 degC/count
39 
-  { OV( 26.62), 240 }, // v=0.130	r=266.891	res=2.236 degC/count
40 
-  { OV( 31.46), 230 }, // v=0.154	r=316.931	res=1.839 degC/count
41 
-  { OV( 37.38), 220 }, // v=0.182	r=378.822	res=1.504 degC/count
42 
-  { OV( 44.65), 210 }, // v=0.218	r=455.939	res=1.224 degC/count
43 
-  { OV( 53.64), 200 }, // v=0.262	r=552.778	res=0.991 degC/count
44 
-  { OV( 64.78), 190 }, // v=0.316	r=675.386	res=0.799 degC/count
45 
-  { OV( 78.65), 180 }, // v=0.384	r=831.973	res=0.643 degC/count
46 
-  { OV( 95.94), 170 }, // v=0.468	r=1033.801	res=0.516 degC/count
47 
-  { OV(117.52), 160 }, // v=0.574	r=1296.481	res=0.414 degC/count
48 
-  { OV(144.42), 150 }, // v=0.705	r=1641.900	res=0.333 degC/count
49 
-  { OV(177.80), 140 }, // v=0.868	r=2101.110	res=0.269 degC/count
50 
-  { OV(218.89), 130 }, // v=1.069	r=2718.725	res=0.220 degC/count
51 
-  { OV(268.82), 120 }, // v=1.313	r=3559.702	res=0.183 degC/count
52 
-  { OV(328.35), 110 }, // v=1.603	r=4719.968	res=0.155 degC/count
53 
-  { OV(397.44), 100 }, // v=1.941	r=6343.323	res=0.136 degC/count
54 
-  { OV(474.90),  90 }, // v=2.319	r=8648.807	res=0.124 degC/count
55 
-  { OV(558.03),  80 }, // v=2.725	r=11975.779	res=0.118 degC/count
56 
-  { OV(642.76),  70 }, // v=3.138	r=16859.622	res=0.119 degC/count
57 
-  { OV(724.25),  60 }, // v=3.536	r=24161.472	res=0.128 degC/count
58 
-  { OV(797.93),  50 }, // v=3.896	r=35295.361	res=0.146 degC/count
59 
-  { OV(860.51),  40 }, // v=4.202	r=52635.209	res=0.178 degC/count
60 
-  { OV(910.55),  30 }, // v=4.446	r=80262.251	res=0.229 degC/count
61 
-  { OV(948.36),  20 }, // v=4.631	r=125374.433	res=0.313 degC/count
62 
-  { OV(975.47),  10 }, // v=4.763	r=201020.458	res=0.449 degC/count
63 
-  { OV(994.02),   0 }  // v=4.854	r=331567.870	res=0.676 degC/count
28 
+  { OV(  5.81), 350 }, // v=0.028   r=    57.081  res=13.433 degC/count
29 
+  { OV(  6.54), 340 }, // v=0.032   r=    64.248  res=11.711 degC/count
30 
+  { OV(  7.38), 330 }, // v=0.036   r=    72.588  res=10.161 degC/count
31 
+  { OV(  8.36), 320 }, // v=0.041   r=    82.336  res= 8.772 degC/count
32 
+  { OV(  9.51), 310 }, // v=0.046   r=    93.780  res= 7.535 degC/count
33 
+  { OV( 10.87), 300 }, // v=0.053   r=   107.281  res= 6.439 degC/count
34 
+  { OV( 12.47), 290 }, // v=0.061   r=   123.286  res= 5.473 degC/count
35 
+  { OV( 14.37), 280 }, // v=0.070   r=   142.360  res= 4.627 degC/count
36 
+  { OV( 16.64), 270 }, // v=0.081   r=   165.215  res= 3.891 degC/count
37 
+  { OV( 19.37), 260 }, // v=0.095   r=   192.758  res= 3.253 degC/count
38 
+  { OV( 22.65), 250 }, // v=0.111   r=   226.150  res= 2.705 degC/count
39 
+  { OV( 26.62), 240 }, // v=0.130   r=   266.891  res= 2.236 degC/count
40 
+  { OV( 31.46), 230 }, // v=0.154   r=   316.931  res= 1.839 degC/count
41 
+  { OV( 37.38), 220 }, // v=0.182   r=   378.822  res= 1.504 degC/count
42 
+  { OV( 44.65), 210 }, // v=0.218   r=   455.939  res= 1.224 degC/count
43 
+  { OV( 53.64), 200 }, // v=0.262   r=   552.778  res= 0.991 degC/count
44 
+  { OV( 64.78), 190 }, // v=0.316   r=   675.386  res= 0.799 degC/count
45 
+  { OV( 78.65), 180 }, // v=0.384   r=   831.973  res= 0.643 degC/count
46 
+  { OV( 95.94), 170 }, // v=0.468   r=  1033.801  res= 0.516 degC/count
47 
+  { OV(117.52), 160 }, // v=0.574   r=  1296.481  res= 0.414 degC/count
48 
+  { OV(144.42), 150 }, // v=0.705   r=  1641.900  res= 0.333 degC/count
49 
+  { OV(177.80), 140 }, // v=0.868   r=  2101.110  res= 0.269 degC/count
50 
+  { OV(218.89), 130 }, // v=1.069   r=  2718.725  res= 0.220 degC/count
51 
+  { OV(268.82), 120 }, // v=1.313   r=  3559.702  res= 0.183 degC/count
52 
+  { OV(328.35), 110 }, // v=1.603   r=  4719.968  res= 0.155 degC/count
53 
+  { OV(397.44), 100 }, // v=1.941   r=  6343.323  res= 0.136 degC/count
54 
+  { OV(474.90),  90 }, // v=2.319   r=  8648.807  res= 0.124 degC/count
55 
+  { OV(558.03),  80 }, // v=2.725   r= 11975.779  res= 0.118 degC/count
56 
+  { OV(642.76),  70 }, // v=3.138   r= 16859.622  res= 0.119 degC/count
57 
+  { OV(724.25),  60 }, // v=3.536   r= 24161.472  res= 0.128 degC/count
58 
+  { OV(797.93),  50 }, // v=3.896   r= 35295.361  res= 0.146 degC/count
59 
+  { OV(860.51),  40 }, // v=4.202   r= 52635.209  res= 0.178 degC/count
60 
+  { OV(910.55),  30 }, // v=4.446   r= 80262.251  res= 0.229 degC/count
61 
+  { OV(948.36),  20 }, // v=4.631   r=125374.433  res= 0.313 degC/count
62 
+  { OV(975.47),  10 }, // v=4.763   r=201020.458  res= 0.449 degC/count
63 
+  { OV(994.02),   0 }  // v=4.854   r=331567.870  res= 0.676 degC/count
64 64 
 };

Write Preview
Loading…
Cancel
Save