浏览代码

Fix thermal protection with user thermistor (#14130)

doggyfan 6 年前
父节点
当前提交
90121047d9
共有 1 个文件被更改,包括 24 次插入16 次删除
  1. 24
    16
      Marlin/src/inc/Conditionals_post.h

+ 24
- 16
Marlin/src/inc/Conditionals_post.h 查看文件

304
   #define HEATER_0_MAX6675_TMAX 1024
304
   #define HEATER_0_MAX6675_TMAX 1024
305
 #elif TEMP_SENSOR_0 == -1
305
 #elif TEMP_SENSOR_0 == -1
306
   #define HEATER_0_USES_AD595
306
   #define HEATER_0_USES_AD595
307
-#elif TEMP_SENSOR_0 == 1000
308
-  #define HEATER_0_USER_THERMISTOR
309
 #elif TEMP_SENSOR_0 > 0
307
 #elif TEMP_SENSOR_0 > 0
310
   #define THERMISTOR_HEATER_0 TEMP_SENSOR_0
308
   #define THERMISTOR_HEATER_0 TEMP_SENSOR_0
311
   #define HEATER_0_USES_THERMISTOR
309
   #define HEATER_0_USES_THERMISTOR
310
+  #if TEMP_SENSOR_0 == 1000
311
+    #define HEATER_0_USER_THERMISTOR
312
+  #endif
312
 #else
313
 #else
313
   #undef HEATER_0_MINTEMP
314
   #undef HEATER_0_MINTEMP
314
   #undef HEATER_0_MAXTEMP
315
   #undef HEATER_0_MAXTEMP
332
   #define HEATER_1_MAX6675_TMAX 1024
333
   #define HEATER_1_MAX6675_TMAX 1024
333
 #elif TEMP_SENSOR_1 == -1
334
 #elif TEMP_SENSOR_1 == -1
334
   #define HEATER_1_USES_AD595
335
   #define HEATER_1_USES_AD595
335
-#elif TEMP_SENSOR_1 == 1000
336
-  #define HEATER_1_USER_THERMISTOR
337
 #elif TEMP_SENSOR_1 > 0
336
 #elif TEMP_SENSOR_1 > 0
338
   #define THERMISTOR_HEATER_1 TEMP_SENSOR_1
337
   #define THERMISTOR_HEATER_1 TEMP_SENSOR_1
339
   #define HEATER_1_USES_THERMISTOR
338
   #define HEATER_1_USES_THERMISTOR
339
+  #if TEMP_SENSOR_1 == 1000
340
+    #define HEATER_1_USER_THERMISTOR
341
+  #endif
340
 #else
342
 #else
341
   #undef HEATER_1_MINTEMP
343
   #undef HEATER_1_MINTEMP
342
   #undef HEATER_1_MAXTEMP
344
   #undef HEATER_1_MAXTEMP
350
   #error "MAX6675 Thermocouples (-2) not supported for TEMP_SENSOR_2."
352
   #error "MAX6675 Thermocouples (-2) not supported for TEMP_SENSOR_2."
351
 #elif TEMP_SENSOR_2 == -1
353
 #elif TEMP_SENSOR_2 == -1
352
   #define HEATER_2_USES_AD595
354
   #define HEATER_2_USES_AD595
353
-#elif TEMP_SENSOR_2 == 1000
354
-  #define HEATER_2_USER_THERMISTOR
355
 #elif TEMP_SENSOR_2 > 0
355
 #elif TEMP_SENSOR_2 > 0
356
   #define THERMISTOR_HEATER_2 TEMP_SENSOR_2
356
   #define THERMISTOR_HEATER_2 TEMP_SENSOR_2
357
   #define HEATER_2_USES_THERMISTOR
357
   #define HEATER_2_USES_THERMISTOR
358
+  #if TEMP_SENSOR_2 == 1000
359
+    #define HEATER_2_USER_THERMISTOR
360
+  #endif
358
 #else
361
 #else
359
   #undef HEATER_2_MINTEMP
362
   #undef HEATER_2_MINTEMP
360
   #undef HEATER_2_MAXTEMP
363
   #undef HEATER_2_MAXTEMP
368
   #error "MAX6675 Thermocouples (-2) not supported for TEMP_SENSOR_3."
371
   #error "MAX6675 Thermocouples (-2) not supported for TEMP_SENSOR_3."
369
 #elif TEMP_SENSOR_3 == -1
372
 #elif TEMP_SENSOR_3 == -1
370
   #define HEATER_3_USES_AD595
373
   #define HEATER_3_USES_AD595
371
-#elif TEMP_SENSOR_3 == 1000
372
-  #define HEATER_3_USER_THERMISTOR
373
 #elif TEMP_SENSOR_3 > 0
374
 #elif TEMP_SENSOR_3 > 0
374
   #define THERMISTOR_HEATER_3 TEMP_SENSOR_3
375
   #define THERMISTOR_HEATER_3 TEMP_SENSOR_3
375
   #define HEATER_3_USES_THERMISTOR
376
   #define HEATER_3_USES_THERMISTOR
377
+  #if TEMP_SENSOR_3 == 1000
378
+    #define HEATER_3_USER_THERMISTOR
379
+  #endif
376
 #else
380
 #else
377
   #undef HEATER_3_MINTEMP
381
   #undef HEATER_3_MINTEMP
378
   #undef HEATER_3_MAXTEMP
382
   #undef HEATER_3_MAXTEMP
386
   #error "MAX6675 Thermocouples (-2) not supported for TEMP_SENSOR_4."
390
   #error "MAX6675 Thermocouples (-2) not supported for TEMP_SENSOR_4."
387
 #elif TEMP_SENSOR_4 == -1
391
 #elif TEMP_SENSOR_4 == -1
388
   #define HEATER_4_USES_AD595
392
   #define HEATER_4_USES_AD595
389
-#elif TEMP_SENSOR_4 == 1000
390
-  #define HEATER_4_USER_THERMISTOR
391
 #elif TEMP_SENSOR_4 > 0
393
 #elif TEMP_SENSOR_4 > 0
392
   #define THERMISTOR_HEATER_4 TEMP_SENSOR_4
394
   #define THERMISTOR_HEATER_4 TEMP_SENSOR_4
393
   #define HEATER_4_USES_THERMISTOR
395
   #define HEATER_4_USES_THERMISTOR
396
+  #if TEMP_SENSOR_4 == 1000
397
+    #define HEATER_4_USER_THERMISTOR
398
+  #endif
394
 #else
399
 #else
395
   #undef HEATER_4_MINTEMP
400
   #undef HEATER_4_MINTEMP
396
   #undef HEATER_4_MAXTEMP
401
   #undef HEATER_4_MAXTEMP
404
   #error "MAX6675 Thermocouples (-2) not supported for TEMP_SENSOR_5."
409
   #error "MAX6675 Thermocouples (-2) not supported for TEMP_SENSOR_5."
405
 #elif TEMP_SENSOR_5 == -1
410
 #elif TEMP_SENSOR_5 == -1
406
   #define HEATER_5_USES_AD595
411
   #define HEATER_5_USES_AD595
407
-#elif TEMP_SENSOR_5 == 1000
408
-  #define HEATER_5_USER_THERMISTOR
409
 #elif TEMP_SENSOR_5 > 0
412
 #elif TEMP_SENSOR_5 > 0
410
   #define THERMISTOR_HEATER_5 TEMP_SENSOR_5
413
   #define THERMISTOR_HEATER_5 TEMP_SENSOR_5
411
   #define HEATER_5_USES_THERMISTOR
414
   #define HEATER_5_USES_THERMISTOR
415
+  #if TEMP_SENSOR_5 == 1000
416
+    #define HEATER_5_USER_THERMISTOR
417
+  #endif
412
 #else
418
 #else
413
   #undef HEATER_5_MINTEMP
419
   #undef HEATER_5_MINTEMP
414
   #undef HEATER_5_MAXTEMP
420
   #undef HEATER_5_MAXTEMP
422
   #error "MAX6675 Thermocouples (-2) not supported for TEMP_SENSOR_BED."
428
   #error "MAX6675 Thermocouples (-2) not supported for TEMP_SENSOR_BED."
423
 #elif TEMP_SENSOR_BED == -1
429
 #elif TEMP_SENSOR_BED == -1
424
   #define HEATER_BED_USES_AD595
430
   #define HEATER_BED_USES_AD595
425
-#elif TEMP_SENSOR_BED == 1000
426
-  #define BED_USER_THERMISTOR
427
 #elif TEMP_SENSOR_BED > 0
431
 #elif TEMP_SENSOR_BED > 0
428
   #define THERMISTORBED TEMP_SENSOR_BED
432
   #define THERMISTORBED TEMP_SENSOR_BED
429
   #define HEATER_BED_USES_THERMISTOR
433
   #define HEATER_BED_USES_THERMISTOR
434
+  #if TEMP_SENSOR_BED == 1000
435
+    #define HEATER_BED_USER_THERMISTOR
436
+  #endif
430
 #else
437
 #else
431
   #undef BED_MINTEMP
438
   #undef BED_MINTEMP
432
   #undef BED_MAXTEMP
439
   #undef BED_MAXTEMP
440
   #error "MAX6675 Thermocouples (-2) not supported for TEMP_SENSOR_CHAMBER."
447
   #error "MAX6675 Thermocouples (-2) not supported for TEMP_SENSOR_CHAMBER."
441
 #elif TEMP_SENSOR_CHAMBER == -1
448
 #elif TEMP_SENSOR_CHAMBER == -1
442
   #define HEATER_CHAMBER_USES_AD595
449
   #define HEATER_CHAMBER_USES_AD595
443
-#elif TEMP_SENSOR_CHAMBER == 1000
444
-  #define CHAMBER_USER_THERMISTOR
445
 #elif TEMP_SENSOR_CHAMBER > 0
450
 #elif TEMP_SENSOR_CHAMBER > 0
446
   #define THERMISTORCHAMBER TEMP_SENSOR_CHAMBER
451
   #define THERMISTORCHAMBER TEMP_SENSOR_CHAMBER
447
   #define HEATER_CHAMBER_USES_THERMISTOR
452
   #define HEATER_CHAMBER_USES_THERMISTOR
453
+  #if TEMP_SENSOR_CHAMBER == 1000
454
+    #define HEATER_CHAMBER_USER_THERMISTOR
455
+  #endif
448
 #else
456
 #else
449
   #undef CHAMBER_MINTEMP
457
   #undef CHAMBER_MINTEMP
450
   #undef CHAMBER_MAXTEMP
458
   #undef CHAMBER_MAXTEMP

正在加载...
取消
保存