Merge Marlin 1.1.8

2019-01-31 12:25:28 +01:00
parent 8aa4ed6945
commit 5893bcbcc0
320 changed files with 34109 additions and 50001 deletions
--- a/Marlin/thermistortable_9.h
+++ b/Marlin/thermistortable_9.h
@@ -20,7 +20,7 @@
 *
 */

-// R25 = 100 kOhm, beta25 = 3960 K, 4.7 kOhm pull-up, GE Sensing AL03006-58.2K-97-G1
+// 100k GE Sensing AL03006-58.2K-97-G1 (4.7k pullup)
 const short temptable_9[][2] PROGMEM = {
  { OV(   1), 936 },
  { OV(  36), 300 },