Browse Source

Merge branch 'Development' into cleanup_ultralcd

Latest upstream changes
Scott Lahteine 10 years ago
parent
commit
df8c51528f

+ 1
- 1
ArduinoAddons/Arduino_1.5.x/hardware/marlin/avr/boards.txt View File

33
 ########################################
33
 ########################################
34
 sanguino.name=Sanguino
34
 sanguino.name=Sanguino
35
 
35
 
36
-sanguino.upload.tool=ardunio:avrdude
36
+sanguino.upload.tool=arduino:avrdude
37
 sanguino.upload.protocol=stk500
37
 sanguino.upload.protocol=stk500
38
 sanguino.upload.maximum_size=131072
38
 sanguino.upload.maximum_size=131072
39
 sanguino.upload.speed=57600
39
 sanguino.upload.speed=57600

+ 1
- 0
Marlin/Configuration.h View File

118
 // 1010 is Pt1000 with 1k pullup (non standard)
118
 // 1010 is Pt1000 with 1k pullup (non standard)
119
 // 147 is Pt100 with 4k7 pullup
119
 // 147 is Pt100 with 4k7 pullup
120
 // 110 is Pt100 with 1k pullup (non standard)
120
 // 110 is Pt100 with 1k pullup (non standard)
121
+// 999 is a Dummy Table. It will ALWAYS read 25C.. Use it for Testing or Development purposes. NEVER for production machine.
121
 
122
 
122
 #define TEMP_SENSOR_0 -1
123
 #define TEMP_SENSOR_0 -1
123
 #define TEMP_SENSOR_1 -1
124
 #define TEMP_SENSOR_1 -1

+ 10
- 0
Marlin/thermistortables.h View File

1095
 };
1095
 };
1096
 #endif
1096
 #endif
1097
 
1097
 
1098
+#if (THERMISTORHEATER_0 == 999) || (THERMISTORHEATER_1 == 999) || (THERMISTORHEATER_2 == 999) || (THERMISTORHEATER_3 == 999) || (THERMISTORBED == 999) //User defined table
1099
+// Dummy Thermistor table.. It will ALWAYS read 25C.
1100
+const short temptable_999[][2] PROGMEM = {
1101
+   {1*OVERSAMPLENR, 25},
1102
+   {1023*OVERSAMPLENR, 25}
1103
+};
1104
+#endif
1105
+
1106
+
1107
+
1098
 #define _TT_NAME(_N) temptable_ ## _N
1108
 #define _TT_NAME(_N) temptable_ ## _N
1099
 #define TT_NAME(_N) _TT_NAME(_N)
1109
 #define TT_NAME(_N) _TT_NAME(_N)
1100
 
1110
 

Loading…
Cancel
Save