浏览代码

Merge pull request #4400 from thinkyhead/rc_sanity_check_temp_sensor

Sanity check for too many temp sensors
Scott Lahteine 9 年前
父节点
当前提交
1fe60b723f
共有 2 个文件被更改,包括 14 次插入2 次删除
  1. 13
    1
      Marlin/SanityCheck.h
  2. 1
    1
      Marlin/example_configurations/delta/generic/Configuration.h

+ 13
- 1
Marlin/SanityCheck.h 查看文件

@@ -577,8 +577,20 @@
577 577
       #elif !PIN_EXISTS(TEMP_3)
578 578
         #error "TEMP_3_PIN not defined for this board."
579 579
       #endif
580
+    #elif TEMP_SENSOR_3 != 0
581
+      #error "TEMP_SENSOR_3 shouldn't be set with only 3 extruders."
580 582
     #endif
581
-  #endif
583
+  #elif TEMP_SENSOR_2 != 0
584
+    #error "TEMP_SENSOR_2 shouldn't be set with only 2 extruders."
585
+  #elif TEMP_SENSOR_3 != 0
586
+    #error "TEMP_SENSOR_3 shouldn't be set with only 2 extruders."
587
+  #endif
588
+#elif TEMP_SENSOR_1 != 0 && DISABLED(TEMP_SENSOR_1_AS_REDUNDANT)
589
+  #error "TEMP_SENSOR_1 shouldn't be set with only 1 extruder."
590
+#elif TEMP_SENSOR_2 != 0
591
+  #error "TEMP_SENSOR_2 shouldn't be set with only 1 extruder."
592
+#elif TEMP_SENSOR_3 != 0
593
+  #error "TEMP_SENSOR_3 shouldn't be set with only 1 extruder."
582 594
 #endif
583 595
 
584 596
 #if ENABLED(TEMP_SENSOR_1_AS_REDUNDANT) && TEMP_SENSOR_1 == 0

+ 1
- 1
Marlin/example_configurations/delta/generic/Configuration.h 查看文件

@@ -239,7 +239,7 @@
239 239
 //#define DUMMY_THERMISTOR_999_VALUE 100
240 240
 // :{ '0': "Not used",'1':"100k / 4.7k - EPCOS",'2':"200k / 4.7k - ATC Semitec 204GT-2",'3':"Mendel-parts / 4.7k",'4':"10k !! do not use for a hotend. Bad resolution at high temp. !!",'5':"100K / 4.7k - ATC Semitec 104GT-2 (Used in ParCan & J-Head)",'6':"100k / 4.7k EPCOS - Not as accurate as Table 1",'7':"100k / 4.7k Honeywell 135-104LAG-J01",'8':"100k / 4.7k 0603 SMD Vishay NTCS0603E3104FXT",'9':"100k / 4.7k GE Sensing AL03006-58.2K-97-G1",'10':"100k / 4.7k RS 198-961",'11':"100k / 4.7k beta 3950 1%",'12':"100k / 4.7k 0603 SMD Vishay NTCS0603E3104FXT (calibrated for Makibox hot bed)",'13':"100k Hisens 3950  1% up to 300°C for hotend 'Simple ONE ' & hotend 'All In ONE'",'20':"PT100 (Ultimainboard V2.x)",'51':"100k / 1k - EPCOS",'52':"200k / 1k - ATC Semitec 204GT-2",'55':"100k / 1k - ATC Semitec 104GT-2 (Used in ParCan & J-Head)",'60':"100k Maker's Tool Works Kapton Bed Thermistor beta=3950",'66':"Dyze Design 4.7M High Temperature thermistor",'70':"the 100K thermistor found in the bq Hephestos 2",'71':"100k / 4.7k Honeywell 135-104LAF-J01",'147':"Pt100 / 4.7k",'1047':"Pt1000 / 4.7k",'110':"Pt100 / 1k (non-standard)",'1010':"Pt1000 / 1k (non standard)",'-3':"Thermocouple + MAX31855 (only for sensor 0)",'-2':"Thermocouple + MAX6675 (only for sensor 0)",'-1':"Thermocouple + AD595",'998':"Dummy 1",'999':"Dummy 2" }
241 241
 #define TEMP_SENSOR_0 -1
242
-#define TEMP_SENSOR_1 -1
242
+#define TEMP_SENSOR_1 0
243 243
 #define TEMP_SENSOR_2 0
244 244
 #define TEMP_SENSOR_3 0
245 245
 #define TEMP_SENSOR_BED 0

正在加载...
取消
保存