Merge pull request #54 from simonepri/master

Update 4.1.4 dev

Documentation/Features.md

@@ -45,6 +45,8 @@
 *   Firmware test
 *   Support for a filament diameter sensor, which adjusts extrusion volume
 *   Support for a hall effect sensor for calucalte Wh. Example sensor ACS712 20A range Current Sensor Module. http://i.ebayimg.com/images/i/310506962976-0-1/s-l1000.jpg
+*   Anti extruder idle oozing system
+*   Statistics save on SD
 
 The default baudrate is 250000. This baudrate has less jitter and hence errors than the usual 115200 baud, but is less supported by drivers and host-environments.
 

Documentation/changelog.md

+### Version 4.1.4
+* Improved firmare test dialog.
+* Bugfix for SDCONFIG routine. Now the configuration file will be readed and created only on the root of the SD.
+* Improved "Thermal Runaway Protection" now the system will be halted also if the thermistor is missing before the temperature is reached as suggested in Issue #35.
+* Improved "Extruder Idle Oozing Prevention" by adding a more efficient way to detect planned movements. Now this feature seems stable and can be used by anyone.
+* Bugfix for sdinit.
+* Removed tab character from the code.
+* Removed some unuseful spacing from the code.
+
 ### Version 4.1.3
 * Improved support for Delta, SCARA, COREXY & COREXZ kinematics.
 * Improved stepper timer for high velocity driver and not.
 * Add calibrate surface width DELTA.
 * Improved serial comunication width most popular Host.
 * Add Acceleration retraction for extruder.
-* Add EJerk for extruder
+* Add EJerk for extruder.
 * Remove limit for virtual extruder to 4. Now width MKR4 or NPr2 is possible have infinite extruder...
-* Add M92 T* E (Set step per unit for any extruder)
-* Add M203 T* E (Set max feedrate for any extruder)
-* Add M204 T* R (Set acc retraction for any extruder)
-* Add M205 T* E (Set E Jerk for any extruder)
-* Add Slot for G60 & G61
+* Add M92 T* E (Set step per unit for any extruder).
+* Add M203 T* E (Set max feedrate for any extruder).
+* Add M204 T* R (Set acc retraction for any extruder).
+* Add M205 T* E (Set E Jerk for any extruder).
+* Add Slot for G60 & G61.
 * G60 Save current position coordinates (all axes, for active extruder).	S<SLOT> - specifies memory slot # (0-based) to save into (default 0).
 * G61 Apply/restore saved coordinates to the active extruder. X Y Z E - Value to add at stored coordinates. F<speed> - Set Feedrate. S<SLOT> - specifies memory slot # (0-based) to save into (default 0).
 
 ### Version 4.1.2
-* Serial message function standardized for a better code style
-* Auto-Create configuration file if not exist
-* FIX for sdcard crash problem during configuration file reading
-* FIX for some undefined SCARA defines
+* Serial message function standardized for a better code style.
+* Auto-Create configuration file if not exist.
+* FIX for sdcard crash problem during configuration file reading.
+* FIX for some undefined SCARA defines.
 
 ### Version 4.1.1
-* Add Power (Watt) Sensor
-* Add Anti OOZING
-* Add Power Consumation and Power On Time
+* Added Power (Watt) Sensor.
+* Added Anti OOZING.
+* Add Power Consumation and Power On Time.
 * Configurations stored in the SD are updated in real-time (every SD_CFG_SECONDS seconds) also if you remove-insert the sd or you start your printer without the SD card.
 * Reduced code size, maybe a lot depending on your configuration.
 * Improved support for Delta, SCARA, and COREXY kinematics.
@@ -45,4 +54,4 @@
 * Moved GCode handling code into individual functions per-code.
 
 ### Version 4.1.0
-* Initial release
+* Initial release.

MarlinKimbra/Configuration.h

@@ -28,7 +28,7 @@
 // User-specified version info of this build to display in [Pronterface, etc] terminal window during
 // startup. Implementation of an idea by Prof Braino to inform user that any changes made to this
 // build by the user have been successfully uploaded into firmware.
-#define BUILD_VERSION "4.1.3 dev"
+#define BUILD_VERSION "4.1.4 dev"
 #define STRING_DISTRIBUTION_DATE __DATE__ " " __TIME__    // build date and time
 #define STRING_CONFIG_H_AUTHOR "(none, default config)"   // Who made the changes.
 #define STRING_SPLASH_LINE1 "v" BUILD_VERSION             // will be shown during bootup in line 1

MarlinKimbra/Configuration_adv.h

@@ -65,17 +65,18 @@
 //#define SHOW_TEMP_ADC_VALUES
 
 /**
- * extruder idle oozing prevention
- * if the extruder motor is idle for more than SECONDS, and the temperature over MINTEMP,
+ * Extruder Idle Oozing Prevention
+ * If the extruder motor is idle for more than SECONDS, and the temperature is over IDLE_OOZING_MINTEMP,
  * some filament is retracted. The filament retracted is re-added before the next extrusion
- * or when the target temperature is less than EXTRUDE_MINTEMP and the actual temperature
- * is greater than IDLE_OOZING_MINTEMP and less than IDLE_OOZING_FEEDRATE
+ * or when the target temperature is less than IDLE_OOZING_MINTEMP and the actual temperature
+ * is greater than IDLE_OOZING_MINTEMP.
+ * PS: Always remember to set your extruder target temperature to 0°C before shoudown the printer if you enable this feature.
  */
 //#define IDLE_OOZING_PREVENT
 #define IDLE_OOZING_MINTEMP           EXTRUDE_MINTEMP + 5
 #define IDLE_OOZING_MAXTEMP           IDLE_OOZING_MINTEMP + 5
-#define IDLE_OOZING_FEEDRATE          45    //default feedrate for retracting (mm/s)
-#define IDLE_OOZING_SECONDS           10
+#define IDLE_OOZING_FEEDRATE          50    //default feedrate for retracting (mm/s)
+#define IDLE_OOZING_SECONDS           5
 #define IDLE_OOZING_LENGTH            15    //default retract length (positive mm)
 #define IDLE_OOZING_RECOVER_LENGTH     0    //default additional recover length (mm, added to retract length when recovering)
 #define IDLE_OOZING_RECOVER_FEEDRATE  50    //default feedrate for recovering from retraction (mm/s)

MarlinKimbra/Marlin.h

@@ -293,7 +293,8 @@ extern int fanSpeed;
 #endif
 
 #if ENABLED(IDLE_OOZING_PREVENT)
-  extern bool idleoozing_enabled;
+  extern bool IDLE_OOZING_enabled;
+  extern void IDLE_OOZING_retract(bool retracting);
 #endif
 
 #if ENABLED(FWRETRACT)

MarlinKimbra/Marlin_main.cpp

@@ -443,13 +443,9 @@ unsigned long printer_usage_seconds;
   bool filament_changing = false;
 #endif
 
-#if ENABLED(IDLE_OOZING_PREVENT) || ENABLED(EXTRUDER_RUNOUT_PREVENT)
-  unsigned long axis_last_activity = 0;
-  bool axis_is_moving = false;
-#endif
-
 #if ENABLED(IDLE_OOZING_PREVENT)
-  bool idleoozing_enabled = true;
+  unsigned long axis_last_activity = 0;
+  bool IDLE_OOZING_enabled = true;
   bool IDLE_OOZING_retracted[EXTRUDERS] = ARRAY_BY_EXTRUDERS(false);
 #endif
 
@@ -740,7 +736,7 @@ void setup() {
   ECHO_SMV(DB, MSG_FREE_MEMORY, freeMemory());
   ECHO_EMV(MSG_PLANNER_BUFFER_BYTES, (int)sizeof(block_t)*BLOCK_BUFFER_SIZE);
 
-  #ifdef SDSUPPORT
+  #if ENABLED(SDSUPPORT)
     for (int8_t i = 0; i < BUFSIZE; i++) fromsd[i] = false;
   #endif
 
@@ -810,13 +806,13 @@ void setup() {
 void loop() {
   if (commands_in_queue < BUFSIZE - 1) get_command();
 
-  #ifdef SDSUPPORT
+  #if ENABLED(SDSUPPORT)
     card.checkautostart(false);
   #endif
 
   if (commands_in_queue) {
 
-    #ifdef SDSUPPORT
+    #if ENABLED(SDSUPPORT)
 
       if (card.saving) {
         char *command = command_queue[cmd_queue_index_r];
@@ -904,7 +900,7 @@ void get_command() {
       command[serial_count] = 0; // terminate string
 
       // this item in the queue is not from sd
-      #ifdef SDSUPPORT
+      #if ENABLED(SDSUPPORT)
         fromsd[cmd_queue_index_w] = false;
       #endif
 
@@ -990,7 +986,7 @@ void get_command() {
     }
   }
 
-  #ifdef SDSUPPORT
+  #if ENABLED(SDSUPPORT)
 
     if (!card.sdprinting || serial_count) return;
 
@@ -2537,27 +2533,29 @@ static void clean_up_after_endstop_move() {
 
 #endif //DELTA
 
-#ifdef IDLE_OOZING_PREVENT
+#if ENABLED(IDLE_OOZING_PREVENT)
   void IDLE_OOZING_retract(bool retracting) {  
     if (retracting && !IDLE_OOZING_retracted[active_extruder]) {
+      float oldFeedrate = feedrate;
       set_destination_to_current();
-  	  current_position[E_AXIS]+=IDLE_OOZING_LENGTH/volumetric_multiplier[active_extruder];
+      current_position[E_AXIS] += IDLE_OOZING_LENGTH / volumetric_multiplier[active_extruder];
+      feedrate = IDLE_OOZING_FEEDRATE * 60;
       plan_set_e_position(current_position[E_AXIS]);
-  	  float oldFeedrate = feedrate;
-  	  feedrate=IDLE_OOZING_FEEDRATE*60;
-  	  IDLE_OOZING_retracted[active_extruder]=true;
       prepare_move();
       feedrate = oldFeedrate;
+      IDLE_OOZING_retracted[active_extruder] = true;
+      //ECHO_EM("-");
     }
     else if (!retracting && IDLE_OOZING_retracted[active_extruder]) {
+      float oldFeedrate = feedrate;
       set_destination_to_current();
-  	  current_position[E_AXIS]-=(IDLE_OOZING_LENGTH+IDLE_OOZING_RECOVER_LENGTH)/volumetric_multiplier[active_extruder];
+      current_position[E_AXIS] -= (IDLE_OOZING_LENGTH+IDLE_OOZING_RECOVER_LENGTH) / volumetric_multiplier[active_extruder];
+      feedrate = IDLE_OOZING_RECOVER_FEEDRATE * 60;
       plan_set_e_position(current_position[E_AXIS]);
-  	  float oldFeedrate = feedrate;
-  	  feedrate=IDLE_OOZING_RECOVER_FEEDRATE * 60;
-  	  IDLE_OOZING_retracted[active_extruder] = false;
       prepare_move();
       feedrate = oldFeedrate;
+      IDLE_OOZING_retracted[active_extruder] = false;
+      //ECHO_EM("+");
     }
   }
 #endif
@@ -2740,12 +2738,17 @@ inline void wait_bed() {
  *  - Set the feedrate, if included
  */
 void gcode_get_destination() {
+  #if ENABLED(IDLE_OOZING_PREVENT)
+    if(code_seen(axis_codes[E_AXIS])) IDLE_OOZING_retract(false);
+  #endif 
   for (int i = 0; i < NUM_AXIS; i++) {
-    if (code_seen(axis_codes[i]))
+    if (code_seen(axis_codes[i])) {
       destination[i] = code_value() + (axis_relative_modes[i] || relative_mode ? current_position[i] : 0);
-    else
+    }
+    else {
       destination[i] = current_position[i];
     }
+  }
   if (code_seen('F')) {
     float next_feedrate = code_value();
     if (next_feedrate > 0.0) feedrate = next_feedrate;
@@ -2762,11 +2765,6 @@ void unknown_command_error() {
  */
 inline void gcode_G0_G1() {
   if (IsRunning()) {
-
-    #ifdef IDLE_OOZING_PREVENT
-      IDLE_OOZING_retract(false);
-    #endif
-
     gcode_get_destination(); // For X Y Z E F
 
     #ifdef FWRETRACT
@@ -4018,7 +4016,7 @@ inline void gcode_M17() {
   enable_all_steppers();
 }
 
-#ifdef SDSUPPORT
+#if ENABLED(SDSUPPORT)
 
   /**
    * M20: List SD card to serial output
@@ -4123,7 +4121,7 @@ inline void gcode_M31() {
   autotempShutdown();
 }
 
-#ifdef SDSUPPORT
+#if ENABLED(SDSUPPORT)
 
   /**
    * M32: Select file and start SD Print
@@ -6489,7 +6487,7 @@ void process_next_command() {
       case 17: //M17 - Enable/Power all stepper motors
         gcode_M17(); break;
 
-      #ifdef SDSUPPORT
+      #if ENABLED(SDSUPPORT)
         case 20: // M20 - list SD card
           gcode_M20(); break;
         case 21: // M21 - init SD card
@@ -6829,7 +6827,7 @@ void FlushSerialRequestResend() {
 
 void ok_to_send() {
   refresh_cmd_timeout();
-  #ifdef SDSUPPORT
+  #if ENABLED(SDSUPPORT)
     if (fromsd[cmd_queue_index_r]) return;
   #endif
   ECHO_S(OK);
@@ -7027,11 +7025,6 @@ void prepare_move() {
     if (!prepare_move_cartesian()) return;
   #endif
   
-  #ifdef IDLE_OOZING_PREVENT || EXTRUDER_RUNOUT_PREVENT
-    axis_last_activity = millis();
-    axis_is_moving = false;
-  #endif
-
   set_current_to_destination();
 }
 
@@ -7501,8 +7494,9 @@ void manage_inactivity(bool ignore_stepper_queue/*=false*/) {
     }
   #endif
 
-  #ifdef IDLE_OOZING_PREVENT
-    if (degHotend(active_extruder) > IDLE_OOZING_MINTEMP && !(debugLevel & DEBUG_DRYRUN) && !axis_is_moving && idleoozing_enabled) {
+  #if ENABLED(IDLE_OOZING_PREVENT)
+    if (blocks_queued()) axis_last_activity = millis();
+    if (degHotend(active_extruder) > IDLE_OOZING_MINTEMP && !(debugLevel & DEBUG_DRYRUN) && IDLE_OOZING_enabled) {
       #ifdef FILAMENTCHANGEENABLE
         if (!filament_changing)
       #endif

MarlinKimbra/cardreader.cpp

@@ -26,7 +26,7 @@ CardReader::CardReader() {
     OUT_WRITE(SDPOWER, HIGH);
   #endif //SDPOWER
 
-  next_autostart_ms = millis() + 5000;
+  next_autostart_ms = millis() + SPLASH_SCREEN_DURATION;
 }
 
 char *createFilename(char *buffer, const dir_t &p) { //buffer > 12characters
@@ -222,14 +222,20 @@ void CardReader::initsd() {
   */
 }
 
-void CardReader::setroot() {
+void CardReader::setroot(bool temporary) {
   /*if (!workDir.openRoot(&volume)) {
     ECHO_EM(MSG_SD_WORKDIR_FAIL);
   }*/
+  if(temporary) lastDir = workDir;
   workDir = root;
   curDir = &workDir;
 }
 
+void CardReader::setlast() {
+  workDir = lastDir;
+  curDir = &workDir;
+}
+
 void CardReader::release() {
   sdprinting = false;
   cardOK = false;
@@ -441,7 +447,7 @@ void CardReader::write_command(char *buf) {
 }
 
 void CardReader::checkautostart(bool force) {
-  if (!force && (!autostart_stilltocheck || next_autostart_ms < millis()))
+  if (!force && (!autostart_stilltocheck || next_autostart_ms >= millis()))
     return;
 
   autostart_stilltocheck = false;

MarlinKimbra/cardreader.h

@@ -42,7 +42,8 @@ public:
   void ls();
   void chdir(const char * relpath);
   void updir();
-  void setroot();
+  void setroot(bool temporary = false);
+  void setlast();
 
 
   FORCE_INLINE bool isFileOpen() { return file.isOpen(); }
@@ -57,7 +58,7 @@ public:
   char filename[FILENAME_LENGTH], longFilename[LONG_FILENAME_LENGTH];
   int autostart_index;
 private:
-  SdFile root, *curDir, workDir, workDirParents[MAX_DIR_DEPTH];
+  SdFile root, *curDir, workDir, lastDir, workDirParents[MAX_DIR_DEPTH];
   uint16_t workDirDepth;
   Sd2Card card;
   SdVolume volume;

MarlinKimbra/configuration_store.cpp

@@ -90,7 +90,7 @@
  *
  *  M200  T D             filament_size (x4) (T0..3)
  *
- *  M???  S               idleoozing_enabled
+ *  M???  S               IDLE_OOZING_enabled
  *
  *
  *
@@ -247,7 +247,7 @@ void Config_StoreSettings() {
   }
   
   #if ENABLED(IDLE_OOZING_PREVENT)
-    EEPROM_WRITE_VAR(i, idleoozing_enabled);
+    EEPROM_WRITE_VAR(i, IDLE_OOZING_enabled);
   #endif
 
   char ver2[4] = EEPROM_VERSION;
@@ -384,7 +384,7 @@ void Config_RetrieveSettings() {
     calculate_volumetric_multipliers();
 
     #if ENABLED(IDLE_OOZING_PREVENT)
-      EEPROM_READ_VAR(i, idleoozing_enabled);
+      EEPROM_READ_VAR(i, IDLE_OOZING_enabled);
     #endif
 
     // Call updatePID (similar to when we have processed M301)
@@ -570,7 +570,7 @@ void Config_ResetDefault() {
   calculate_volumetric_multipliers();
 
   #ifdef IDLE_OOZING_PREVENT
-    idleoozing_enabled = true;
+    IDLE_OOZING_enabled = true;
   #endif
 
   ECHO_LM(DB, "Hardcoded Default Settings Loaded");
@@ -819,11 +819,11 @@ void Config_ResetDefault() {
 
   void ConfigSD_PrintSettings(bool forReplay) {
     // Always have this function, even with SD_SETTINGS disabled, the current values will be shown
-    #ifdef POWER_CONSUMPTION
+    #if HAS_POWER_CONSUMPTION_SENSOR
       if (!forReplay) {
         ECHO_LM(DB, "Watt/h consumed:");
       }
-      ECHO_LVM(OK, power_consumption_hour," W/h");
+      ECHO_LVM(OK, power_consumption_hour," Wh");
     #endif
     if (!forReplay) {
       ECHO_LM(DB, "Power on time:");
@@ -843,7 +843,7 @@ void Config_ResetDefault() {
  *
  */
 void ConfigSD_ResetDefault() {
-  #ifdef POWER_CONSUMPTION
+  #if HAS_POWER_CONSUMPTION_SENSOR
    power_consumption_hour = 0;
   #endif
   printer_usage_seconds  = 0;
@@ -854,9 +854,10 @@ void ConfigSD_ResetDefault() {
 
   void ConfigSD_StoreSettings() {
     if(!IS_SD_INSERTED || card.isFileOpen() || card.sdprinting) return;
+    card.setroot(true);
     card.openFile(CFG_SD_FILE, false, true, false);
     char buff[CFG_SD_MAX_VALUE_LEN];
-    #ifdef POWER_CONSUMPTION
+    #if HAS_POWER_CONSUMPTION_SENSOR
       ltoa(power_consumption_hour,buff,10);
       card.unparseKeyLine(cfgSD_KEY[SD_CFG_PWR], buff);
     #endif
@@ -864,6 +865,7 @@ void ConfigSD_ResetDefault() {
     card.unparseKeyLine(cfgSD_KEY[SD_CFG_TME], buff);
     
     card.closeFile(false);
+    card.setlast();
     config_last_update = millis();
   }
 
@@ -872,7 +874,7 @@ void ConfigSD_ResetDefault() {
     char key[CFG_SD_MAX_KEY_LEN], value[CFG_SD_MAX_VALUE_LEN];
     int k_idx;
     int k_len, v_len;
-    
+    card.setroot(true);
     card.openFile(CFG_SD_FILE, true, true, false);
     while(true) {
       k_len = CFG_SD_MAX_KEY_LEN;
@@ -882,7 +884,7 @@ void ConfigSD_ResetDefault() {
       k_idx = ConfigSD_KeyIndex(key);
       if(k_idx == -1) continue;    //unknow key ignore it
       switch(k_idx) {
-        #ifdef POWER_CONSUMPTION
+        #if HAS_POWER_CONSUMPTION_SENSOR
         case SD_CFG_PWR: {
           if(addValue) power_consumption_hour += (unsigned long)atol(value);
           else power_consumption_hour = (unsigned long)atol(value);
@@ -897,6 +899,7 @@ void ConfigSD_ResetDefault() {
       }
     }
     card.closeFile(false);
+    card.setlast();
     config_readed = true;
   }
 

MarlinKimbra/configuration_store.h

@@ -24,14 +24,14 @@ void ConfigSD_ResetDefault();
 
 #if ENABLED(SDSUPPORT) && ENABLED(SD_SETTINGS)
   static const char *cfgSD_KEY[] = { //Keep this in lexicographical order for better search performance(O(Nlog2(N)) insted of O(N*N)) (if you don't keep this sorted, the algorithm for find the key index won't work, keep attention.)
-    #ifdef POWER_CONSUMPTION
+    #if HAS_POWER_CONSUMPTION_SENSOR
       "PWR",
     #endif
     "TME",
   };
 
   enum cfgSD_ENUM {  //This need to be in the same order as cfgSD_KEY
-    #ifdef POWER_CONSUMPTION
+    #if HAS_POWER_CONSUMPTION_SENSOR
       SD_CFG_PWR,
     #endif
     SD_CFG_TME,

MarlinKimbra/dogm_lcd_implementation.h

@@ -309,7 +309,7 @@ static void lcd_implementation_status_screen() {
         }
         else {
           lcd_print(itostr4(power_consumption_hour-startpower));
-          lcd_print('Wh');
+          lcd_print("Wh");
         }
       #else
         uint16_t time = (millis() - print_job_start_ms) / 60000;

MarlinKimbra/firmware_test.h

@@ -35,9 +35,22 @@ void FirmwareTest()
       }
       else
       {
-        ECHO_EM("X ENDSTOP ERROR");
-        ECHO_V(MSG_FWTEST_INVERT);
-        ECHO_EM("#define X_MIN_ENDSTOP_INVERTING");
+        ECHO_M("X ENDSTOP ");
+        ECHO_EM(MSG_FWTEST_ERROR);
+        ECHO_M(MSG_FWTEST_INVERT);
+        ECHO_M("#define X_MIN_ENDSTOP_LOGIC ");
+        ECHO_M(MSG_FWTEST_INTO);
+        #if ENABLED(CARTESIAN)
+          ECHO_EM("Configuration_Cartesian.h");
+        #elif ENABLED(COREXY)
+          ECHO_EM("Configuration_Core.h");
+        #elif ENABLED(COREXZ)
+          ECHO_EM("Configuration_Core.h");
+        #elif ENABLED(DELTA)
+          ECHO_EM("Configuration_Delta.h");
+        #elif ENABLED(SCARA)
+          ECHO_EM("Configuration_Scara.h");
+        #endif
         return;
       }
       ECHO_V(MSG_FWTEST_PRESS);
@@ -64,9 +77,22 @@ void FirmwareTest()
       }
       else
       {
-        ECHO_EM("X ENDSTOP ERROR");
-        ECHO_V(MSG_FWTEST_INVERT);
-        ECHO_EM("#define X_MAX_ENDSTOP_INVERTING");
+        ECHO_M("X ENDSTOP ");
+        ECHO_EM(MSG_FWTEST_ERROR);
+        ECHO_M(MSG_FWTEST_INVERT);
+        ECHO_M("#define X_MAX_ENDSTOP_LOGIC ");
+        ECHO_M(MSG_FWTEST_INTO);
+        #if ENABLED(CARTESIAN)
+          ECHO_EM("Configuration_Cartesian.h");
+        #elif ENABLED(COREXY)
+          ECHO_EM("Configuration_Core.h");
+        #elif ENABLED(COREXZ)
+          ECHO_EM("Configuration_Core.h");
+        #elif ENABLED(DELTA)
+          ECHO_EM("Configuration_Delta.h");
+        #elif ENABLED(SCARA)
+          ECHO_EM("Configuration_Scara.h");
+        #endif
         return;
       }
       ECHO_V(MSG_FWTEST_PRESS);
@@ -87,10 +113,14 @@ void FirmwareTest()
         return;
       }
     #elif X_HOME_DIR == -1
-      ECHO_EM("ERROR!!! X_MIN_PIN not defined");
+      ECHO_M(MSG_FWTEST_ERROR);
+      ECHO_M("!!! X_MIN_PIN ");
+      ECHO_EM(MSG_FWTEST_NDEF);
       return;
     #elif X_HOME_DIR == 1
-      ECHO_EM("ERROR!!! X_MAX_PIN not defined");
+      ECHO_M(MSG_FWTEST_ERROR);
+      ECHO_M("!!! X_MAX_PIN ");
+      ECHO_EM(MSG_FWTEST_NDEF);
       return;
     #endif
 
@@ -103,9 +133,22 @@ void FirmwareTest()
       }
       else
       {
-        ECHO_EM("Y ENDSTOP ERROR");
-        ECHO_V(MSG_FWTEST_INVERT);
-        ECHO_EM("#define Y_MIN_ENDSTOP_INVERTING");
+        ECHO_M("Y ENDSTOP ");
+        ECHO_EM(MSG_FWTEST_ERROR);
+        ECHO_M(MSG_FWTEST_INVERT);
+        ECHO_M("#define Y_MIN_ENDSTOP_LOGIC ");
+        ECHO_M(MSG_FWTEST_INTO);
+        #if ENABLED(CARTESIAN)
+          ECHO_EM("Configuration_Cartesian.h");
+        #elif ENABLED(COREXY)
+          ECHO_EM("Configuration_Core.h");
+        #elif ENABLED(COREXZ)
+          ECHO_EM("Configuration_Core.h");
+        #elif ENABLED(DELTA)
+          ECHO_EM("Configuration_Delta.h");
+        #elif ENABLED(SCARA)
+          ECHO_EM("Configuration_Scara.h");
+        #endif
         return;
       }
       ECHO_V(MSG_FWTEST_PRESS);
@@ -132,9 +175,22 @@ void FirmwareTest()
       }
       else
       {
-        ECHO_EM("Y ENDSTOP ERROR");
-        ECHO_V(MSG_FWTEST_INVERT);
-        ECHO_EM("#define Y_MAX_ENDSTOP_INVERTING");
+        ECHO_M("Y ENDSTOP ");
+        ECHO_EM(MSG_FWTEST_ERROR);
+        ECHO_M(MSG_FWTEST_INVERT);
+        ECHO_M("#define Y_MAX_ENDSTOP_LOGIC ");
+        ECHO_M(MSG_FWTEST_INTO);
+        #if ENABLED(CARTESIAN)
+          ECHO_EM("Configuration_Cartesian.h");
+        #elif ENABLED(COREXY)
+          ECHO_EM("Configuration_Core.h");
+        #elif ENABLED(COREXZ)
+          ECHO_EM("Configuration_Core.h");
+        #elif ENABLED(DELTA)
+          ECHO_EM("Configuration_Delta.h");
+        #elif ENABLED(SCARA)
+          ECHO_EM("Configuration_Scara.h");
+        #endif
         return;
       }
       ECHO_V(MSG_FWTEST_PRESS);
@@ -155,10 +211,14 @@ void FirmwareTest()
         return;
       }
     #elif Y_HOME_DIR == -1
-      ECHO_EM("ERROR!!! Y_MIN_PIN not defined");
+      ECHO_M(MSG_FWTEST_ERROR);
+      ECHO_M("!!! Y_MIN_PIN ");
+      ECHO_EM(MSG_FWTEST_NDEF);
       return;
     #elif Y_HOME_DIR == 1
-      ECHO_EM("ERROR!!! Y_MAX_PIN not defined");
+      ECHO_M(MSG_FWTEST_ERROR);
+      ECHO_M("!!! Y_MAX_PIN ");
+      ECHO_EM(MSG_FWTEST_NDEF);
       return;
     #endif
 
@@ -171,9 +231,22 @@ void FirmwareTest()
       }
       else
       {
-        ECHO_EM("Z ENDSTOP ERROR");
-        ECHO_V(MSG_FWTEST_INVERT);
-        ECHO_EM("#define Z_MIN_ENDSTOP_INVERTING");
+        ECHO_M("Z ENDSTOP ");
+        ECHO_EM(MSG_FWTEST_ERROR);
+        ECHO_M(MSG_FWTEST_INVERT);
+        ECHO_M("#define Z_MIN_ENDSTOP_LOGIC ");
+        ECHO_M(MSG_FWTEST_INTO);
+        #if ENABLED(CARTESIAN)
+          ECHO_EM("Configuration_Cartesian.h");
+        #elif ENABLED(COREXY)
+          ECHO_EM("Configuration_Core.h");
+        #elif ENABLED(COREXZ)
+          ECHO_EM("Configuration_Core.h");
+        #elif ENABLED(DELTA)
+          ECHO_EM("Configuration_Delta.h");
+        #elif ENABLED(SCARA)
+          ECHO_EM("Configuration_Scara.h");
+        #endif
         return;
       }
       ECHO_V(MSG_FWTEST_PRESS);
@@ -200,9 +273,22 @@ void FirmwareTest()
       }
       else
       {
-        ECHO_EM("Z ENDSTOP ERROR");
-        ECHO_V(MSG_FWTEST_INVERT);
-        ECHO_EM("#define Z_MAX_ENDSTOP_INVERTING");
+        ECHO_M("Z ENDSTOP ");
+        ECHO_EM(MSG_FWTEST_ERROR);
+        ECHO_M(MSG_FWTEST_INVERT);
+        ECHO_M("#define Z_MAX_ENDSTOP_LOGIC ");
+        ECHO_M(MSG_FWTEST_INTO);
+        #if ENABLED(CARTESIAN)
+          ECHO_EM("Configuration_Cartesian.h");
+        #elif ENABLED(COREXY)
+          ECHO_EM("Configuration_Core.h");
+        #elif ENABLED(COREXZ)
+          ECHO_EM("Configuration_Core.h");
+        #elif ENABLED(DELTA)
+          ECHO_EM("Configuration_Delta.h");
+        #elif ENABLED(SCARA)
+          ECHO_EM("Configuration_Scara.h");
+        #endif
         return;
       }
       ECHO_V(MSG_FWTEST_PRESS);
@@ -223,14 +309,19 @@ void FirmwareTest()
         return;
       }
     #elif Z_HOME_DIR == -1
-      ECHO_EM("ERROR!!! Z_MIN_PIN not defined");
+      ECHO_M(MSG_FWTEST_ERROR);
+      ECHO_M("!!! Z_MIN_PIN ");
+      ECHO_EM(MSG_FWTEST_NDEF);
       return;
     #elif Z_HOME_DIR == 1
-      ECHO_EM("ERROR!!! Z_MAX_PIN not defined");
+      ECHO_M(MSG_FWTEST_ERROR);
+      ECHO_M("!!! Z_MAX_PIN ");
+      ECHO_EM(MSG_FWTEST_NDEF);
       return;
     #endif
 
-    ECHO_EM("ENDSTOP OK");
+    ECHO_EM("ENDSTOP ");
+    ECHO_M(MSG_FWTEST_OK);
     ECHO_EM(" ");
   }
 
@@ -265,12 +356,25 @@ void FirmwareTest()
     serial_answer = MYSERIAL.read();
   }
   if(serial_answer=='y' || serial_answer=='Y'){
-    ECHO_EM("MOTOR X OK");
+    ECHO_EM("MOTOR X ");
+    ECHO_M(MSG_FWTEST_OK);
   }
   else
   {
-    ECHO_V(MSG_FWTEST_INVERT);
-    ECHO_EM("#define INVERT_X_DIR");
+    ECHO_M(MSG_FWTEST_INVERT);
+    ECHO_M("#define INVERT_X_DIR ");
+        ECHO_M(MSG_FWTEST_INTO);
+    #if ENABLED(CARTESIAN)
+      ECHO_EM("Configuration_Cartesian.h");
+    #elif ENABLED(COREXY)
+      ECHO_EM("Configuration_Core.h");
+    #elif ENABLED(COREXZ)
+      ECHO_EM("Configuration_Core.h");
+    #elif ENABLED(DELTA)
+      ECHO_EM("Configuration_Delta.h");
+    #elif ENABLED(SCARA)
+      ECHO_EM("Configuration_Scara.h");
+    #endif
     return;
   }
   ECHO_EM(" ");
@@ -285,12 +389,25 @@ void FirmwareTest()
     serial_answer = MYSERIAL.read();
   }
   if(serial_answer=='y' || serial_answer=='Y'){
-    ECHO_EM("MOTOR Y OK");
+    ECHO_EM("MOTOR Y ");
+    ECHO_M(MSG_FWTEST_OK);
   }
   else
   {
-    ECHO_V(MSG_FWTEST_INVERT);
-    ECHO_EM("#define INVERT_Y_DIR");
+    ECHO_M(MSG_FWTEST_INVERT);
+    ECHO_M("#define INVERT_Y_DIR ");
+        ECHO_M(MSG_FWTEST_INTO);
+    #if ENABLED(CARTESIAN)
+      ECHO_EM("Configuration_Cartesian.h");
+    #elif ENABLED(COREXY)
+      ECHO_EM("Configuration_Core.h");
+    #elif ENABLED(COREXZ)
+      ECHO_EM("Configuration_Core.h");
+    #elif ENABLED(DELTA)
+      ECHO_EM("Configuration_Delta.h");
+    #elif ENABLED(SCARA)
+      ECHO_EM("Configuration_Scara.h");
+    #endif
     return;
   }
   ECHO_EM(" ");
@@ -305,15 +422,29 @@ void FirmwareTest()
     serial_answer = MYSERIAL.read();
   }
   if(serial_answer=='y' || serial_answer=='Y'){
-    ECHO_EM("MOTOR Z OK");
+    ECHO_EM("MOTOR Z ");
+    ECHO_M(MSG_FWTEST_OK);
   }
   else
   {
-    ECHO_V(MSG_FWTEST_INVERT);
-    ECHO_EM("#define INVERT_Z_DIR");
+    ECHO_M(MSG_FWTEST_INVERT);
+    ECHO_M("#define INVERT_Z_DIR ");
+        ECHO_M(MSG_FWTEST_INTO);
+    #if ENABLED(CARTESIAN)
+      ECHO_EM("Configuration_Cartesian.h");
+    #elif ENABLED(COREXY)
+      ECHO_EM("Configuration_Core.h");
+    #elif ENABLED(COREXZ)
+      ECHO_EM("Configuration_Core.h");
+    #elif ENABLED(DELTA)
+      ECHO_EM("Configuration_Delta.h");
+    #elif ENABLED(SCARA)
+      ECHO_EM("Configuration_Scara.h");
+    #endif
     return;
   }
-  ECHO_EM("MOTOR OK");
+  ECHO_EM("MOTOR ");
+  ECHO_M(MSG_FWTEST_OK);
   ECHO_EM(" ");
   ECHO_V(MSG_FWTEST_END);
 }

MarlinKimbra/language_an.h

@@ -195,7 +195,7 @@
   #define MSG_FWTEST_YES_NO                 "Put the Y or N command to go next"
   #define MSG_FWTEST_ENDSTOP_ERR            "ENDSTOP ERROR! Check wire and connection"
   #define MSG_FWTEST_PRESS                  "Press and hold the endstop "
-  #define MSG_FWTEST_INVERT                 "Reverse value in "
+  #define MSG_FWTEST_INVERT                 "Reverse value of "
   #define MSG_FWTEST_XAXIS                  "Has the nozzle moved to the right?"
   #define MSG_FWTEST_YAXIS                  "Has the nozzle moved forward?"
   #define MSG_FWTEST_ZAXIS                  "Has the nozzle moved up?"
@@ -205,6 +205,10 @@
   #define MSG_FWTEST_04                     "Start check MOTOR"
   #define MSG_FWTEST_ATTENTION              "ATTENTION! Check that the three axes are more than 5 mm from the endstop!"
   #define MSG_FWTEST_END                    "Finish Test. Disable FIRMWARE_TEST and recompile."
+  #define MSG_FWTEST_INTO                    "into "
+  #define MSG_FWTEST_ERROR                   "ERROR"
+  #define MSG_FWTEST_OK                      "OK"
+  #define MSG_FWTEST_NDEF                    "not defined"
 #endif // FIRMWARE_TEST
 
 #endif // LANGUAGE_AN_H

MarlinKimbra/language_ca.h

@@ -195,7 +195,7 @@
   #define MSG_FWTEST_YES_NO                 "Put the Y or N command to go next"
   #define MSG_FWTEST_ENDSTOP_ERR            "ENDSTOP ERROR! Check wire and connection"
   #define MSG_FWTEST_PRESS                  "Press and hold the endstop "
-  #define MSG_FWTEST_INVERT                 "Reverse value in "
+  #define MSG_FWTEST_INVERT                 "Reverse value of "
   #define MSG_FWTEST_XAXIS                  "Has the nozzle moved to the right?"
   #define MSG_FWTEST_YAXIS                  "Has the nozzle moved forward?"
   #define MSG_FWTEST_ZAXIS                  "Has the nozzle moved up?"
@@ -205,6 +205,10 @@
   #define MSG_FWTEST_04                     "Start check MOTOR"
   #define MSG_FWTEST_ATTENTION              "ATTENTION! Check that the three axes are more than 5 mm from the endstop!"
   #define MSG_FWTEST_END                    "Finish Test. Disable FIRMWARE_TEST and recompile."
+  #define MSG_FWTEST_INTO                    "into "
+  #define MSG_FWTEST_ERROR                   "ERROR"
+  #define MSG_FWTEST_OK                      "OK"
+  #define MSG_FWTEST_NDEF                    "not defined"
 #endif // FIRMWARE_TEST
 
 #endif // LANGUAGE_EN_H

MarlinKimbra/language_de.h

@@ -196,7 +196,7 @@
   #define MSG_FWTEST_YES_NO                 "Put the Y or N command to go next"
   #define MSG_FWTEST_ENDSTOP_ERR            "ENDSTOP ERROR! Check wire and connection"
   #define MSG_FWTEST_PRESS                  "Press and hold the endstop "
-  #define MSG_FWTEST_INVERT                 "Reverse value in "
+  #define MSG_FWTEST_INVERT                 "Reverse value of "
   #define MSG_FWTEST_XAXIS                  "Has the nozzle moved to the right?"
   #define MSG_FWTEST_YAXIS                  "Has the nozzle moved forward?"
   #define MSG_FWTEST_ZAXIS                  "Has the nozzle moved up?"
@@ -206,6 +206,10 @@
   #define MSG_FWTEST_04                     "Start check MOTOR"
   #define MSG_FWTEST_ATTENTION              "ATTENTION! Check that the three axes are more than 5 mm from the endstop!"
   #define MSG_FWTEST_END                    "Finish Test. Disable FIRMWARE_TEST and recompile."
+  #define MSG_FWTEST_INTO                    "into "
+  #define MSG_FWTEST_ERROR                   "ERROR"
+  #define MSG_FWTEST_OK                      "OK"
+  #define MSG_FWTEST_NDEF                    "not defined"
 #endif // FIRMWARE_TEST
 
 #endif // LANGUAGE_DE_H

MarlinKimbra/language_en.h

@@ -200,7 +200,7 @@
   #define MSG_FWTEST_YES_NO                 "Put the Y or N command to go next"
   #define MSG_FWTEST_ENDSTOP_ERR            "ENDSTOP ERROR! Check wire and connection"
   #define MSG_FWTEST_PRESS                  "Press and hold the endstop "
-  #define MSG_FWTEST_INVERT                 "Reverse value in "
+  #define MSG_FWTEST_INVERT                 "Reverse value of "
   #define MSG_FWTEST_XAXIS                  "Has the nozzle moved to the right?"
   #define MSG_FWTEST_YAXIS                  "Has the nozzle moved forward?"
   #define MSG_FWTEST_ZAXIS                  "Has the nozzle moved up?"
@@ -210,6 +210,10 @@
   #define MSG_FWTEST_04                     "Start check MOTOR"
   #define MSG_FWTEST_ATTENTION              "ATTENTION! Check that the three axes are more than 5 mm from the endstop!"
   #define MSG_FWTEST_END                    "Finish Test. Disable FIRMWARE_TEST and recompile."
+  #define MSG_FWTEST_INTO                    "into "
+  #define MSG_FWTEST_ERROR                   "ERROR"
+  #define MSG_FWTEST_OK                      "OK"
+  #define MSG_FWTEST_NDEF                    "not defined"
 #endif // FIRMWARE_TEST
 
 #endif // LANGUAGE_EN_H

MarlinKimbra/language_es.h

@@ -195,7 +195,7 @@
   #define MSG_FWTEST_YES_NO                 "Put the Y or N command to go next"
   #define MSG_FWTEST_ENDSTOP_ERR            "ENDSTOP ERROR! Check wire and connection"
   #define MSG_FWTEST_PRESS                  "Press and hold the endstop "
-  #define MSG_FWTEST_INVERT                 "Reverse value in "
+  #define MSG_FWTEST_INVERT                 "Reverse value of "
   #define MSG_FWTEST_XAXIS                  "Has the nozzle moved to the right?"
   #define MSG_FWTEST_YAXIS                  "Has the nozzle moved forward?"
   #define MSG_FWTEST_ZAXIS                  "Has the nozzle moved up?"
@@ -205,6 +205,10 @@
   #define MSG_FWTEST_04                     "Start check MOTOR"
   #define MSG_FWTEST_ATTENTION              "ATTENTION! Check that the three axes are more than 5 mm from the endstop!"
   #define MSG_FWTEST_END                    "Finish Test. Disable FIRMWARE_TEST and recompile."
+  #define MSG_FWTEST_INTO                    "into "
+  #define MSG_FWTEST_ERROR                   "ERROR"
+  #define MSG_FWTEST_OK                      "OK"
+  #define MSG_FWTEST_NDEF                    "not defined"
 #endif // FIRMWARE_TEST
 
 #endif // LANGUAGE_ES_H

MarlinKimbra/language_eu.h

@@ -64,6 +64,7 @@
 #define MSG_MIN                             " " STR_THERMOMETER " Min"
 #define MSG_MAX                             " " STR_THERMOMETER " Max"
 #define MSG_FACTOR                          " " STR_THERMOMETER " Fact"
+#define MSG_IDLEOOZING                      "Anti oozing"
 #define MSG_AUTOTEMP                        "Auto tenperatura"
 #define MSG_ON                              "On "
 #define MSG_OFF                             "Off"
@@ -169,7 +170,7 @@
   #define MSG_FWTEST_YES_NO                 "Put the Y or N command to go next"
   #define MSG_FWTEST_ENDSTOP_ERR            "ENDSTOP ERROR! Check wire and connection"
   #define MSG_FWTEST_PRESS                  "Press and hold the endstop "
-  #define MSG_FWTEST_INVERT                 "Reverse value in "
+  #define MSG_FWTEST_INVERT                 "Reverse value of "
   #define MSG_FWTEST_XAXIS                  "Has the nozzle moved to the right?"
   #define MSG_FWTEST_YAXIS                  "Has the nozzle moved forward?"
   #define MSG_FWTEST_ZAXIS                  "Has the nozzle moved up?"
@@ -179,6 +180,10 @@
   #define MSG_FWTEST_04                     "Start check MOTOR"
   #define MSG_FWTEST_ATTENTION              "ATTENTION! Check that the three axes are more than 5 mm from the endstop!"
   #define MSG_FWTEST_END                    "Finish Test. Disable FIRMWARE_TEST and recompile."
+  #define MSG_FWTEST_INTO                    "into "
+  #define MSG_FWTEST_ERROR                   "ERROR"
+  #define MSG_FWTEST_OK                      "OK"
+  #define MSG_FWTEST_NDEF                    "not defined"
 #endif // FIRMWARE_TEST
 
 #endif // LANGUAGE_EU_H

MarlinKimbra/language_fi.h

@@ -64,6 +64,7 @@
 #define MSG_MIN                             STR_THERMOMETER " Min"
 #define MSG_MAX                             STR_THERMOMETER " Max"
 #define MSG_FACTOR                          STR_THERMOMETER " Kerr"
+#define MSG_IDLEOOZING                      "Anti oozing"
 #define MSG_AUTOTEMP                        "Autotemp"
 #define MSG_ON                              "On "
 #define MSG_OFF                             "Off"
@@ -169,7 +170,7 @@
   #define MSG_FWTEST_YES_NO                 "Put the Y or N command to go next"
   #define MSG_FWTEST_ENDSTOP_ERR            "ENDSTOP ERROR! Check wire and connection"
   #define MSG_FWTEST_PRESS                  "Press and hold the endstop "
-  #define MSG_FWTEST_INVERT                 "Reverse value in "
+  #define MSG_FWTEST_INVERT                 "Reverse value of "
   #define MSG_FWTEST_XAXIS                  "Has the nozzle moved to the right?"
   #define MSG_FWTEST_YAXIS                  "Has the nozzle moved forward?"
   #define MSG_FWTEST_ZAXIS                  "Has the nozzle moved up?"
@@ -179,6 +180,10 @@
   #define MSG_FWTEST_04                     "Start check MOTOR"
   #define MSG_FWTEST_ATTENTION              "ATTENTION! Check that the three axes are more than 5 mm from the endstop!"
   #define MSG_FWTEST_END                    "Finish Test. Disable FIRMWARE_TEST and recompile."
+  #define MSG_FWTEST_INTO                    "into "
+  #define MSG_FWTEST_ERROR                   "ERROR"
+  #define MSG_FWTEST_OK                      "OK"
+  #define MSG_FWTEST_NDEF                    "not defined"
 #endif // FIRMWARE_TEST
 
 #endif // LANGUAGE_FI_H

MarlinKimbra/language_fr.h

@@ -65,6 +65,7 @@
 #define MSG_MIN                             " " STR_THERMOMETER " Min"
 #define MSG_MAX                             " " STR_THERMOMETER " Max"
 #define MSG_FACTOR                          " " STR_THERMOMETER " Facteur"
+#define MSG_IDLEOOZING                      "Anti oozing"
 #define MSG_AUTOTEMP                        "Temp. Auto."
 #define MSG_ON                              "Marche "
 #define MSG_OFF                             "Arret"
@@ -172,7 +173,7 @@
   #define MSG_FWTEST_YES_NO                 "Put the Y or N command to go next"
   #define MSG_FWTEST_ENDSTOP_ERR            "ENDSTOP ERROR! Check wire and connection"
   #define MSG_FWTEST_PRESS                  "Press and hold the endstop "
-  #define MSG_FWTEST_INVERT                 "Reverse value in "
+  #define MSG_FWTEST_INVERT                 "Reverse value of "
   #define MSG_FWTEST_XAXIS                  "Has the nozzle moved to the right?"
   #define MSG_FWTEST_YAXIS                  "Has the nozzle moved forward?"
   #define MSG_FWTEST_ZAXIS                  "Has the nozzle moved up?"
@@ -182,6 +183,10 @@
   #define MSG_FWTEST_04                     "Start check MOTOR"
   #define MSG_FWTEST_ATTENTION              "ATTENTION! Check that the three axes are more than 5 mm from the endstop!"
   #define MSG_FWTEST_END                    "Finish Test. Disable FIRMWARE_TEST and recompile."
+  #define MSG_FWTEST_INTO                    "into "
+  #define MSG_FWTEST_ERROR                   "ERROR"
+  #define MSG_FWTEST_OK                      "OK"
+  #define MSG_FWTEST_NDEF                    "not defined"
 #endif // FIRMWARE_TEST
 
 #endif // LANGUAGE_FR_H

MarlinKimbra/language_it.h

@@ -196,7 +196,7 @@
   #define MSG_FWTEST_YES_NO                 "Dai il comando Y o N per andare avanti"
   #define MSG_FWTEST_ENDSTOP_ERR            "ENDSTOP ERROR! Controllare cavi e connessioni"
   #define MSG_FWTEST_PRESS                  "Premere e tenere premuto l'endstop "
-  #define MSG_FWTEST_INVERT                 "Invertire valore in "
+  #define MSG_FWTEST_INVERT                 "Invertire valore di "
   #define MSG_FWTEST_XAXIS                  "Il nozzle si e' spostato a destra?"
   #define MSG_FWTEST_YAXIS                  "Il nozzle si e' spostato in avanti?"
   #define MSG_FWTEST_ZAXIS                  "Il nozzle si e' spostato in alto?"
@@ -206,6 +206,10 @@
   #define MSG_FWTEST_04                     "Inizio controllo MOTORI"
   #define MSG_FWTEST_ATTENTION              "ATTENZIONE! Controlla che i tre assi siano a piu' di 5 mm dagli endstop!"
   #define MSG_FWTEST_END                    "Test finito. Disabilitare FIRMWARE_TEST e ricompilare."
+  #define MSG_FWTEST_INTO                    "in "
+  #define MSG_FWTEST_ERROR                   "ERRORE"
+  #define MSG_FWTEST_OK                      "OK"
+  #define MSG_FWTEST_NDEF                    "non definito"
 #endif // FIRMWARE_TEST
 
 #endif // LANGUAGE_IT_H

MarlinKimbra/language_nl.h

@@ -64,6 +64,7 @@
 #define MSG_MIN                             " " STR_THERMOMETER " Min"
 #define MSG_MAX                             " " STR_THERMOMETER " Max"
 #define MSG_FACTOR                          " " STR_THERMOMETER " Fact"
+#define MSG_IDLEOOZING                      "Anti oozing"
 #define MSG_AUTOTEMP                        "Autotemp"
 #define MSG_ON                              "Aan "
 #define MSG_OFF                             "Uit"
@@ -169,7 +170,7 @@
   #define MSG_FWTEST_YES_NO                 "Put the Y or N command to go next"
   #define MSG_FWTEST_ENDSTOP_ERR            "ENDSTOP ERROR! Check wire and connection"
   #define MSG_FWTEST_PRESS                  "Press and hold the endstop "
-  #define MSG_FWTEST_INVERT                 "Reverse value in "
+  #define MSG_FWTEST_INVERT                 "Reverse value of "
   #define MSG_FWTEST_XAXIS                  "Has the nozzle moved to the right?"
   #define MSG_FWTEST_YAXIS                  "Has the nozzle moved forward?"
   #define MSG_FWTEST_ZAXIS                  "Has the nozzle moved up?"
@@ -179,6 +180,10 @@
   #define MSG_FWTEST_04                     "Start check MOTOR"
   #define MSG_FWTEST_ATTENTION              "ATTENTION! Check that the three axes are more than 5 mm from the endstop!"
   #define MSG_FWTEST_END                    "Finish Test. Disable FIRMWARE_TEST and recompile."
+  #define MSG_FWTEST_INTO                    "into "
+  #define MSG_FWTEST_ERROR                   "ERROR"
+  #define MSG_FWTEST_OK                      "OK"
+  #define MSG_FWTEST_NDEF                    "not defined"
 #endif // FIRMWARE_TEST
 
 #endif // LANGUAGE_NL_H

MarlinKimbra/language_pl.h

@@ -64,6 +64,7 @@
 #define MSG_MIN                             " " STR_THERMOMETER " Min"
 #define MSG_MAX                             " " STR_THERMOMETER " Max"
 #define MSG_FACTOR                          " " STR_THERMOMETER " Fact"
+#define MSG_IDLEOOZING                      "Anti oozing"
 #define MSG_AUTOTEMP                        "Auto. temperatura"
 #define MSG_ON                              "Wl. "
 #define MSG_OFF                             "Wyl."
@@ -169,7 +170,7 @@
   #define MSG_FWTEST_YES_NO                 "Put the Y or N command to go next"
   #define MSG_FWTEST_ENDSTOP_ERR            "ENDSTOP ERROR! Check wire and connection"
   #define MSG_FWTEST_PRESS                  "Press and hold the endstop "
-  #define MSG_FWTEST_INVERT                 "Reverse value in "
+  #define MSG_FWTEST_INVERT                 "Reverse value of "
   #define MSG_FWTEST_XAXIS                  "Has the nozzle moved to the right?"
   #define MSG_FWTEST_YAXIS                  "Has the nozzle moved forward?"
   #define MSG_FWTEST_ZAXIS                  "Has the nozzle moved up?"
@@ -179,6 +180,10 @@
   #define MSG_FWTEST_04                     "Start check MOTOR"
   #define MSG_FWTEST_ATTENTION              "ATTENTION! Check that the three axes are more than 5 mm from the endstop!"
   #define MSG_FWTEST_END                    "Finish Test. Disable FIRMWARE_TEST and recompile."
+  #define MSG_FWTEST_INTO                    "into "
+  #define MSG_FWTEST_ERROR                   "ERROR"
+  #define MSG_FWTEST_OK                      "OK"
+  #define MSG_FWTEST_NDEF                    "not defined"
 #endif // FIRMWARE_TEST
 
 #endif // LANGUAGE_PL_H

MarlinKimbra/language_pt-br.h

@@ -178,7 +178,7 @@
   #define MSG_FWTEST_YES_NO                 "Put the Y or N command to go next"
   #define MSG_FWTEST_ENDSTOP_ERR            "ENDSTOP ERROR! Check wire and connection"
   #define MSG_FWTEST_PRESS                  "Press and hold the endstop "
-  #define MSG_FWTEST_INVERT                 "Reverse value in "
+  #define MSG_FWTEST_INVERT                 "Reverse value of "
   #define MSG_FWTEST_XAXIS                  "Has the nozzle moved to the right?"
   #define MSG_FWTEST_YAXIS                  "Has the nozzle moved forward?"
   #define MSG_FWTEST_ZAXIS                  "Has the nozzle moved up?"
@@ -188,6 +188,10 @@
   #define MSG_FWTEST_04                     "Start check MOTOR"
   #define MSG_FWTEST_ATTENTION              "ATTENTION! Check that the three axes are more than 5 mm from the endstop!"
   #define MSG_FWTEST_END                    "Finish Test. Disable FIRMWARE_TEST and recompile."
+  #define MSG_FWTEST_INTO                    "into "
+  #define MSG_FWTEST_ERROR                   "ERROR"
+  #define MSG_FWTEST_OK                      "OK"
+  #define MSG_FWTEST_NDEF                    "not defined"
 #endif // FIRMWARE_TEST
 
 #endif // LANGUAGE_PT_BR_H

MarlinKimbra/language_pt.h

@@ -64,6 +64,7 @@
 #define MSG_MIN                             " " STR_THERMOMETER " Min"
 #define MSG_MAX                             " " STR_THERMOMETER " Max"
 #define MSG_FACTOR                          " " STR_THERMOMETER " Fact"
+#define MSG_IDLEOOZING                      "Anti oozing"
 #define MSG_AUTOTEMP                        "Autotemp"
 #define MSG_ON                              "On "
 #define MSG_OFF                             "Off"
@@ -169,7 +170,7 @@
   #define MSG_FWTEST_YES_NO                 "Put the Y or N command to go next"
   #define MSG_FWTEST_ENDSTOP_ERR            "ENDSTOP ERROR! Check wire and connection"
   #define MSG_FWTEST_PRESS                  "Press and hold the endstop "
-  #define MSG_FWTEST_INVERT                 "Reverse value in "
+  #define MSG_FWTEST_INVERT                 "Reverse value of "
   #define MSG_FWTEST_XAXIS                  "Has the nozzle moved to the right?"
   #define MSG_FWTEST_YAXIS                  "Has the nozzle moved forward?"
   #define MSG_FWTEST_ZAXIS                  "Has the nozzle moved up?"
@@ -179,6 +180,10 @@
   #define MSG_FWTEST_04                     "Start check MOTOR"
   #define MSG_FWTEST_ATTENTION              "ATTENTION! Check that the three axes are more than 5 mm from the endstop!"
   #define MSG_FWTEST_END                    "Finish Test. Disable FIRMWARE_TEST and recompile."
+  #define MSG_FWTEST_INTO                    "into "
+  #define MSG_FWTEST_ERROR                   "ERROR"
+  #define MSG_FWTEST_OK                      "OK"
+  #define MSG_FWTEST_NDEF                    "not defined"
 #endif // FIRMWARE_TEST
 
 #endif // LANGUAGE_PT_H

MarlinKimbra/language_ru.h

@@ -64,6 +64,7 @@
 #define MSG_MIN                             " " STR_THERMOMETER "Минимум"
 #define MSG_MAX                             " " STR_THERMOMETER "Максимум"
 #define MSG_FACTOR                          " " STR_THERMOMETER "Фактор"
+#define MSG_IDLEOOZING                      "Anti oozing"
 #define MSG_AUTOTEMP                        "Autotemp"
 #define MSG_ON                              "Вкл."
 #define MSG_OFF                             "Выкл."
@@ -169,7 +170,7 @@
   #define MSG_FWTEST_YES_NO                 "Put the Y or N command to go next"
   #define MSG_FWTEST_ENDSTOP_ERR            "ENDSTOP ERROR! Check wire and connection"
   #define MSG_FWTEST_PRESS                  "Press and hold the endstop "
-  #define MSG_FWTEST_INVERT                 "Reverse value in "
+  #define MSG_FWTEST_INVERT                 "Reverse value of "
   #define MSG_FWTEST_XAXIS                  "Has the nozzle moved to the right?"
   #define MSG_FWTEST_YAXIS                  "Has the nozzle moved forward?"
   #define MSG_FWTEST_ZAXIS                  "Has the nozzle moved up?"
@@ -179,6 +180,10 @@
   #define MSG_FWTEST_04                     "Start check MOTOR"
   #define MSG_FWTEST_ATTENTION              "ATTENTION! Check that the three axes are more than 5 mm from the endstop!"
   #define MSG_FWTEST_END                    "Finish Test. Disable FIRMWARE_TEST and recompile."
+  #define MSG_FWTEST_INTO                    "into "
+  #define MSG_FWTEST_ERROR                   "ERROR"
+  #define MSG_FWTEST_OK                      "OK"
+  #define MSG_FWTEST_NDEF                    "not defined"
 #endif // FIRMWARE_TEST
 
 #endif // LANGUAGE_RU_H

MarlinKimbra/sanitycheck.h

@@ -318,4 +318,8 @@
     #error SDCARDDETECTINVERTED is now SD_DETECT_INVERTED. Please update your configuration.
   #endif
   
+  #if ENABLED(POWER_CONSUMPTION) && !PIN_EXISTS(POWER_CONSUMPTION)
+    #error You have to set a valid POWER_CONSUMPTION_PIN in pins.h in order to use this feature. 
+  #endif
+
 #endif //SANITYCHECK_H

MarlinKimbra/temperature.cpp

@@ -1052,7 +1052,7 @@ void tp_init() {
 #if ENABLED(THERMAL_PROTECTION_HOTENDS) || ENABLED(THERMAL_PROTECTION_BED)
 
   void thermal_runaway_protection(TRState *state, millis_t *timer, float temperature, float target_temperature, int heater_id, int period_seconds, int hysteresis_degc) {
-
+    static float tr_last_temperature = 0.0;
     static float tr_target_temperature[HOTENDS + 1] = { 0.0 };
     /*
         ECHO_SM(DB, "Thermal Thermal Runaway Running. Heater ID: ");
@@ -1070,33 +1070,51 @@ void tp_init() {
       *state = TRReset;
 
     switch (*state) {
-      case TRReset:
+      case TRReset: {
         *timer = 0;
         *state = TRInactive;
+      }
       // Inactive state waits for a target temperature to be set
-      case TRInactive:
+      case TRInactive: {
         if (target_temperature > 0) {
+          tr_last_temperature = temperature;
           tr_target_temperature[heater_index] = target_temperature;
+          *timer = millis();
           *state = TRFirstHeating;
         }
+      }
       break;
       // When first heating, wait for the temperature to be reached then go to Stable state
-      case TRFirstHeating:
+      // If the heater takes too long to reach the target temperature the sistem will be halt.
+      case TRFirstHeating: {
         if (temperature >= tr_target_temperature[heater_index]) *state = TRStable;
+        else if (temperature == tr_last_temperature) {
+          if (millis() > *timer + period_seconds * 1000UL) {
+            *state = TRRunaway;
+          }
+        }
+        else {
+          *timer = millis();
+        }
+      }
       break;
       // While the temperature is stable watch for a bad temperature
-      case TRStable:
+      case TRStable: {
         // If the temperature is over the target (-hysteresis) restart the timer
-        if (temperature >= tr_target_temperature[heater_index] - hysteresis_degc)
+        if (temperature >= tr_target_temperature[heater_index] - hysteresis_degc) {
           *timer = millis();
+        }
           // If the timer goes too long without a reset, trigger shutdown
-        else if (millis() > *timer + period_seconds * 1000UL)
+        else if (millis() > *timer + period_seconds * 1000UL) {
           *state = TRRunaway;
+        }
+      }
       break;
-      case TRRunaway:
+      case TRRunaway: {
         _temp_error(heater_id, PSTR(MSG_T_THERMAL_RUNAWAY), PSTR(MSG_THERMAL_RUNAWAY));
       }
     }
+  }
 
 #endif // THERMAL_PROTECTION_HOTENDS || THERMAL_PROTECTION_BED
 

MarlinKimbra/thermistortables.h

@@ -9,164 +9,164 @@
 #if (THERMISTORHEATER_0 == 1) || (THERMISTORHEATER_1 == 1)  || (THERMISTORHEATER_2 == 1) || (THERMISTORHEATER_3 == 1) || (THERMISTORBED == 1) //100k bed thermistor
 
 const short temptable_1[][2] PROGMEM = {
-{       23*OVERSAMPLENR ,       300     },
-{       25*OVERSAMPLENR ,       295     },
-{       27*OVERSAMPLENR ,       290     },
-{       28*OVERSAMPLENR ,       285     },
-{       31*OVERSAMPLENR ,       280     },
-{       33*OVERSAMPLENR ,       275     },
-{       35*OVERSAMPLENR ,       270     },
-{       38*OVERSAMPLENR ,       265     },
-{       41*OVERSAMPLENR ,       260     },
-{       44*OVERSAMPLENR ,       255     },
-{       48*OVERSAMPLENR ,       250     },
-{       52*OVERSAMPLENR ,       245     },
-{       56*OVERSAMPLENR ,       240     },
-{       61*OVERSAMPLENR ,       235     },
-{       66*OVERSAMPLENR ,       230     },
-{       71*OVERSAMPLENR ,       225     },
-{       78*OVERSAMPLENR ,       220     },
-{       84*OVERSAMPLENR ,       215     },
-{       92*OVERSAMPLENR ,       210     },
-{       100*OVERSAMPLENR        ,       205     },
-{       109*OVERSAMPLENR        ,       200     },
-{       120*OVERSAMPLENR        ,       195     },
-{       131*OVERSAMPLENR        ,       190     },
-{       143*OVERSAMPLENR        ,       185     },
-{       156*OVERSAMPLENR        ,       180     },
-{       171*OVERSAMPLENR        ,       175     },
-{       187*OVERSAMPLENR        ,       170     },
-{       205*OVERSAMPLENR        ,       165     },
-{       224*OVERSAMPLENR        ,       160     },
-{       245*OVERSAMPLENR        ,       155     },
-{       268*OVERSAMPLENR        ,       150     },
-{       293*OVERSAMPLENR        ,       145     },
-{       320*OVERSAMPLENR        ,       140     },
-{       348*OVERSAMPLENR        ,       135     },
-{       379*OVERSAMPLENR        ,       130     },
-{       411*OVERSAMPLENR        ,       125     },
-{       445*OVERSAMPLENR        ,       120     },
-{       480*OVERSAMPLENR        ,       115     },
-{       516*OVERSAMPLENR        ,       110     },
-{       553*OVERSAMPLENR        ,       105     },
-{       591*OVERSAMPLENR        ,       100     },
-{       628*OVERSAMPLENR        ,       95      },
-{       665*OVERSAMPLENR        ,       90      },
-{       702*OVERSAMPLENR        ,       85      },
-{       737*OVERSAMPLENR        ,       80      },
-{       770*OVERSAMPLENR        ,       75      },
-{       801*OVERSAMPLENR        ,       70      },
-{       830*OVERSAMPLENR        ,       65      },
-{       857*OVERSAMPLENR        ,       60      },
-{       881*OVERSAMPLENR        ,       55      },
-{       903*OVERSAMPLENR        ,       50      },
-{       922*OVERSAMPLENR        ,       45      },
-{       939*OVERSAMPLENR        ,       40      },
-{       954*OVERSAMPLENR        ,       35      },
-{       966*OVERSAMPLENR        ,       30      },
-{       977*OVERSAMPLENR        ,       25      },
-{       985*OVERSAMPLENR        ,       20      },
-{       993*OVERSAMPLENR        ,       15      },
-{       999*OVERSAMPLENR        ,       10      },
-{       1004*OVERSAMPLENR       ,       5       },
-{       1008*OVERSAMPLENR       ,       0       } //safety
+  {23 * OVERSAMPLENR,  300},
+  {25 * OVERSAMPLENR,  295},
+  {27 * OVERSAMPLENR,  290},
+  {28 * OVERSAMPLENR,  285},
+  {31 * OVERSAMPLENR,  280},
+  {33 * OVERSAMPLENR,  275},
+  {35 * OVERSAMPLENR,  270},
+  {38 * OVERSAMPLENR,  265},
+  {41 * OVERSAMPLENR,  260},
+  {44 * OVERSAMPLENR,  255},
+  {48 * OVERSAMPLENR,  250},
+  {52 * OVERSAMPLENR,  245},
+  {56 * OVERSAMPLENR,  240},
+  {61 * OVERSAMPLENR,  235},
+  {66 * OVERSAMPLENR,  230},
+  {71 * OVERSAMPLENR,  225},
+  {78 * OVERSAMPLENR,  220},
+  {84 * OVERSAMPLENR,  215},
+  {92 * OVERSAMPLENR,  210},
+  {100 * OVERSAMPLENR,  205},
+  {109 * OVERSAMPLENR,  200},
+  {120 * OVERSAMPLENR,  195},
+  {131 * OVERSAMPLENR,  190},
+  {143 * OVERSAMPLENR,  185},
+  {156 * OVERSAMPLENR,  180},
+  {171 * OVERSAMPLENR,  175},
+  {187 * OVERSAMPLENR,  170},
+  {205 * OVERSAMPLENR,  165},
+  {224 * OVERSAMPLENR,  160},
+  {245 * OVERSAMPLENR,  155},
+  {268 * OVERSAMPLENR,  150},
+  {293 * OVERSAMPLENR,  145},
+  {320 * OVERSAMPLENR,  140},
+  {348 * OVERSAMPLENR,  135},
+  {379 * OVERSAMPLENR,  130},
+  {411 * OVERSAMPLENR,  125},
+  {445 * OVERSAMPLENR,  120},
+  {480 * OVERSAMPLENR,  115},
+  {516 * OVERSAMPLENR,  110},
+  {553 * OVERSAMPLENR,  105},
+  {591 * OVERSAMPLENR,  100},
+  {628 * OVERSAMPLENR,  95},
+  {665 * OVERSAMPLENR,  90},
+  {702 * OVERSAMPLENR,  85},
+  {737 * OVERSAMPLENR,  80},
+  {770 * OVERSAMPLENR,  75},
+  {801 * OVERSAMPLENR,  70},
+  {830 * OVERSAMPLENR,  65},
+  {857 * OVERSAMPLENR,  60},
+  {881 * OVERSAMPLENR,  55},
+  {903 * OVERSAMPLENR,  50},
+  {922 * OVERSAMPLENR,  45},
+  {939 * OVERSAMPLENR,  40},
+  {954 * OVERSAMPLENR,  35},
+  {966 * OVERSAMPLENR,  30},
+  {977 * OVERSAMPLENR,  25},
+  {985 * OVERSAMPLENR,  20},
+  {993 * OVERSAMPLENR,  15},
+  {999 * OVERSAMPLENR,  10},
+  {1004 * OVERSAMPLENR,  5},
+  {1008 * OVERSAMPLENR,  0} //safety
 };
 #endif
 #if (THERMISTORHEATER_0 == 2) || (THERMISTORHEATER_1 == 2) || (THERMISTORHEATER_2 == 2) || (THERMISTORHEATER_3 == 2) || (THERMISTORBED == 2) //200k bed thermistor
 const short temptable_2[][2] PROGMEM = {
 //200k ATC Semitec 204GT-2
 //Verified by linagee. Source: http://shop.arcol.hu/static/datasheets/thermistors.pdf
-// Calculated using 4.7kohm pullup, voltage divider math, and manufacturer provided temp/resistance
-   {1*OVERSAMPLENR, 848},
-   {30*OVERSAMPLENR, 300}, //top rating 300C
-   {34*OVERSAMPLENR, 290},
-   {39*OVERSAMPLENR, 280},
-   {46*OVERSAMPLENR, 270},
-   {53*OVERSAMPLENR, 260},
-   {63*OVERSAMPLENR, 250},
-   {74*OVERSAMPLENR, 240},
-   {87*OVERSAMPLENR, 230},
-   {104*OVERSAMPLENR, 220},
-   {124*OVERSAMPLENR, 210},
-   {148*OVERSAMPLENR, 200},
-   {176*OVERSAMPLENR, 190},
-   {211*OVERSAMPLENR, 180},
-   {252*OVERSAMPLENR, 170},
-   {301*OVERSAMPLENR, 160},
-   {357*OVERSAMPLENR, 150},
-   {420*OVERSAMPLENR, 140},
-   {489*OVERSAMPLENR, 130},
-   {562*OVERSAMPLENR, 120},
-   {636*OVERSAMPLENR, 110},
-   {708*OVERSAMPLENR, 100},
-   {775*OVERSAMPLENR, 90},
-   {835*OVERSAMPLENR, 80},
-   {884*OVERSAMPLENR, 70},
-   {924*OVERSAMPLENR, 60},
-   {955*OVERSAMPLENR, 50},
-   {977*OVERSAMPLENR, 40},
-   {993*OVERSAMPLENR, 30},
-   {1004*OVERSAMPLENR, 20},
-   {1012*OVERSAMPLENR, 10},
-   {1016*OVERSAMPLENR, 0},
+// Calculated using 4.7kohm pullup,voltage divider math,and manufacturer provided temp/resistance
+  {1 * OVERSAMPLENR,  848},
+  {30 * OVERSAMPLENR,  300},//top rating 300C
+  {34 * OVERSAMPLENR,  290},
+  {39 * OVERSAMPLENR,  280},
+  {46 * OVERSAMPLENR,  270},
+  {53 * OVERSAMPLENR,  260},
+  {63 * OVERSAMPLENR,  250},
+  {74 * OVERSAMPLENR,  240},
+  {87 * OVERSAMPLENR,  230},
+  {104 * OVERSAMPLENR,  220},
+  {124 * OVERSAMPLENR,  210},
+  {148 * OVERSAMPLENR,  200},
+  {176 * OVERSAMPLENR,  190},
+  {211 * OVERSAMPLENR,  180},
+  {252 * OVERSAMPLENR,  170},
+  {301 * OVERSAMPLENR,  160},
+  {357 * OVERSAMPLENR,  150},
+  {420 * OVERSAMPLENR,  140},
+  {489 * OVERSAMPLENR,  130},
+  {562 * OVERSAMPLENR,  120},
+  {636 * OVERSAMPLENR,  110},
+  {708 * OVERSAMPLENR,  100},
+  {775 * OVERSAMPLENR,  90},
+  {835 * OVERSAMPLENR,  80},
+  {884 * OVERSAMPLENR,  70},
+  {924 * OVERSAMPLENR,  60},
+  {955 * OVERSAMPLENR,  50},
+  {977 * OVERSAMPLENR,  40},
+  {993 * OVERSAMPLENR,  30},
+  {1004 * OVERSAMPLENR,  20},
+  {1012 * OVERSAMPLENR,  10},
+  {1016 * OVERSAMPLENR,  0}
 };
 
 #endif
 #if (THERMISTORHEATER_0 == 3) || (THERMISTORHEATER_1 == 3) || (THERMISTORHEATER_2 == 3) || (THERMISTORHEATER_3 == 3) || (THERMISTORBED == 3) //mendel-parts
 const short temptable_3[][2] PROGMEM = {
-                {1*OVERSAMPLENR,864},
-                {21*OVERSAMPLENR,300},
-                {25*OVERSAMPLENR,290},
-                {29*OVERSAMPLENR,280},
-                {33*OVERSAMPLENR,270},
-                {39*OVERSAMPLENR,260},
-                {46*OVERSAMPLENR,250},
-                {54*OVERSAMPLENR,240},
-                {64*OVERSAMPLENR,230},
-                {75*OVERSAMPLENR,220},
-                {90*OVERSAMPLENR,210},
-                {107*OVERSAMPLENR,200},
-                {128*OVERSAMPLENR,190},
-                {154*OVERSAMPLENR,180},
-                {184*OVERSAMPLENR,170},
-                {221*OVERSAMPLENR,160},
-                {265*OVERSAMPLENR,150},
-                {316*OVERSAMPLENR,140},
-                {375*OVERSAMPLENR,130},
-                {441*OVERSAMPLENR,120},
-                {513*OVERSAMPLENR,110},
-                {588*OVERSAMPLENR,100},
-                {734*OVERSAMPLENR,80},
-                {856*OVERSAMPLENR,60},
-                {938*OVERSAMPLENR,40},
-                {986*OVERSAMPLENR,20},
-                {1008*OVERSAMPLENR,0},
-                {1018*OVERSAMPLENR,-20}
-        };
+  {1 * OVERSAMPLENR,  864},
+  {21 * OVERSAMPLENR,  300},
+  {25 * OVERSAMPLENR,  290},
+  {29 * OVERSAMPLENR,  280},
+  {33 * OVERSAMPLENR,  270},
+  {39 * OVERSAMPLENR,  260},
+  {46 * OVERSAMPLENR,  250},
+  {54 * OVERSAMPLENR,  240},
+  {64 * OVERSAMPLENR,  230},
+  {75 * OVERSAMPLENR,  220},
+  {90 * OVERSAMPLENR,  210},
+  {107 * OVERSAMPLENR,  200},
+  {128 * OVERSAMPLENR,  190},
+  {154 * OVERSAMPLENR,  180},
+  {184 * OVERSAMPLENR,  170},
+  {221 * OVERSAMPLENR,  160},
+  {265 * OVERSAMPLENR,  150},
+  {316 * OVERSAMPLENR,  140},
+  {375 * OVERSAMPLENR,  130},
+  {441 * OVERSAMPLENR,  120},
+  {513 * OVERSAMPLENR,  110},
+  {588 * OVERSAMPLENR,  100},
+  {734 * OVERSAMPLENR,  80},
+  {856 * OVERSAMPLENR,  60},
+  {938 * OVERSAMPLENR,  40},
+  {986 * OVERSAMPLENR,  20},
+  {1008 * OVERSAMPLENR,  0},
+  {1018 * OVERSAMPLENR,  -20}
+};
 
 #endif
 #if (THERMISTORHEATER_0 == 4) || (THERMISTORHEATER_1 == 4) || (THERMISTORHEATER_2 == 4) || (THERMISTORHEATER_3 == 4) || (THERMISTORBED == 4) //10k thermistor
 const short temptable_4[][2] PROGMEM = {
-   {1*OVERSAMPLENR, 430},
-   {54*OVERSAMPLENR, 137},
-   {107*OVERSAMPLENR, 107},
-   {160*OVERSAMPLENR, 91},
-   {213*OVERSAMPLENR, 80},
-   {266*OVERSAMPLENR, 71},
-   {319*OVERSAMPLENR, 64},
-   {372*OVERSAMPLENR, 57},
-   {425*OVERSAMPLENR, 51},
-   {478*OVERSAMPLENR, 46},
-   {531*OVERSAMPLENR, 41},
-   {584*OVERSAMPLENR, 35},
-   {637*OVERSAMPLENR, 30},
-   {690*OVERSAMPLENR, 25},
-   {743*OVERSAMPLENR, 20},
-   {796*OVERSAMPLENR, 14},
-   {849*OVERSAMPLENR, 7},
-   {902*OVERSAMPLENR, 0},
-   {955*OVERSAMPLENR, -11},
-   {1008*OVERSAMPLENR, -35}
+  {1 * OVERSAMPLENR,  430},
+  {54 * OVERSAMPLENR,  137},
+  {107 * OVERSAMPLENR,  107},
+  {160 * OVERSAMPLENR,  91},
+  {213 * OVERSAMPLENR,  80},
+  {266 * OVERSAMPLENR,  71},
+  {319 * OVERSAMPLENR,  64},
+  {372 * OVERSAMPLENR,  57},
+  {425 * OVERSAMPLENR,  51},
+  {478 * OVERSAMPLENR,  46},
+  {531 * OVERSAMPLENR,  41},
+  {584 * OVERSAMPLENR,  35},
+  {637 * OVERSAMPLENR,  30},
+  {690 * OVERSAMPLENR,  25},
+  {743 * OVERSAMPLENR,  20},
+  {796 * OVERSAMPLENR,  14},
+  {849 * OVERSAMPLENR,  7},
+  {902 * OVERSAMPLENR,  0},
+  {955 * OVERSAMPLENR,  -11},
+  {1008 * OVERSAMPLENR,  -35}
 };
 #endif
 
@@ -174,145 +174,145 @@ const short temptable_4[][2] PROGMEM = {
 const short temptable_5[][2] PROGMEM = {
 // ATC Semitec 104GT-2 (Used in ParCan)
 // Verified by linagee. Source: http://shop.arcol.hu/static/datasheets/thermistors.pdf
-// Calculated using 4.7kohm pullup, voltage divider math, and manufacturer provided temp/resistance
-   {1*OVERSAMPLENR, 713},
-   {17*OVERSAMPLENR, 300}, //top rating 300C
-   {20*OVERSAMPLENR, 290},
-   {23*OVERSAMPLENR, 280},
-   {27*OVERSAMPLENR, 270},
-   {31*OVERSAMPLENR, 260},
-   {37*OVERSAMPLENR, 250},
-   {43*OVERSAMPLENR, 240},
-   {51*OVERSAMPLENR, 230},
-   {61*OVERSAMPLENR, 220},
-   {73*OVERSAMPLENR, 210},
-   {87*OVERSAMPLENR, 200},
-   {106*OVERSAMPLENR, 190},
-   {128*OVERSAMPLENR, 180},
-   {155*OVERSAMPLENR, 170},
-   {189*OVERSAMPLENR, 160},
-   {230*OVERSAMPLENR, 150},
-   {278*OVERSAMPLENR, 140},
-   {336*OVERSAMPLENR, 130},
-   {402*OVERSAMPLENR, 120},
-   {476*OVERSAMPLENR, 110},
-   {554*OVERSAMPLENR, 100},
-   {635*OVERSAMPLENR, 90},
-   {713*OVERSAMPLENR, 80},
-   {784*OVERSAMPLENR, 70},
-   {846*OVERSAMPLENR, 60},
-   {897*OVERSAMPLENR, 50},
-   {937*OVERSAMPLENR, 40},
-   {966*OVERSAMPLENR, 30},
-   {986*OVERSAMPLENR, 20},
-   {1000*OVERSAMPLENR, 10},
-   {1010*OVERSAMPLENR, 0}
+// Calculated using 4.7kohm pullup,voltage divider math,and manufacturer provided temp/resistance
+  {1 * OVERSAMPLENR,  713},
+  {17 * OVERSAMPLENR,  300},//top rating 300C
+  {20 * OVERSAMPLENR,  290},
+  {23 * OVERSAMPLENR,  280},
+  {27 * OVERSAMPLENR,  270},
+  {31 * OVERSAMPLENR,  260},
+  {37 * OVERSAMPLENR,  250},
+  {43 * OVERSAMPLENR,  240},
+  {51 * OVERSAMPLENR,  230},
+  {61 * OVERSAMPLENR,  220},
+  {73 * OVERSAMPLENR,  210},
+  {87 * OVERSAMPLENR,  200},
+  {106 * OVERSAMPLENR,  190},
+  {128 * OVERSAMPLENR,  180},
+  {155 * OVERSAMPLENR,  170},
+  {189 * OVERSAMPLENR,  160},
+  {230 * OVERSAMPLENR,  150},
+  {278 * OVERSAMPLENR,  140},
+  {336 * OVERSAMPLENR,  130},
+  {402 * OVERSAMPLENR,  120},
+  {476 * OVERSAMPLENR,  110},
+  {554 * OVERSAMPLENR,  100},
+  {635 * OVERSAMPLENR,  90},
+  {713 * OVERSAMPLENR,  80},
+  {784 * OVERSAMPLENR,  70},
+  {846 * OVERSAMPLENR,  60},
+  {897 * OVERSAMPLENR,  50},
+  {937 * OVERSAMPLENR,  40},
+  {966 * OVERSAMPLENR,  30},
+  {986 * OVERSAMPLENR,  20},
+  {1000 * OVERSAMPLENR,  10},
+  {1010 * OVERSAMPLENR,  0}
 };
 #endif
 
 #if (THERMISTORHEATER_0 == 6) || (THERMISTORHEATER_1 == 6) || (THERMISTORHEATER_2 == 6) || (THERMISTORHEATER_3 == 6) || (THERMISTORBED == 6) // 100k Epcos thermistor
 const short temptable_6[][2] PROGMEM = {
-   {1*OVERSAMPLENR, 350},
-   {28*OVERSAMPLENR, 250}, //top rating 250C
-   {31*OVERSAMPLENR, 245},
-   {35*OVERSAMPLENR, 240},
-   {39*OVERSAMPLENR, 235},
-   {42*OVERSAMPLENR, 230},
-   {44*OVERSAMPLENR, 225},
-   {49*OVERSAMPLENR, 220},
-   {53*OVERSAMPLENR, 215},
-   {62*OVERSAMPLENR, 210},
-   {71*OVERSAMPLENR, 205}, //fitted graphically
-   {78*OVERSAMPLENR, 200}, //fitted graphically
-   {94*OVERSAMPLENR, 190},
-   {102*OVERSAMPLENR, 185},
-   {116*OVERSAMPLENR, 170},
-   {143*OVERSAMPLENR, 160},
-   {183*OVERSAMPLENR, 150},
-   {223*OVERSAMPLENR, 140},
-   {270*OVERSAMPLENR, 130},
-   {318*OVERSAMPLENR, 120},
-   {383*OVERSAMPLENR, 110},
-   {413*OVERSAMPLENR, 105},
-   {439*OVERSAMPLENR, 100},
-   {484*OVERSAMPLENR, 95},
-   {513*OVERSAMPLENR, 90},
-   {607*OVERSAMPLENR, 80},
-   {664*OVERSAMPLENR, 70},
-   {781*OVERSAMPLENR, 60},
-   {810*OVERSAMPLENR, 55},
-   {849*OVERSAMPLENR, 50},
-   {914*OVERSAMPLENR, 45},
-   {914*OVERSAMPLENR, 40},
-   {935*OVERSAMPLENR, 35},
-   {954*OVERSAMPLENR, 30},
-   {970*OVERSAMPLENR, 25},
-   {978*OVERSAMPLENR, 22},
-   {1008*OVERSAMPLENR, 3},
-   {1023*OVERSAMPLENR, 0}  //to allow internal 0 degrees C
+  {1 * OVERSAMPLENR,  350},
+  {28 * OVERSAMPLENR,  250},//top rating 250C
+  {31 * OVERSAMPLENR,  245},
+  {35 * OVERSAMPLENR,  240},
+  {39 * OVERSAMPLENR,  235},
+  {42 * OVERSAMPLENR,  230},
+  {44 * OVERSAMPLENR,  225},
+  {49 * OVERSAMPLENR,  220},
+  {53 * OVERSAMPLENR,  215},
+  {62 * OVERSAMPLENR,  210},
+  {71 * OVERSAMPLENR,  205},//fitted graphically
+  {78 * OVERSAMPLENR,  200},//fitted graphically
+  {94 * OVERSAMPLENR,  190},
+  {102 * OVERSAMPLENR,  185},
+  {116 * OVERSAMPLENR,  170},
+  {143 * OVERSAMPLENR,  160},
+  {183 * OVERSAMPLENR,  150},
+  {223 * OVERSAMPLENR,  140},
+  {270 * OVERSAMPLENR,  130},
+  {318 * OVERSAMPLENR,  120},
+  {383 * OVERSAMPLENR,  110},
+  {413 * OVERSAMPLENR,  105},
+  {439 * OVERSAMPLENR,  100},
+  {484 * OVERSAMPLENR,  95},
+  {513 * OVERSAMPLENR,  90},
+  {607 * OVERSAMPLENR,  80},
+  {664 * OVERSAMPLENR,  70},
+  {781 * OVERSAMPLENR,  60},
+  {810 * OVERSAMPLENR,  55},
+  {849 * OVERSAMPLENR,  50},
+  {914 * OVERSAMPLENR,  45},
+  {914 * OVERSAMPLENR,  40},
+  {935 * OVERSAMPLENR,  35},
+  {954 * OVERSAMPLENR,  30},
+  {970 * OVERSAMPLENR,  25},
+  {978 * OVERSAMPLENR,  22},
+  {1008 * OVERSAMPLENR,  3},
+  {1023 * OVERSAMPLENR,  0}  //to allow internal 0 degrees C
 };
 #endif
 
 #if (THERMISTORHEATER_0 == 7) || (THERMISTORHEATER_1 == 7) || (THERMISTORHEATER_2 == 7) || (THERMISTORHEATER_3 == 7) || (THERMISTORBED == 7) // 100k Honeywell 135-104LAG-J01
 const short temptable_7[][2] PROGMEM = {
-   {1*OVERSAMPLENR, 941},
-   {19*OVERSAMPLENR, 362},
-   {37*OVERSAMPLENR, 299}, //top rating 300C
-   {55*OVERSAMPLENR, 266},
-   {73*OVERSAMPLENR, 245},
-   {91*OVERSAMPLENR, 229},
-   {109*OVERSAMPLENR, 216},
-   {127*OVERSAMPLENR, 206},
-   {145*OVERSAMPLENR, 197},
-   {163*OVERSAMPLENR, 190},
-   {181*OVERSAMPLENR, 183},
-   {199*OVERSAMPLENR, 177},
-   {217*OVERSAMPLENR, 171},
-   {235*OVERSAMPLENR, 166},
-   {253*OVERSAMPLENR, 162},
-   {271*OVERSAMPLENR, 157},
-   {289*OVERSAMPLENR, 153},
-   {307*OVERSAMPLENR, 149},
-   {325*OVERSAMPLENR, 146},
-   {343*OVERSAMPLENR, 142},
-   {361*OVERSAMPLENR, 139},
-   {379*OVERSAMPLENR, 135},
-   {397*OVERSAMPLENR, 132},
-   {415*OVERSAMPLENR, 129},
-   {433*OVERSAMPLENR, 126},
-   {451*OVERSAMPLENR, 123},
-   {469*OVERSAMPLENR, 121},
-   {487*OVERSAMPLENR, 118},
-   {505*OVERSAMPLENR, 115},
-   {523*OVERSAMPLENR, 112},
-   {541*OVERSAMPLENR, 110},
-   {559*OVERSAMPLENR, 107},
-   {577*OVERSAMPLENR, 105},
-   {595*OVERSAMPLENR, 102},
-   {613*OVERSAMPLENR, 99},
-   {631*OVERSAMPLENR, 97},
-   {649*OVERSAMPLENR, 94},
-   {667*OVERSAMPLENR, 92},
-   {685*OVERSAMPLENR, 89},
-   {703*OVERSAMPLENR, 86},
-   {721*OVERSAMPLENR, 84},
-   {739*OVERSAMPLENR, 81},
-   {757*OVERSAMPLENR, 78},
-   {775*OVERSAMPLENR, 75},
-   {793*OVERSAMPLENR, 72},
-   {811*OVERSAMPLENR, 69},
-   {829*OVERSAMPLENR, 66},
-   {847*OVERSAMPLENR, 62},
-   {865*OVERSAMPLENR, 59},
-   {883*OVERSAMPLENR, 55},
-   {901*OVERSAMPLENR, 51},
-   {919*OVERSAMPLENR, 46},
-   {937*OVERSAMPLENR, 41},
-   {955*OVERSAMPLENR, 35},
-   {973*OVERSAMPLENR, 27},
-   {991*OVERSAMPLENR, 17},
-   {1009*OVERSAMPLENR, 1},
-   {1023*OVERSAMPLENR, 0}  //to allow internal 0 degrees C
+  {1 * OVERSAMPLENR,  941},
+  {19 * OVERSAMPLENR,  362},
+  {37 * OVERSAMPLENR,  299},//top rating 300C
+  {55 * OVERSAMPLENR,  266},
+  {73 * OVERSAMPLENR,  245},
+  {91 * OVERSAMPLENR,  229},
+  {109 * OVERSAMPLENR,  216},
+  {127 * OVERSAMPLENR,  206},
+  {145 * OVERSAMPLENR,  197},
+  {163 * OVERSAMPLENR,  190},
+  {181 * OVERSAMPLENR,  183},
+  {199 * OVERSAMPLENR,  177},
+  {217 * OVERSAMPLENR,  171},
+  {235 * OVERSAMPLENR,  166},
+  {253 * OVERSAMPLENR,  162},
+  {271 * OVERSAMPLENR,  157},
+  {289 * OVERSAMPLENR,  153},
+  {307 * OVERSAMPLENR,  149},
+  {325 * OVERSAMPLENR,  146},
+  {343 * OVERSAMPLENR,  142},
+  {361 * OVERSAMPLENR,  139},
+  {379 * OVERSAMPLENR,  135},
+  {397 * OVERSAMPLENR,  132},
+  {415 * OVERSAMPLENR,  129},
+  {433 * OVERSAMPLENR,  126},
+  {451 * OVERSAMPLENR,  123},
+  {469 * OVERSAMPLENR,  121},
+  {487 * OVERSAMPLENR,  118},
+  {505 * OVERSAMPLENR,  115},
+  {523 * OVERSAMPLENR,  112},
+  {541 * OVERSAMPLENR,  110},
+  {559 * OVERSAMPLENR,  107},
+  {577 * OVERSAMPLENR,  105},
+  {595 * OVERSAMPLENR,  102},
+  {613 * OVERSAMPLENR,  99},
+  {631 * OVERSAMPLENR,  97},
+  {649 * OVERSAMPLENR,  94},
+  {667 * OVERSAMPLENR,  92},
+  {685 * OVERSAMPLENR,  89},
+  {703 * OVERSAMPLENR,  86},
+  {721 * OVERSAMPLENR,  84},
+  {739 * OVERSAMPLENR,  81},
+  {757 * OVERSAMPLENR,  78},
+  {775 * OVERSAMPLENR,  75},
+  {793 * OVERSAMPLENR,  72},
+  {811 * OVERSAMPLENR,  69},
+  {829 * OVERSAMPLENR,  66},
+  {847 * OVERSAMPLENR,  62},
+  {865 * OVERSAMPLENR,  59},
+  {883 * OVERSAMPLENR,  55},
+  {901 * OVERSAMPLENR,  51},
+  {919 * OVERSAMPLENR,  46},
+  {937 * OVERSAMPLENR,  41},
+  {955 * OVERSAMPLENR,  35},
+  {973 * OVERSAMPLENR,  27},
+  {991 * OVERSAMPLENR,  17},
+  {1009 * OVERSAMPLENR,  1},
+  {1023 * OVERSAMPLENR,  0}  //to allow internal 0 degrees C
 };
 #endif
 
@@ -323,245 +323,245 @@ const short temptable_7[][2] PROGMEM = {
 // R1 = 0 Ohm
 // R2 = 4700 Ohm
 const short temptable_71[][2] PROGMEM = {
-   {35*OVERSAMPLENR, 300},
-   {51*OVERSAMPLENR, 270},
-   {54*OVERSAMPLENR, 265},
-   {58*OVERSAMPLENR, 260},
-   {59*OVERSAMPLENR, 258},
-   {61*OVERSAMPLENR, 256},
-   {63*OVERSAMPLENR, 254},
-   {64*OVERSAMPLENR, 252},
-   {66*OVERSAMPLENR, 250},
-   {67*OVERSAMPLENR, 249},
-   {68*OVERSAMPLENR, 248},
-   {69*OVERSAMPLENR, 247},
-   {70*OVERSAMPLENR, 246},
-   {71*OVERSAMPLENR, 245},
-   {72*OVERSAMPLENR, 244},
-   {73*OVERSAMPLENR, 243},
-   {74*OVERSAMPLENR, 242},
-   {75*OVERSAMPLENR, 241},
-   {76*OVERSAMPLENR, 240},
-   {77*OVERSAMPLENR, 239},
-   {78*OVERSAMPLENR, 238},
-   {79*OVERSAMPLENR, 237},
-   {80*OVERSAMPLENR, 236},
-   {81*OVERSAMPLENR, 235},
-   {82*OVERSAMPLENR, 234},
-   {84*OVERSAMPLENR, 233},
-   {85*OVERSAMPLENR, 232},
-   {86*OVERSAMPLENR, 231},
-   {87*OVERSAMPLENR, 230},
-   {89*OVERSAMPLENR, 229},
-   {90*OVERSAMPLENR, 228},
-   {91*OVERSAMPLENR, 227},
-   {92*OVERSAMPLENR, 226},
-   {94*OVERSAMPLENR, 225},
-   {95*OVERSAMPLENR, 224},
-   {97*OVERSAMPLENR, 223},
-   {98*OVERSAMPLENR, 222},
-   {99*OVERSAMPLENR, 221},
-   {101*OVERSAMPLENR, 220},
-   {102*OVERSAMPLENR, 219},
-   {104*OVERSAMPLENR, 218},
-   {106*OVERSAMPLENR, 217},
-   {107*OVERSAMPLENR, 216},
-   {109*OVERSAMPLENR, 215},
-   {110*OVERSAMPLENR, 214},
-   {112*OVERSAMPLENR, 213},
-   {114*OVERSAMPLENR, 212},
-   {115*OVERSAMPLENR, 211},
-   {117*OVERSAMPLENR, 210},
-   {119*OVERSAMPLENR, 209},
-   {121*OVERSAMPLENR, 208},
-   {123*OVERSAMPLENR, 207},
-   {125*OVERSAMPLENR, 206},
-   {126*OVERSAMPLENR, 205},
-   {128*OVERSAMPLENR, 204},
-   {130*OVERSAMPLENR, 203},
-   {132*OVERSAMPLENR, 202},
-   {134*OVERSAMPLENR, 201},
-   {136*OVERSAMPLENR, 200},
-   {139*OVERSAMPLENR, 199},
-   {141*OVERSAMPLENR, 198},
-   {143*OVERSAMPLENR, 197},
-   {145*OVERSAMPLENR, 196},
-   {147*OVERSAMPLENR, 195},
-   {150*OVERSAMPLENR, 194},
-   {152*OVERSAMPLENR, 193},
-   {154*OVERSAMPLENR, 192},
-   {157*OVERSAMPLENR, 191},
-   {159*OVERSAMPLENR, 190},
-   {162*OVERSAMPLENR, 189},
-   {164*OVERSAMPLENR, 188},
-   {167*OVERSAMPLENR, 187},
-   {170*OVERSAMPLENR, 186},
-   {172*OVERSAMPLENR, 185},
-   {175*OVERSAMPLENR, 184},
-   {178*OVERSAMPLENR, 183},
-   {181*OVERSAMPLENR, 182},
-   {184*OVERSAMPLENR, 181},
-   {187*OVERSAMPLENR, 180},
-   {190*OVERSAMPLENR, 179},
-   {193*OVERSAMPLENR, 178},
-   {196*OVERSAMPLENR, 177},
-   {199*OVERSAMPLENR, 176},
-   {202*OVERSAMPLENR, 175},
-   {205*OVERSAMPLENR, 174},
-   {208*OVERSAMPLENR, 173},
-   {212*OVERSAMPLENR, 172},
-   {215*OVERSAMPLENR, 171},
-   {219*OVERSAMPLENR, 170},
-   {237*OVERSAMPLENR, 165},
-   {256*OVERSAMPLENR, 160},
-   {300*OVERSAMPLENR, 150},
-   {351*OVERSAMPLENR, 140},
-   {470*OVERSAMPLENR, 120},
-   {504*OVERSAMPLENR, 115},
-   {538*OVERSAMPLENR, 110},
-   {552*OVERSAMPLENR, 108},
-   {566*OVERSAMPLENR, 106},
-   {580*OVERSAMPLENR, 104},
-   {594*OVERSAMPLENR, 102},
-   {608*OVERSAMPLENR, 100},
-   {622*OVERSAMPLENR, 98},
-   {636*OVERSAMPLENR, 96},
-   {650*OVERSAMPLENR, 94},
-   {664*OVERSAMPLENR, 92},
-   {678*OVERSAMPLENR, 90},
-   {712*OVERSAMPLENR, 85},
-   {745*OVERSAMPLENR, 80},
-   {758*OVERSAMPLENR, 78},
-   {770*OVERSAMPLENR, 76},
-   {783*OVERSAMPLENR, 74},
-   {795*OVERSAMPLENR, 72},
-   {806*OVERSAMPLENR, 70},
-   {818*OVERSAMPLENR, 68},
-   {829*OVERSAMPLENR, 66},
-   {840*OVERSAMPLENR, 64},
-   {850*OVERSAMPLENR, 62},
-   {860*OVERSAMPLENR, 60},
-   {870*OVERSAMPLENR, 58},
-   {879*OVERSAMPLENR, 56},
-   {888*OVERSAMPLENR, 54},
-   {897*OVERSAMPLENR, 52},
-   {905*OVERSAMPLENR, 50},
-   {924*OVERSAMPLENR, 45},
-   {940*OVERSAMPLENR, 40},
-   {955*OVERSAMPLENR, 35},
-   {967*OVERSAMPLENR, 30},
-   {970*OVERSAMPLENR, 29},
-   {972*OVERSAMPLENR, 28},
-   {974*OVERSAMPLENR, 27},
-   {976*OVERSAMPLENR, 26},
-   {978*OVERSAMPLENR, 25},
-   {980*OVERSAMPLENR, 24},
-   {982*OVERSAMPLENR, 23},
-   {984*OVERSAMPLENR, 22},
-   {985*OVERSAMPLENR, 21},
-   {987*OVERSAMPLENR, 20},
-   {995*OVERSAMPLENR, 15},
-   {1001*OVERSAMPLENR, 10},
-   {1006*OVERSAMPLENR, 5},
-   {1010*OVERSAMPLENR, 0},
+  {35 * OVERSAMPLENR,  300},
+  {51 * OVERSAMPLENR,  270},
+  {54 * OVERSAMPLENR,  265},
+  {58 * OVERSAMPLENR,  260},
+  {59 * OVERSAMPLENR,  258},
+  {61 * OVERSAMPLENR,  256},
+  {63 * OVERSAMPLENR,  254},
+  {64 * OVERSAMPLENR,  252},
+  {66 * OVERSAMPLENR,  250},
+  {67 * OVERSAMPLENR,  249},
+  {68 * OVERSAMPLENR,  248},
+  {69 * OVERSAMPLENR,  247},
+  {70 * OVERSAMPLENR,  246},
+  {71 * OVERSAMPLENR,  245},
+  {72 * OVERSAMPLENR,  244},
+  {73 * OVERSAMPLENR,  243},
+  {74 * OVERSAMPLENR,  242},
+  {75 * OVERSAMPLENR,  241},
+  {76 * OVERSAMPLENR,  240},
+  {77 * OVERSAMPLENR,  239},
+  {78 * OVERSAMPLENR,  238},
+  {79 * OVERSAMPLENR,  237},
+  {80 * OVERSAMPLENR,  236},
+  {81 * OVERSAMPLENR,  235},
+  {82 * OVERSAMPLENR,  234},
+  {84 * OVERSAMPLENR,  233},
+  {85 * OVERSAMPLENR,  232},
+  {86 * OVERSAMPLENR,  231},
+  {87 * OVERSAMPLENR,  230},
+  {89 * OVERSAMPLENR,  229},
+  {90 * OVERSAMPLENR,  228},
+  {91 * OVERSAMPLENR,  227},
+  {92 * OVERSAMPLENR,  226},
+  {94 * OVERSAMPLENR,  225},
+  {95 * OVERSAMPLENR,  224},
+  {97 * OVERSAMPLENR,  223},
+  {98 * OVERSAMPLENR,  222},
+  {99 * OVERSAMPLENR,  221},
+  {101 * OVERSAMPLENR,  220},
+  {102 * OVERSAMPLENR,  219},
+  {104 * OVERSAMPLENR,  218},
+  {106 * OVERSAMPLENR,  217},
+  {107 * OVERSAMPLENR,  216},
+  {109 * OVERSAMPLENR,  215},
+  {110 * OVERSAMPLENR,  214},
+  {112 * OVERSAMPLENR,  213},
+  {114 * OVERSAMPLENR,  212},
+  {115 * OVERSAMPLENR,  211},
+  {117 * OVERSAMPLENR,  210},
+  {119 * OVERSAMPLENR,  209},
+  {121 * OVERSAMPLENR,  208},
+  {123 * OVERSAMPLENR,  207},
+  {125 * OVERSAMPLENR,  206},
+  {126 * OVERSAMPLENR,  205},
+  {128 * OVERSAMPLENR,  204},
+  {130 * OVERSAMPLENR,  203},
+  {132 * OVERSAMPLENR,  202},
+  {134 * OVERSAMPLENR,  201},
+  {136 * OVERSAMPLENR,  200},
+  {139 * OVERSAMPLENR,  199},
+  {141 * OVERSAMPLENR,  198},
+  {143 * OVERSAMPLENR,  197},
+  {145 * OVERSAMPLENR,  196},
+  {147 * OVERSAMPLENR,  195},
+  {150 * OVERSAMPLENR,  194},
+  {152 * OVERSAMPLENR,  193},
+  {154 * OVERSAMPLENR,  192},
+  {157 * OVERSAMPLENR,  191},
+  {159 * OVERSAMPLENR,  190},
+  {162 * OVERSAMPLENR,  189},
+  {164 * OVERSAMPLENR,  188},
+  {167 * OVERSAMPLENR,  187},
+  {170 * OVERSAMPLENR,  186},
+  {172 * OVERSAMPLENR,  185},
+  {175 * OVERSAMPLENR,  184},
+  {178 * OVERSAMPLENR,  183},
+  {181 * OVERSAMPLENR,  182},
+  {184 * OVERSAMPLENR,  181},
+  {187 * OVERSAMPLENR,  180},
+  {190 * OVERSAMPLENR,  179},
+  {193 * OVERSAMPLENR,  178},
+  {196 * OVERSAMPLENR,  177},
+  {199 * OVERSAMPLENR,  176},
+  {202 * OVERSAMPLENR,  175},
+  {205 * OVERSAMPLENR,  174},
+  {208 * OVERSAMPLENR,  173},
+  {212 * OVERSAMPLENR,  172},
+  {215 * OVERSAMPLENR,  171},
+  {219 * OVERSAMPLENR,  170},
+  {237 * OVERSAMPLENR,  165},
+  {256 * OVERSAMPLENR,  160},
+  {300 * OVERSAMPLENR,  150},
+  {351 * OVERSAMPLENR,  140},
+  {470 * OVERSAMPLENR,  120},
+  {504 * OVERSAMPLENR,  115},
+  {538 * OVERSAMPLENR,  110},
+  {552 * OVERSAMPLENR,  108},
+  {566 * OVERSAMPLENR,  106},
+  {580 * OVERSAMPLENR,  104},
+  {594 * OVERSAMPLENR,  102},
+  {608 * OVERSAMPLENR,  100},
+  {622 * OVERSAMPLENR,  98},
+  {636 * OVERSAMPLENR,  96},
+  {650 * OVERSAMPLENR,  94},
+  {664 * OVERSAMPLENR,  92},
+  {678 * OVERSAMPLENR,  90},
+  {712 * OVERSAMPLENR,  85},
+  {745 * OVERSAMPLENR,  80},
+  {758 * OVERSAMPLENR,  78},
+  {770 * OVERSAMPLENR,  76},
+  {783 * OVERSAMPLENR,  74},
+  {795 * OVERSAMPLENR,  72},
+  {806 * OVERSAMPLENR,  70},
+  {818 * OVERSAMPLENR,  68},
+  {829 * OVERSAMPLENR,  66},
+  {840 * OVERSAMPLENR,  64},
+  {850 * OVERSAMPLENR,  62},
+  {860 * OVERSAMPLENR,  60},
+  {870 * OVERSAMPLENR,  58},
+  {879 * OVERSAMPLENR,  56},
+  {888 * OVERSAMPLENR,  54},
+  {897 * OVERSAMPLENR,  52},
+  {905 * OVERSAMPLENR,  50},
+  {924 * OVERSAMPLENR,  45},
+  {940 * OVERSAMPLENR,  40},
+  {955 * OVERSAMPLENR,  35},
+  {967 * OVERSAMPLENR,  30},
+  {970 * OVERSAMPLENR,  29},
+  {972 * OVERSAMPLENR,  28},
+  {974 * OVERSAMPLENR,  27},
+  {976 * OVERSAMPLENR,  26},
+  {978 * OVERSAMPLENR,  25},
+  {980 * OVERSAMPLENR,  24},
+  {982 * OVERSAMPLENR,  23},
+  {984 * OVERSAMPLENR,  22},
+  {985 * OVERSAMPLENR,  21},
+  {987 * OVERSAMPLENR,  20},
+  {995 * OVERSAMPLENR,  15},
+  {1001 * OVERSAMPLENR,  10},
+  {1006 * OVERSAMPLENR,  5},
+  {1010 * OVERSAMPLENR,  0}
 };
 #endif
 
 #if (THERMISTORHEATER_0 == 8) || (THERMISTORHEATER_1 == 8) || (THERMISTORHEATER_2 == 8) || (THERMISTORHEATER_3 == 8) || (THERMISTORBED == 8)
 // 100k 0603 SMD Vishay NTCS0603E3104FXT (4.7k pullup)
 const short temptable_8[][2] PROGMEM = {
-   {1*OVERSAMPLENR, 704},
-   {54*OVERSAMPLENR, 216},
-   {107*OVERSAMPLENR, 175},
-   {160*OVERSAMPLENR, 152},
-   {213*OVERSAMPLENR, 137},
-   {266*OVERSAMPLENR, 125},
-   {319*OVERSAMPLENR, 115},
-   {372*OVERSAMPLENR, 106},
-   {425*OVERSAMPLENR, 99},
-   {478*OVERSAMPLENR, 91},
-   {531*OVERSAMPLENR, 85},
-   {584*OVERSAMPLENR, 78},
-   {637*OVERSAMPLENR, 71},
-   {690*OVERSAMPLENR, 65},
-   {743*OVERSAMPLENR, 58},
-   {796*OVERSAMPLENR, 50},
-   {849*OVERSAMPLENR, 42},
-   {902*OVERSAMPLENR, 31},
-   {955*OVERSAMPLENR, 17},
-   {1008*OVERSAMPLENR, 0}
+  {1 * OVERSAMPLENR,  704},
+  {54 * OVERSAMPLENR,  216},
+  {107 * OVERSAMPLENR,  175},
+  {160 * OVERSAMPLENR,  152},
+  {213 * OVERSAMPLENR,  137},
+  {266 * OVERSAMPLENR,  125},
+  {319 * OVERSAMPLENR,  115},
+  {372 * OVERSAMPLENR,  106},
+  {425 * OVERSAMPLENR,  99},
+  {478 * OVERSAMPLENR,  91},
+  {531 * OVERSAMPLENR,  85},
+  {584 * OVERSAMPLENR,  78},
+  {637 * OVERSAMPLENR,  71},
+  {690 * OVERSAMPLENR,  65},
+  {743 * OVERSAMPLENR,  58},
+  {796 * OVERSAMPLENR,  50},
+  {849 * OVERSAMPLENR,  42},
+  {902 * OVERSAMPLENR,  31},
+  {955 * OVERSAMPLENR,  17},
+  {1008 * OVERSAMPLENR,  0}
 };
 #endif
 #if (THERMISTORHEATER_0 == 9) || (THERMISTORHEATER_1 == 9) || (THERMISTORHEATER_2 == 9) || (THERMISTORHEATER_3 == 9) || (THERMISTORBED == 9)
 // 100k GE Sensing AL03006-58.2K-97-G1 (4.7k pullup)
 const short temptable_9[][2] PROGMEM = {
-	{1*OVERSAMPLENR, 936},
-	{36*OVERSAMPLENR, 300},
-	{71*OVERSAMPLENR, 246},
-	{106*OVERSAMPLENR, 218},
-	{141*OVERSAMPLENR, 199},
-	{176*OVERSAMPLENR, 185},
-	{211*OVERSAMPLENR, 173},
-	{246*OVERSAMPLENR, 163},
-	{281*OVERSAMPLENR, 155},
-	{316*OVERSAMPLENR, 147},
-	{351*OVERSAMPLENR, 140},
-	{386*OVERSAMPLENR, 134},
-	{421*OVERSAMPLENR, 128},
-	{456*OVERSAMPLENR, 122},
-	{491*OVERSAMPLENR, 117},
-	{526*OVERSAMPLENR, 112},
-	{561*OVERSAMPLENR, 107},
-	{596*OVERSAMPLENR, 102},
-	{631*OVERSAMPLENR, 97},
-	{666*OVERSAMPLENR, 92},
-	{701*OVERSAMPLENR, 87},
-	{736*OVERSAMPLENR, 81},
-	{771*OVERSAMPLENR, 76},
-	{806*OVERSAMPLENR, 70},
-	{841*OVERSAMPLENR, 63},
-	{876*OVERSAMPLENR, 56},
-	{911*OVERSAMPLENR, 48},
-	{946*OVERSAMPLENR, 38},
-	{981*OVERSAMPLENR, 23},
-	{1005*OVERSAMPLENR, 5},
-	{1016*OVERSAMPLENR, 0}
+  {1 * OVERSAMPLENR,  936},
+  {36 * OVERSAMPLENR,  300},
+  {71 * OVERSAMPLENR,  246},
+  {106 * OVERSAMPLENR,  218},
+  {141 * OVERSAMPLENR,  199},
+  {176 * OVERSAMPLENR,  185},
+  {211 * OVERSAMPLENR,  173},
+  {246 * OVERSAMPLENR,  163},
+  {281 * OVERSAMPLENR,  155},
+  {316 * OVERSAMPLENR,  147},
+  {351 * OVERSAMPLENR,  140},
+  {386 * OVERSAMPLENR,  134},
+  {421 * OVERSAMPLENR,  128},
+  {456 * OVERSAMPLENR,  122},
+  {491 * OVERSAMPLENR,  117},
+  {526 * OVERSAMPLENR,  112},
+  {561 * OVERSAMPLENR,  107},
+  {596 * OVERSAMPLENR,  102},
+  {631 * OVERSAMPLENR,  97},
+  {666 * OVERSAMPLENR,  92},
+  {701 * OVERSAMPLENR,  87},
+  {736 * OVERSAMPLENR,  81},
+  {771 * OVERSAMPLENR,  76},
+  {806 * OVERSAMPLENR,  70},
+  {841 * OVERSAMPLENR,  63},
+  {876 * OVERSAMPLENR,  56},
+  {911 * OVERSAMPLENR,  48},
+  {946 * OVERSAMPLENR,  38},
+  {981 * OVERSAMPLENR,  23},
+  {1005 * OVERSAMPLENR,  5},
+  {1016 * OVERSAMPLENR,  0}
 };
 #endif
 #if (THERMISTORHEATER_0 == 10) || (THERMISTORHEATER_1 == 10) || (THERMISTORHEATER_2 == 10) || (THERMISTORHEATER_3 == 10) || (THERMISTORBED == 10)
 // 100k RS thermistor 198-961 (4.7k pullup)
 const short temptable_10[][2] PROGMEM = {
-   {1*OVERSAMPLENR, 929},
-   {36*OVERSAMPLENR, 299},
-   {71*OVERSAMPLENR, 246},
-   {106*OVERSAMPLENR, 217},
-   {141*OVERSAMPLENR, 198},
-   {176*OVERSAMPLENR, 184},
-   {211*OVERSAMPLENR, 173},
-   {246*OVERSAMPLENR, 163},
-   {281*OVERSAMPLENR, 154},
-   {316*OVERSAMPLENR, 147},
-   {351*OVERSAMPLENR, 140},
-   {386*OVERSAMPLENR, 134},
-   {421*OVERSAMPLENR, 128},
-   {456*OVERSAMPLENR, 122},
-   {491*OVERSAMPLENR, 117},
-   {526*OVERSAMPLENR, 112},
-   {561*OVERSAMPLENR, 107},
-   {596*OVERSAMPLENR, 102},
-   {631*OVERSAMPLENR, 97},
-   {666*OVERSAMPLENR, 91},
-   {701*OVERSAMPLENR, 86},
-   {736*OVERSAMPLENR, 81},
-   {771*OVERSAMPLENR, 76},
-   {806*OVERSAMPLENR, 70},
-   {841*OVERSAMPLENR, 63},
-   {876*OVERSAMPLENR, 56},
-   {911*OVERSAMPLENR, 48},
-   {946*OVERSAMPLENR, 38},
-   {981*OVERSAMPLENR, 23},
-   {1005*OVERSAMPLENR, 5},
-   {1016*OVERSAMPLENR, 0}
+  {1 * OVERSAMPLENR,  929},
+  {36 * OVERSAMPLENR,  299},
+  {71 * OVERSAMPLENR,  246},
+  {106 * OVERSAMPLENR,  217},
+  {141 * OVERSAMPLENR,  198},
+  {176 * OVERSAMPLENR,  184},
+  {211 * OVERSAMPLENR,  173},
+  {246 * OVERSAMPLENR,  163},
+  {281 * OVERSAMPLENR,  154},
+  {316 * OVERSAMPLENR,  147},
+  {351 * OVERSAMPLENR,  140},
+  {386 * OVERSAMPLENR,  134},
+  {421 * OVERSAMPLENR,  128},
+  {456 * OVERSAMPLENR,  122},
+  {491 * OVERSAMPLENR,  117},
+  {526 * OVERSAMPLENR,  112},
+  {561 * OVERSAMPLENR,  107},
+  {596 * OVERSAMPLENR,  102},
+  {631 * OVERSAMPLENR,  97},
+  {666 * OVERSAMPLENR,  91},
+  {701 * OVERSAMPLENR,  86},
+  {736 * OVERSAMPLENR,  81},
+  {771 * OVERSAMPLENR,  76},
+  {806 * OVERSAMPLENR,  70},
+  {841 * OVERSAMPLENR,  63},
+  {876 * OVERSAMPLENR,  56},
+  {911 * OVERSAMPLENR,  48},
+  {946 * OVERSAMPLENR,  38},
+  {981 * OVERSAMPLENR,  23},
+  {1005 * OVERSAMPLENR,  5},
+  {1016 * OVERSAMPLENR,  0}
 };
 #endif
 
@@ -569,56 +569,56 @@ const short temptable_10[][2] PROGMEM = {
 // QU-BD silicone bed QWG-104F-3950 thermistor
 
 const short temptable_11[][2] PROGMEM = {
-         {1*OVERSAMPLENR,        938},
-         {31*OVERSAMPLENR,       314},
-         {41*OVERSAMPLENR,       290},
-         {51*OVERSAMPLENR,       272},
-         {61*OVERSAMPLENR,       258},
-         {71*OVERSAMPLENR,       247},
-         {81*OVERSAMPLENR,       237},
-         {91*OVERSAMPLENR,       229},
-         {101*OVERSAMPLENR,      221},
-         {111*OVERSAMPLENR,      215},
-         {121*OVERSAMPLENR,      209},
-         {131*OVERSAMPLENR,      204},
-         {141*OVERSAMPLENR,      199},
-         {151*OVERSAMPLENR,      195},
-         {161*OVERSAMPLENR,      190},
-         {171*OVERSAMPLENR,      187},
-         {181*OVERSAMPLENR,      183},
-         {191*OVERSAMPLENR,      179},
-         {201*OVERSAMPLENR,      176},
-         {221*OVERSAMPLENR,      170},
-         {241*OVERSAMPLENR,      165},
-         {261*OVERSAMPLENR,      160},
-         {281*OVERSAMPLENR,      155},
-         {301*OVERSAMPLENR,      150},
-         {331*OVERSAMPLENR,      144},
-         {361*OVERSAMPLENR,      139},
-         {391*OVERSAMPLENR,      133},
-         {421*OVERSAMPLENR,      128},
-         {451*OVERSAMPLENR,      123},
-         {491*OVERSAMPLENR,      117},
-         {531*OVERSAMPLENR,      111},
-         {571*OVERSAMPLENR,      105},
-         {611*OVERSAMPLENR,      100},
-         {641*OVERSAMPLENR,      95},
-         {681*OVERSAMPLENR,      90},
-         {711*OVERSAMPLENR,      85},
-         {751*OVERSAMPLENR,      79},
-         {791*OVERSAMPLENR,      72},
-         {811*OVERSAMPLENR,      69},
-         {831*OVERSAMPLENR,      65},
-         {871*OVERSAMPLENR,      57},
-         {881*OVERSAMPLENR,      55},
-         {901*OVERSAMPLENR,      51},
-         {921*OVERSAMPLENR,      45},
-         {941*OVERSAMPLENR,      39},
-         {971*OVERSAMPLENR,      28},
-         {981*OVERSAMPLENR,      23},
-         {991*OVERSAMPLENR,      17},
-         {1001*OVERSAMPLENR,     9},
-         {1021*OVERSAMPLENR,     -27}
+  {1 * OVERSAMPLENR,  938},
+  {31 * OVERSAMPLENR,  314},
+  {41 * OVERSAMPLENR,  290},
+  {51 * OVERSAMPLENR,  272},
+  {61 * OVERSAMPLENR,  258},
+  {71 * OVERSAMPLENR,  247},
+  {81 * OVERSAMPLENR,  237},
+  {91 * OVERSAMPLENR,  229},
+  {101 * OVERSAMPLENR,  221},
+  {111 * OVERSAMPLENR,  215},
+  {121 * OVERSAMPLENR,  209},
+  {131 * OVERSAMPLENR,  204},
+  {141 * OVERSAMPLENR,  199},
+  {151 * OVERSAMPLENR,  195},
+  {161 * OVERSAMPLENR,  190},
+  {171 * OVERSAMPLENR,  187},
+  {181 * OVERSAMPLENR,  183},
+  {191 * OVERSAMPLENR,  179},
+  {201 * OVERSAMPLENR,  176},
+  {221 * OVERSAMPLENR,  170},
+  {241 * OVERSAMPLENR,  165},
+  {261 * OVERSAMPLENR,  160},
+  {281 * OVERSAMPLENR,  155},
+  {301 * OVERSAMPLENR,  150},
+  {331 * OVERSAMPLENR,  144},
+  {361 * OVERSAMPLENR,  139},
+  {391 * OVERSAMPLENR,  133},
+  {421 * OVERSAMPLENR,  128},
+  {451 * OVERSAMPLENR,  123},
+  {491 * OVERSAMPLENR,  117},
+  {531 * OVERSAMPLENR,  111},
+  {571 * OVERSAMPLENR,  105},
+  {611 * OVERSAMPLENR,  100},
+  {641 * OVERSAMPLENR,  95},
+  {681 * OVERSAMPLENR,  90},
+  {711 * OVERSAMPLENR,  85},
+  {751 * OVERSAMPLENR,  79},
+  {791 * OVERSAMPLENR,  72},
+  {811 * OVERSAMPLENR,  69},
+  {831 * OVERSAMPLENR,  65},
+  {871 * OVERSAMPLENR,  57},
+  {881 * OVERSAMPLENR,  55},
+  {901 * OVERSAMPLENR,  51},
+  {921 * OVERSAMPLENR,  45},
+  {941 * OVERSAMPLENR,  39},
+  {971 * OVERSAMPLENR,  28},
+  {981 * OVERSAMPLENR,  23},
+  {991 * OVERSAMPLENR,  17},
+  {1001 * OVERSAMPLENR,  9},
+  {1021 * OVERSAMPLENR,  -27}
 };
 #endif
 
@@ -626,67 +626,67 @@ const short temptable_11[][2] PROGMEM = {
 // Hisens thermistor B25/50 =3950 +/-1%
 
 const short temptable_13[][2] PROGMEM = {
- {	22.5*OVERSAMPLENR,	300	},
-{	24.125*OVERSAMPLENR,	295	},
-{	25.875*OVERSAMPLENR,	290	},
-{	27.8125*OVERSAMPLENR,	285	},
-{	29.9375*OVERSAMPLENR,	280	},
-{	32.25*OVERSAMPLENR,	275	},
-{	34.8125*OVERSAMPLENR,	270	},
-{	37.625*OVERSAMPLENR,	265	},
-{	40.6875*OVERSAMPLENR,	260	},
-{	44.0625*OVERSAMPLENR,	255	},
-{	47.75*OVERSAMPLENR,	250	},
-{	51.8125*OVERSAMPLENR,	245	},
-{	56.3125*OVERSAMPLENR,	240	},
-{	61.25*OVERSAMPLENR,	235	},
-{	66.75*OVERSAMPLENR,	230	},
-{	72.8125*OVERSAMPLENR,	225	},
-{	79.5*OVERSAMPLENR,	220	},
-{	87*OVERSAMPLENR,	215	},
-{	95.3125*OVERSAMPLENR,	210	},
-{	104.1875*OVERSAMPLENR,	205	},
-{	112.75*OVERSAMPLENR,	200	},
-{	123.125*OVERSAMPLENR,	195	},
-{	135.75*OVERSAMPLENR,	190	},
-{	148.3125*OVERSAMPLENR,	185	},
-{	163.8125*OVERSAMPLENR,	180	},
-{	179*OVERSAMPLENR,	175	},
-{	211.125*OVERSAMPLENR,	170	},
-{	216.125*OVERSAMPLENR,	165	},
-{	236.5625*OVERSAMPLENR,	160	},
-{	258.5*OVERSAMPLENR,	155	},
-{	279.875*OVERSAMPLENR,	150	},
-{	305.375*OVERSAMPLENR,	145	},
-{	333.25*OVERSAMPLENR,	140	},
-{	362.5625*OVERSAMPLENR,	135	},
-{	393.6875*OVERSAMPLENR,	130	},
-{	425*OVERSAMPLENR,	125	},
-{	460.625*OVERSAMPLENR,	120	},
-{	495.1875*OVERSAMPLENR,	115	},
-{	530.875*OVERSAMPLENR,	110	},
-{	567.25*OVERSAMPLENR,	105	},
-{	601.625*OVERSAMPLENR,	100	},
-{	637.875*OVERSAMPLENR,	95	},
-{	674.5625*OVERSAMPLENR,	90	},
-{	710*OVERSAMPLENR,	85	},
-{	744.125*OVERSAMPLENR,	80	},
-{	775.9375*OVERSAMPLENR,	75	},
-{	806.875*OVERSAMPLENR,	70	},
-{	835.1875*OVERSAMPLENR,	65	},
-{	861.125*OVERSAMPLENR,	60	},
-{	884.375*OVERSAMPLENR,	55	},
-{	904.5625*OVERSAMPLENR,	50	},
-{	923.8125*OVERSAMPLENR,	45	},
-{	940.375*OVERSAMPLENR,	40	},
-{	954.625*OVERSAMPLENR,	35	},
-{	966.875*OVERSAMPLENR,	30	},
-{	977.0625*OVERSAMPLENR,	25	},
-{	986*OVERSAMPLENR,	20	},
-{	993.375*OVERSAMPLENR,	15	},
-{	999.5*OVERSAMPLENR,	10	},
-{	1004.5*OVERSAMPLENR,	5	},
-{	1008.5*OVERSAMPLENR,	0	}
+  {22.5 * OVERSAMPLENR,  300},
+  {24.125 * OVERSAMPLENR,  295},
+  {25.875 * OVERSAMPLENR,  290},
+  {27.8125 * OVERSAMPLENR,  285},
+  {29.9375 * OVERSAMPLENR,  280},
+  {32.25 * OVERSAMPLENR,  275},
+  {34.8125 * OVERSAMPLENR,  270},
+  {37.625 * OVERSAMPLENR,  265},
+  {40.6875 * OVERSAMPLENR,  260},
+  {44.0625 * OVERSAMPLENR,  255},
+  {47.75 * OVERSAMPLENR,  250},
+  {51.8125 * OVERSAMPLENR,  245},
+  {56.3125 * OVERSAMPLENR,  240},
+  {61.25 * OVERSAMPLENR,  235},
+  {66.75 * OVERSAMPLENR,  230},
+  {72.8125 * OVERSAMPLENR,  225},
+  {79.5 * OVERSAMPLENR,  220},
+  {87 * OVERSAMPLENR,  215},
+  {95.3125 * OVERSAMPLENR,  210},
+  {104.1875 * OVERSAMPLENR,  205},
+  {112.75 * OVERSAMPLENR,  200},
+  {123.125 * OVERSAMPLENR,  195},
+  {135.75 * OVERSAMPLENR,  190},
+  {148.3125 * OVERSAMPLENR,  185},
+  {163.8125 * OVERSAMPLENR,  180},
+  {179 * OVERSAMPLENR,  175},
+  {211.125 * OVERSAMPLENR,  170},
+  {216.125 * OVERSAMPLENR,  165},
+  {236.5625 * OVERSAMPLENR,  160},
+  {258.5 * OVERSAMPLENR,  155},
+  {279.875 * OVERSAMPLENR,  150},
+  {305.375 * OVERSAMPLENR,  145},
+  {333.25 * OVERSAMPLENR,  140},
+  {362.5625 * OVERSAMPLENR,  135},
+  {393.6875 * OVERSAMPLENR,  130},
+  {425 * OVERSAMPLENR,  125},
+  {460.625 * OVERSAMPLENR,  120},
+  {495.1875 * OVERSAMPLENR,  115},
+  {530.875 * OVERSAMPLENR,  110},
+  {567.25 * OVERSAMPLENR,  105},
+  {601.625 * OVERSAMPLENR,  100},
+  {637.875 * OVERSAMPLENR,  95},
+  {674.5625 * OVERSAMPLENR,  90},
+  {710 * OVERSAMPLENR,  85},
+  {744.125 * OVERSAMPLENR,  80},
+  {775.9375 * OVERSAMPLENR,  75},
+  {806.875 * OVERSAMPLENR,  70},
+  {835.1875 * OVERSAMPLENR,  65},
+  {861.125 * OVERSAMPLENR,  60},
+  {884.375 * OVERSAMPLENR,  55},
+  {904.5625 * OVERSAMPLENR,  50},
+  {923.8125 * OVERSAMPLENR,  45},
+  {940.375 * OVERSAMPLENR,  40},
+  {954.625 * OVERSAMPLENR,  35},
+  {966.875 * OVERSAMPLENR,  30},
+  {977.0625 * OVERSAMPLENR,  25},
+  {986 * OVERSAMPLENR,  20},
+  {993.375 * OVERSAMPLENR,  15},
+  {999.5 * OVERSAMPLENR,  10},
+  {1004.5 * OVERSAMPLENR,  5},
+  {1008.5 * OVERSAMPLENR,  0}
 
  };
 #endif
@@ -715,199 +715,199 @@ This does not match the normal thermistor behaviour so we need to set the follow
 # define HEATER_BED_RAW_LO_TEMP 0
 #endif
 const short temptable_20[][2] PROGMEM = {
-{         0*OVERSAMPLENR ,       0     },
-{       227*OVERSAMPLENR ,       1     },
-{       236*OVERSAMPLENR ,       10     },
-{       245*OVERSAMPLENR ,       20     },
-{       253*OVERSAMPLENR ,       30     },
-{       262*OVERSAMPLENR ,       40     },
-{       270*OVERSAMPLENR ,       50     },
-{       279*OVERSAMPLENR ,       60     },
-{       287*OVERSAMPLENR ,       70     },
-{       295*OVERSAMPLENR ,       80     },
-{       304*OVERSAMPLENR ,       90     },
-{       312*OVERSAMPLENR ,       100     },
-{       320*OVERSAMPLENR ,       110     },
-{       329*OVERSAMPLENR ,       120     },
-{       337*OVERSAMPLENR ,       130     },
-{       345*OVERSAMPLENR ,       140     },
-{       353*OVERSAMPLENR ,       150     },
-{       361*OVERSAMPLENR ,       160     },
-{       369*OVERSAMPLENR ,       170     },
-{       377*OVERSAMPLENR ,       180     },
-{       385*OVERSAMPLENR ,       190     },
-{       393*OVERSAMPLENR ,       200     },
-{       401*OVERSAMPLENR ,       210     },
-{       409*OVERSAMPLENR ,       220     },
-{       417*OVERSAMPLENR ,       230     },
-{       424*OVERSAMPLENR ,       240     },
-{       432*OVERSAMPLENR ,       250     },
-{       440*OVERSAMPLENR ,       260     },
-{       447*OVERSAMPLENR ,       270     },
-{       455*OVERSAMPLENR ,       280     },
-{       463*OVERSAMPLENR ,       290     },
-{       470*OVERSAMPLENR ,       300     },
-{       478*OVERSAMPLENR ,       310     },
-{       485*OVERSAMPLENR ,       320     },
-{       493*OVERSAMPLENR ,       330     },
-{       500*OVERSAMPLENR ,       340     },
-{       507*OVERSAMPLENR ,       350     },
-{       515*OVERSAMPLENR ,       360     },
-{       522*OVERSAMPLENR ,       370     },
-{       529*OVERSAMPLENR ,       380     },
-{       537*OVERSAMPLENR ,       390     },
-{       544*OVERSAMPLENR ,       400     },
-{       614*OVERSAMPLENR ,       500     },
-{       681*OVERSAMPLENR ,       600     },
-{       744*OVERSAMPLENR ,       700     },
-{       805*OVERSAMPLENR ,       800     },
-{       862*OVERSAMPLENR ,       900     },
-{       917*OVERSAMPLENR ,       1000     },
-{       968*OVERSAMPLENR ,       1100     }
+   {0 * OVERSAMPLENR,  0},
+  {227 * OVERSAMPLENR,  1},
+  {236 * OVERSAMPLENR,  10},
+  {245 * OVERSAMPLENR,  20},
+  {253 * OVERSAMPLENR,  30},
+  {262 * OVERSAMPLENR,  40},
+  {270 * OVERSAMPLENR,  50},
+  {279 * OVERSAMPLENR,  60},
+  {287 * OVERSAMPLENR,  70},
+  {295 * OVERSAMPLENR,  80},
+  {304 * OVERSAMPLENR,  90},
+  {312 * OVERSAMPLENR,  100},
+  {320 * OVERSAMPLENR,  110},
+  {329 * OVERSAMPLENR,  120},
+  {337 * OVERSAMPLENR,  130},
+  {345 * OVERSAMPLENR,  140},
+  {353 * OVERSAMPLENR,  150},
+  {361 * OVERSAMPLENR,  160},
+  {369 * OVERSAMPLENR,  170},
+  {377 * OVERSAMPLENR,  180},
+  {385 * OVERSAMPLENR,  190},
+  {393 * OVERSAMPLENR,  200},
+  {401 * OVERSAMPLENR,  210},
+  {409 * OVERSAMPLENR,  220},
+  {417 * OVERSAMPLENR,  230},
+  {424 * OVERSAMPLENR,  240},
+  {432 * OVERSAMPLENR,  250},
+  {440 * OVERSAMPLENR,  260},
+  {447 * OVERSAMPLENR,  270},
+  {455 * OVERSAMPLENR,  280},
+  {463 * OVERSAMPLENR,  290},
+  {470 * OVERSAMPLENR,  300},
+  {478 * OVERSAMPLENR,  310},
+  {485 * OVERSAMPLENR,  320},
+  {493 * OVERSAMPLENR,  330},
+  {500 * OVERSAMPLENR,  340},
+  {507 * OVERSAMPLENR,  350},
+  {515 * OVERSAMPLENR,  360},
+  {522 * OVERSAMPLENR,  370},
+  {529 * OVERSAMPLENR,  380},
+  {537 * OVERSAMPLENR,  390},
+  {544 * OVERSAMPLENR,  400},
+  {614 * OVERSAMPLENR,  500},
+  {681 * OVERSAMPLENR,  600},
+  {744 * OVERSAMPLENR,  700},
+  {805 * OVERSAMPLENR,  800},
+  {862 * OVERSAMPLENR,  900},
+  {917 * OVERSAMPLENR,  1000},
+  {968 * OVERSAMPLENR,  1100}
 };
 #endif
 
 #if (THERMISTORHEATER_0 == 51) || (THERMISTORHEATER_1 == 51) || (THERMISTORHEATER_2 == 51) || (THERMISTORHEATER_3 == 51) || (THERMISTORBED == 51)
-// 100k EPCOS (WITH 1kohm RESISTOR FOR PULLUP, R9 ON SANGUINOLOLU! NOT FOR 4.7kohm PULLUP! THIS IS NOT NORMAL!)
+// 100k EPCOS (WITH 1kohm RESISTOR FOR PULLUP,R9 ON SANGUINOLOLU! NOT FOR 4.7kohm PULLUP! THIS IS NOT NORMAL!)
 // Verified by linagee.
-// Calculated using 1kohm pullup, voltage divider math, and manufacturer provided temp/resistance
+// Calculated using 1kohm pullup,voltage divider math,and manufacturer provided temp/resistance
 // Advantage: Twice the resolution and better linearity from 150C to 200C
 const short temptable_51[][2] PROGMEM = {
-   {1*OVERSAMPLENR, 350},
-   {190*OVERSAMPLENR, 250}, //top rating 250C
-   {203*OVERSAMPLENR, 245},
-   {217*OVERSAMPLENR, 240},
-   {232*OVERSAMPLENR, 235},
-   {248*OVERSAMPLENR, 230},
-   {265*OVERSAMPLENR, 225},
-   {283*OVERSAMPLENR, 220},
-   {302*OVERSAMPLENR, 215},
-   {322*OVERSAMPLENR, 210},
-   {344*OVERSAMPLENR, 205},
-   {366*OVERSAMPLENR, 200},
-   {390*OVERSAMPLENR, 195},
-   {415*OVERSAMPLENR, 190},
-   {440*OVERSAMPLENR, 185},
-   {467*OVERSAMPLENR, 180},
-   {494*OVERSAMPLENR, 175},
-   {522*OVERSAMPLENR, 170},
-   {551*OVERSAMPLENR, 165},
-   {580*OVERSAMPLENR, 160},
-   {609*OVERSAMPLENR, 155},
-   {638*OVERSAMPLENR, 150},
-   {666*OVERSAMPLENR, 145},
-   {695*OVERSAMPLENR, 140},
-   {722*OVERSAMPLENR, 135},
-   {749*OVERSAMPLENR, 130},
-   {775*OVERSAMPLENR, 125},
-   {800*OVERSAMPLENR, 120},
-   {823*OVERSAMPLENR, 115},
-   {845*OVERSAMPLENR, 110},
-   {865*OVERSAMPLENR, 105},
-   {884*OVERSAMPLENR, 100},
-   {901*OVERSAMPLENR, 95},
-   {917*OVERSAMPLENR, 90},
-   {932*OVERSAMPLENR, 85},
-   {944*OVERSAMPLENR, 80},
-   {956*OVERSAMPLENR, 75},
-   {966*OVERSAMPLENR, 70},
-   {975*OVERSAMPLENR, 65},
-   {982*OVERSAMPLENR, 60},
-   {989*OVERSAMPLENR, 55},
-   {995*OVERSAMPLENR, 50},
-   {1000*OVERSAMPLENR, 45},
-   {1004*OVERSAMPLENR, 40},
-   {1007*OVERSAMPLENR, 35},
-   {1010*OVERSAMPLENR, 30},
-   {1013*OVERSAMPLENR, 25},
-   {1015*OVERSAMPLENR, 20},
-   {1017*OVERSAMPLENR, 15},
-   {1018*OVERSAMPLENR, 10},
-   {1019*OVERSAMPLENR, 5},
-   {1020*OVERSAMPLENR, 0},
-   {1021*OVERSAMPLENR, -5}
+  {1 * OVERSAMPLENR,  350},
+  {190 * OVERSAMPLENR,  250},//top rating 250C
+  {203 * OVERSAMPLENR,  245},
+  {217 * OVERSAMPLENR,  240},
+  {232 * OVERSAMPLENR,  235},
+  {248 * OVERSAMPLENR,  230},
+  {265 * OVERSAMPLENR,  225},
+  {283 * OVERSAMPLENR,  220},
+  {302 * OVERSAMPLENR,  215},
+  {322 * OVERSAMPLENR,  210},
+  {344 * OVERSAMPLENR,  205},
+  {366 * OVERSAMPLENR,  200},
+  {390 * OVERSAMPLENR,  195},
+  {415 * OVERSAMPLENR,  190},
+  {440 * OVERSAMPLENR,  185},
+  {467 * OVERSAMPLENR,  180},
+  {494 * OVERSAMPLENR,  175},
+  {522 * OVERSAMPLENR,  170},
+  {551 * OVERSAMPLENR,  165},
+  {580 * OVERSAMPLENR,  160},
+  {609 * OVERSAMPLENR,  155},
+  {638 * OVERSAMPLENR,  150},
+  {666 * OVERSAMPLENR,  145},
+  {695 * OVERSAMPLENR,  140},
+  {722 * OVERSAMPLENR,  135},
+  {749 * OVERSAMPLENR,  130},
+  {775 * OVERSAMPLENR,  125},
+  {800 * OVERSAMPLENR,  120},
+  {823 * OVERSAMPLENR,  115},
+  {845 * OVERSAMPLENR,  110},
+  {865 * OVERSAMPLENR,  105},
+  {884 * OVERSAMPLENR,  100},
+  {901 * OVERSAMPLENR,  95},
+  {917 * OVERSAMPLENR,  90},
+  {932 * OVERSAMPLENR,  85},
+  {944 * OVERSAMPLENR,  80},
+  {956 * OVERSAMPLENR,  75},
+  {966 * OVERSAMPLENR,  70},
+  {975 * OVERSAMPLENR,  65},
+  {982 * OVERSAMPLENR,  60},
+  {989 * OVERSAMPLENR,  55},
+  {995 * OVERSAMPLENR,  50},
+  {1000 * OVERSAMPLENR,  45},
+  {1004 * OVERSAMPLENR,  40},
+  {1007 * OVERSAMPLENR,  35},
+  {1010 * OVERSAMPLENR,  30},
+  {1013 * OVERSAMPLENR,  25},
+  {1015 * OVERSAMPLENR,  20},
+  {1017 * OVERSAMPLENR,  15},
+  {1018 * OVERSAMPLENR,  10},
+  {1019 * OVERSAMPLENR,  5},
+  {1020 * OVERSAMPLENR,  0},
+  {1021 * OVERSAMPLENR,  -5}
 };
 #endif
 
 #if (THERMISTORHEATER_0 == 52) || (THERMISTORHEATER_1 == 52) || (THERMISTORHEATER_2 == 52) || (THERMISTORHEATER_3 == 52) || (THERMISTORBED == 52) 
-// 200k ATC Semitec 204GT-2 (WITH 1kohm RESISTOR FOR PULLUP, R9 ON SANGUINOLOLU! NOT FOR 4.7kohm PULLUP! THIS IS NOT NORMAL!)
+// 200k ATC Semitec 204GT-2 (WITH 1kohm RESISTOR FOR PULLUP,R9 ON SANGUINOLOLU! NOT FOR 4.7kohm PULLUP! THIS IS NOT NORMAL!)
 // Verified by linagee. Source: http://shop.arcol.hu/static/datasheets/thermistors.pdf
-// Calculated using 1kohm pullup, voltage divider math, and manufacturer provided temp/resistance
+// Calculated using 1kohm pullup,voltage divider math,and manufacturer provided temp/resistance
 // Advantage: More resolution and better linearity from 150C to 200C
 const short temptable_52[][2] PROGMEM = {
-   {1*OVERSAMPLENR, 500},
-   {125*OVERSAMPLENR, 300}, //top rating 300C
-   {142*OVERSAMPLENR, 290},
-   {162*OVERSAMPLENR, 280},
-   {185*OVERSAMPLENR, 270},
-   {211*OVERSAMPLENR, 260},
-   {240*OVERSAMPLENR, 250},
-   {274*OVERSAMPLENR, 240},
-   {312*OVERSAMPLENR, 230},
-   {355*OVERSAMPLENR, 220},
-   {401*OVERSAMPLENR, 210},
-   {452*OVERSAMPLENR, 200},
-   {506*OVERSAMPLENR, 190},
-   {563*OVERSAMPLENR, 180},
-   {620*OVERSAMPLENR, 170},
-   {677*OVERSAMPLENR, 160},
-   {732*OVERSAMPLENR, 150},
-   {783*OVERSAMPLENR, 140},
-   {830*OVERSAMPLENR, 130},
-   {871*OVERSAMPLENR, 120},
-   {906*OVERSAMPLENR, 110},
-   {935*OVERSAMPLENR, 100},
-   {958*OVERSAMPLENR, 90},
-   {976*OVERSAMPLENR, 80},
-   {990*OVERSAMPLENR, 70},
-   {1000*OVERSAMPLENR, 60},
-   {1008*OVERSAMPLENR, 50},
-   {1013*OVERSAMPLENR, 40},
-   {1017*OVERSAMPLENR, 30},
-   {1019*OVERSAMPLENR, 20},
-   {1021*OVERSAMPLENR, 10},
-   {1022*OVERSAMPLENR, 0}
+  {1 * OVERSAMPLENR,  500},
+  {125 * OVERSAMPLENR,  300},//top rating 300C
+  {142 * OVERSAMPLENR,  290},
+  {162 * OVERSAMPLENR,  280},
+  {185 * OVERSAMPLENR,  270},
+  {211 * OVERSAMPLENR,  260},
+  {240 * OVERSAMPLENR,  250},
+  {274 * OVERSAMPLENR,  240},
+  {312 * OVERSAMPLENR,  230},
+  {355 * OVERSAMPLENR,  220},
+  {401 * OVERSAMPLENR,  210},
+  {452 * OVERSAMPLENR,  200},
+  {506 * OVERSAMPLENR,  190},
+  {563 * OVERSAMPLENR,  180},
+  {620 * OVERSAMPLENR,  170},
+  {677 * OVERSAMPLENR,  160},
+  {732 * OVERSAMPLENR,  150},
+  {783 * OVERSAMPLENR,  140},
+  {830 * OVERSAMPLENR,  130},
+  {871 * OVERSAMPLENR,  120},
+  {906 * OVERSAMPLENR,  110},
+  {935 * OVERSAMPLENR,  100},
+  {958 * OVERSAMPLENR,  90},
+  {976 * OVERSAMPLENR,  80},
+  {990 * OVERSAMPLENR,  70},
+  {1000 * OVERSAMPLENR,  60},
+  {1008 * OVERSAMPLENR,  50},
+  {1013 * OVERSAMPLENR,  40},
+  {1017 * OVERSAMPLENR,  30},
+  {1019 * OVERSAMPLENR,  20},
+  {1021 * OVERSAMPLENR,  10},
+  {1022 * OVERSAMPLENR,  0}
 };
 #endif
 
 #if (THERMISTORHEATER_0 == 55) || (THERMISTORHEATER_1 == 55) || (THERMISTORHEATER_2 == 55) || (THERMISTORHEATER_3 == 55) || (THERMISTORBED == 55) 
-// 100k ATC Semitec 104GT-2 (Used on ParCan) (WITH 1kohm RESISTOR FOR PULLUP, R9 ON SANGUINOLOLU! NOT FOR 4.7kohm PULLUP! THIS IS NOT NORMAL!)
+// 100k ATC Semitec 104GT-2 (Used on ParCan) (WITH 1kohm RESISTOR FOR PULLUP,R9 ON SANGUINOLOLU! NOT FOR 4.7kohm PULLUP! THIS IS NOT NORMAL!)
 // Verified by linagee. Source: http://shop.arcol.hu/static/datasheets/thermistors.pdf
-// Calculated using 1kohm pullup, voltage divider math, and manufacturer provided temp/resistance
+// Calculated using 1kohm pullup,voltage divider math,and manufacturer provided temp/resistance
 // Advantage: More resolution and better linearity from 150C to 200C
 const short temptable_55[][2] PROGMEM = {
-   {1*OVERSAMPLENR, 500},
-   {76*OVERSAMPLENR, 300},
-   {87*OVERSAMPLENR, 290},
-   {100*OVERSAMPLENR, 280},
-   {114*OVERSAMPLENR, 270},
-   {131*OVERSAMPLENR, 260},
-   {152*OVERSAMPLENR, 250},
-   {175*OVERSAMPLENR, 240},
-   {202*OVERSAMPLENR, 230},
-   {234*OVERSAMPLENR, 220},
-   {271*OVERSAMPLENR, 210},
-   {312*OVERSAMPLENR, 200},
-   {359*OVERSAMPLENR, 190},
-   {411*OVERSAMPLENR, 180},
-   {467*OVERSAMPLENR, 170},
-   {527*OVERSAMPLENR, 160},
-   {590*OVERSAMPLENR, 150},
-   {652*OVERSAMPLENR, 140},
-   {713*OVERSAMPLENR, 130},
-   {770*OVERSAMPLENR, 120},
-   {822*OVERSAMPLENR, 110},
-   {867*OVERSAMPLENR, 100},
-   {905*OVERSAMPLENR, 90},
-   {936*OVERSAMPLENR, 80},
-   {961*OVERSAMPLENR, 70},
-   {979*OVERSAMPLENR, 60},
-   {993*OVERSAMPLENR, 50},
-   {1003*OVERSAMPLENR, 40},
-   {1010*OVERSAMPLENR, 30},
-   {1015*OVERSAMPLENR, 20},
-   {1018*OVERSAMPLENR, 10},
-   {1020*OVERSAMPLENR, 0}
+  {1 * OVERSAMPLENR,  500},
+  {76 * OVERSAMPLENR,  300},
+  {87 * OVERSAMPLENR,  290},
+  {100 * OVERSAMPLENR,  280},
+  {114 * OVERSAMPLENR,  270},
+  {131 * OVERSAMPLENR,  260},
+  {152 * OVERSAMPLENR,  250},
+  {175 * OVERSAMPLENR,  240},
+  {202 * OVERSAMPLENR,  230},
+  {234 * OVERSAMPLENR,  220},
+  {271 * OVERSAMPLENR,  210},
+  {312 * OVERSAMPLENR,  200},
+  {359 * OVERSAMPLENR,  190},
+  {411 * OVERSAMPLENR,  180},
+  {467 * OVERSAMPLENR,  170},
+  {527 * OVERSAMPLENR,  160},
+  {590 * OVERSAMPLENR,  150},
+  {652 * OVERSAMPLENR,  140},
+  {713 * OVERSAMPLENR,  130},
+  {770 * OVERSAMPLENR,  120},
+  {822 * OVERSAMPLENR,  110},
+  {867 * OVERSAMPLENR,  100},
+  {905 * OVERSAMPLENR,  90},
+  {936 * OVERSAMPLENR,  80},
+  {961 * OVERSAMPLENR,  70},
+  {979 * OVERSAMPLENR,  60},
+  {993 * OVERSAMPLENR,  50},
+  {1003 * OVERSAMPLENR,  40},
+  {1010 * OVERSAMPLENR,  30},
+  {1015 * OVERSAMPLENR,  20},
+  {1018 * OVERSAMPLENR,  10},
+  {1020 * OVERSAMPLENR,  0}
 };
 #endif
 
@@ -921,126 +921,126 @@ const short temptable_55[][2] PROGMEM = {
 // min adc: 1 at 0.0048828125 V
 // max adc: 1023 at 4.9951171875 V
 const short temptable_60[][2] PROGMEM = {
-   {51*OVERSAMPLENR, 272},
-   {61*OVERSAMPLENR, 258},
-   {71*OVERSAMPLENR, 247},
-   {81*OVERSAMPLENR, 237},
-   {91*OVERSAMPLENR, 229},
-   {101*OVERSAMPLENR, 221},
-   {131*OVERSAMPLENR, 204},
-   {161*OVERSAMPLENR, 190},
-   {191*OVERSAMPLENR, 179},
-   {231*OVERSAMPLENR, 167},
-   {271*OVERSAMPLENR, 157},
-   {311*OVERSAMPLENR, 148},
-   {351*OVERSAMPLENR, 140},
-   {381*OVERSAMPLENR, 135},
-   {411*OVERSAMPLENR, 130},
-   {441*OVERSAMPLENR, 125},
-   {451*OVERSAMPLENR, 123},
-   {461*OVERSAMPLENR, 122},
-   {471*OVERSAMPLENR, 120},
-   {481*OVERSAMPLENR, 119},
-   {491*OVERSAMPLENR, 117},
-   {501*OVERSAMPLENR, 116},
-   {511*OVERSAMPLENR, 114},
-   {521*OVERSAMPLENR, 113},
-   {531*OVERSAMPLENR, 111},
-   {541*OVERSAMPLENR, 110},
-   {551*OVERSAMPLENR, 108},
-   {561*OVERSAMPLENR, 107},
-   {571*OVERSAMPLENR, 105},
-   {581*OVERSAMPLENR, 104},
-   {591*OVERSAMPLENR, 102},
-   {601*OVERSAMPLENR, 101},
-   {611*OVERSAMPLENR, 100},
-   {621*OVERSAMPLENR, 98},
-   {631*OVERSAMPLENR, 97},
-   {641*OVERSAMPLENR, 95},
-   {651*OVERSAMPLENR, 94},
-   {661*OVERSAMPLENR, 92},
-   {671*OVERSAMPLENR, 91},
-   {681*OVERSAMPLENR, 90},
-   {691*OVERSAMPLENR, 88},
-   {701*OVERSAMPLENR, 87},
-   {711*OVERSAMPLENR, 85},
-   {721*OVERSAMPLENR, 84},
-   {731*OVERSAMPLENR, 82},
-   {741*OVERSAMPLENR, 81},
-   {751*OVERSAMPLENR, 79},
-   {761*OVERSAMPLENR, 77},
-   {771*OVERSAMPLENR, 76},
-   {781*OVERSAMPLENR, 74},
-   {791*OVERSAMPLENR, 72},
-   {801*OVERSAMPLENR, 71},
-   {811*OVERSAMPLENR, 69},
-   {821*OVERSAMPLENR, 67},
-   {831*OVERSAMPLENR, 65},
-   {841*OVERSAMPLENR, 63},
-   {851*OVERSAMPLENR, 62},
-   {861*OVERSAMPLENR, 60},
-   {871*OVERSAMPLENR, 57},
-   {881*OVERSAMPLENR, 55},
-   {891*OVERSAMPLENR, 53},
-   {901*OVERSAMPLENR, 51},
-   {911*OVERSAMPLENR, 48},
-   {921*OVERSAMPLENR, 45},
-   {931*OVERSAMPLENR, 42},
-   {941*OVERSAMPLENR, 39},
-   {951*OVERSAMPLENR, 36},
-   {961*OVERSAMPLENR, 32},
-   {981*OVERSAMPLENR, 23},
-   {991*OVERSAMPLENR, 17},
-   {1001*OVERSAMPLENR, 9},
-   {1008*OVERSAMPLENR, 0},
+  {51 * OVERSAMPLENR,  272},
+  {61 * OVERSAMPLENR,  258},
+  {71 * OVERSAMPLENR,  247},
+  {81 * OVERSAMPLENR,  237},
+  {91 * OVERSAMPLENR,  229},
+  {101 * OVERSAMPLENR,  221},
+  {131 * OVERSAMPLENR,  204},
+  {161 * OVERSAMPLENR,  190},
+  {191 * OVERSAMPLENR,  179},
+  {231 * OVERSAMPLENR,  167},
+  {271 * OVERSAMPLENR,  157},
+  {311 * OVERSAMPLENR,  148},
+  {351 * OVERSAMPLENR,  140},
+  {381 * OVERSAMPLENR,  135},
+  {411 * OVERSAMPLENR,  130},
+  {441 * OVERSAMPLENR,  125},
+  {451 * OVERSAMPLENR,  123},
+  {461 * OVERSAMPLENR,  122},
+  {471 * OVERSAMPLENR,  120},
+  {481 * OVERSAMPLENR,  119},
+  {491 * OVERSAMPLENR,  117},
+  {501 * OVERSAMPLENR,  116},
+  {511 * OVERSAMPLENR,  114},
+  {521 * OVERSAMPLENR,  113},
+  {531 * OVERSAMPLENR,  111},
+  {541 * OVERSAMPLENR,  110},
+  {551 * OVERSAMPLENR,  108},
+  {561 * OVERSAMPLENR,  107},
+  {571 * OVERSAMPLENR,  105},
+  {581 * OVERSAMPLENR,  104},
+  {591 * OVERSAMPLENR,  102},
+  {601 * OVERSAMPLENR,  101},
+  {611 * OVERSAMPLENR,  100},
+  {621 * OVERSAMPLENR,  98},
+  {631 * OVERSAMPLENR,  97},
+  {641 * OVERSAMPLENR,  95},
+  {651 * OVERSAMPLENR,  94},
+  {661 * OVERSAMPLENR,  92},
+  {671 * OVERSAMPLENR,  91},
+  {681 * OVERSAMPLENR,  90},
+  {691 * OVERSAMPLENR,  88},
+  {701 * OVERSAMPLENR,  87},
+  {711 * OVERSAMPLENR,  85},
+  {721 * OVERSAMPLENR,  84},
+  {731 * OVERSAMPLENR,  82},
+  {741 * OVERSAMPLENR,  81},
+  {751 * OVERSAMPLENR,  79},
+  {761 * OVERSAMPLENR,  77},
+  {771 * OVERSAMPLENR,  76},
+  {781 * OVERSAMPLENR,  74},
+  {791 * OVERSAMPLENR,  72},
+  {801 * OVERSAMPLENR,  71},
+  {811 * OVERSAMPLENR,  69},
+  {821 * OVERSAMPLENR,  67},
+  {831 * OVERSAMPLENR,  65},
+  {841 * OVERSAMPLENR,  63},
+  {851 * OVERSAMPLENR,  62},
+  {861 * OVERSAMPLENR,  60},
+  {871 * OVERSAMPLENR,  57},
+  {881 * OVERSAMPLENR,  55},
+  {891 * OVERSAMPLENR,  53},
+  {901 * OVERSAMPLENR,  51},
+  {911 * OVERSAMPLENR,  48},
+  {921 * OVERSAMPLENR,  45},
+  {931 * OVERSAMPLENR,  42},
+  {941 * OVERSAMPLENR,  39},
+  {951 * OVERSAMPLENR,  36},
+  {961 * OVERSAMPLENR,  32},
+  {981 * OVERSAMPLENR,  23},
+  {991 * OVERSAMPLENR,  17},
+  {1001 * OVERSAMPLENR,  9},
+  {1008 * OVERSAMPLENR,  0}
 };
 #endif
 #if (THERMISTORBED == 12) 
 //100k 0603 SMD Vishay NTCS0603E3104FXT (4.7k pullup) (calibrated for Makibox hot bed)
 const short temptable_12[][2] PROGMEM = {
-   {35*OVERSAMPLENR, 180}, //top rating 180C
-   {211*OVERSAMPLENR, 140},
-   {233*OVERSAMPLENR, 135},
-   {261*OVERSAMPLENR, 130},
-   {290*OVERSAMPLENR, 125},
-   {328*OVERSAMPLENR, 120},
-   {362*OVERSAMPLENR, 115},
-   {406*OVERSAMPLENR, 110},
-   {446*OVERSAMPLENR, 105},
-   {496*OVERSAMPLENR, 100},
-   {539*OVERSAMPLENR, 95},
-   {585*OVERSAMPLENR, 90},
-   {629*OVERSAMPLENR, 85},
-   {675*OVERSAMPLENR, 80},
-   {718*OVERSAMPLENR, 75},
-   {758*OVERSAMPLENR, 70},
-   {793*OVERSAMPLENR, 65},
-   {822*OVERSAMPLENR, 60},
-   {841*OVERSAMPLENR, 55},
-   {875*OVERSAMPLENR, 50},
-   {899*OVERSAMPLENR, 45},
-   {926*OVERSAMPLENR, 40},
-   {946*OVERSAMPLENR, 35},
-   {962*OVERSAMPLENR, 30},
-   {977*OVERSAMPLENR, 25},
-   {987*OVERSAMPLENR, 20},
-   {995*OVERSAMPLENR, 15},
-   {1001*OVERSAMPLENR, 10},
-   {1010*OVERSAMPLENR, 0},
-   {1023*OVERSAMPLENR, -40},
+  {35 * OVERSAMPLENR,  180},//top rating 180C
+  {211 * OVERSAMPLENR,  140},
+  {233 * OVERSAMPLENR,  135},
+  {261 * OVERSAMPLENR,  130},
+  {290 * OVERSAMPLENR,  125},
+  {328 * OVERSAMPLENR,  120},
+  {362 * OVERSAMPLENR,  115},
+  {406 * OVERSAMPLENR,  110},
+  {446 * OVERSAMPLENR,  105},
+  {496 * OVERSAMPLENR,  100},
+  {539 * OVERSAMPLENR,  95},
+  {585 * OVERSAMPLENR,  90},
+  {629 * OVERSAMPLENR,  85},
+  {675 * OVERSAMPLENR,  80},
+  {718 * OVERSAMPLENR,  75},
+  {758 * OVERSAMPLENR,  70},
+  {793 * OVERSAMPLENR,  65},
+  {822 * OVERSAMPLENR,  60},
+  {841 * OVERSAMPLENR,  55},
+  {875 * OVERSAMPLENR,  50},
+  {899 * OVERSAMPLENR,  45},
+  {926 * OVERSAMPLENR,  40},
+  {946 * OVERSAMPLENR,  35},
+  {962 * OVERSAMPLENR,  30},
+  {977 * OVERSAMPLENR,  25},
+  {987 * OVERSAMPLENR,  20},
+  {995 * OVERSAMPLENR,  15},
+  {1001 * OVERSAMPLENR,  10},
+  {1010 * OVERSAMPLENR,  0},
+  {1023 * OVERSAMPLENR,  -40}
 };
 #endif
 
 // Pt1000 and Pt100 handling
 // 
 // Rt=R0*(1+a*T+b*T*T) [for T>0]
-// a=3.9083E-3, b=-5.775E-7
+// a=3.9083E-3,b=-5.775E-7
 
 #define PtA 3.9083E-3
 #define PtB -5.775E-7
 #define PtRt(T,R0) ((R0)*(1.0+(PtA)*(T)+(PtB)*(T)*(T)))
 #define PtAdVal(T,R0,Rup) (short)(1024/(Rup/PtRt(T,R0)+1))
-#define PtLine(T,R0,Rup) { PtAdVal(T,R0,Rup)*OVERSAMPLENR, T },
+#define PtLine(T,R0,Rup) { PtAdVal(T,R0,Rup) * OVERSAMPLENR,  T},
 
 #if (THERMISTORHEATER_0 == 110) || (THERMISTORHEATER_1 == 110) || (THERMISTORHEATER_2 == 110) || (THERMISTORHEATER_3 == 110) || (THERMISTORBED == 110) // Pt100 with 1k0 pullup
 const short temptable_110[][2] PROGMEM = {
@@ -1102,9 +1102,9 @@ const short temptable_1047[][2] PROGMEM = {
     #define DUMMY_THERMISTOR_999_VALUE 25
   #endif
   const short temptable_999[][2] PROGMEM = {
-    {1*OVERSAMPLENR, DUMMY_THERMISTOR_999_VALUE},
-    {1023*OVERSAMPLENR, DUMMY_THERMISTOR_999_VALUE}
-};
+    {1 * OVERSAMPLENR,  DUMMY_THERMISTOR_999_VALUE},
+    {1023 * OVERSAMPLENR,  DUMMY_THERMISTOR_999_VALUE}
+  };
 #endif
 
 #if (THERMISTORHEATER_0 == 998) || (THERMISTORHEATER_1 == 998) || (THERMISTORHEATER_2 == 998) || (THERMISTORHEATER_3 == 998) || (THERMISTORBED == 998) //User defined table
@@ -1113,9 +1113,9 @@ const short temptable_1047[][2] PROGMEM = {
     #define DUMMY_THERMISTOR_998_VALUE 25
   #endif
   const short temptable_998[][2] PROGMEM = {
-    {1*OVERSAMPLENR, DUMMY_THERMISTOR_998_VALUE},
-    {1023*OVERSAMPLENR, DUMMY_THERMISTOR_998_VALUE}
-};
+    {1 * OVERSAMPLENR,  DUMMY_THERMISTOR_998_VALUE},
+    {1023 * OVERSAMPLENR,  DUMMY_THERMISTOR_998_VALUE}
+  };
 #endif
 
 
@@ -1134,7 +1134,7 @@ const short temptable_1047[][2] PROGMEM = {
 # endif // HEATER_0_USES_THERMISTOR
 #endif
 
-//Set the high and low raw values for the heater, this indicates which raw value is a high or low temperature
+//Set the high and low raw values for the heater,this indicates which raw value is a high or low temperature
 #ifndef HEATER_0_RAW_HI_TEMP
 # ifdef HEATER_0_USES_THERMISTOR   //In case of a thermistor the highest temperature results in the lowest ADC value
 #  define HEATER_0_RAW_HI_TEMP 0
@@ -1157,7 +1157,7 @@ const short temptable_1047[][2] PROGMEM = {
 # endif // HEATER_1_USES_THERMISTOR
 #endif
 
-//Set the high and low raw values for the heater, this indicates which raw value is a high or low temperature
+//Set the high and low raw values for the heater,this indicates which raw value is a high or low temperature
 #ifndef HEATER_1_RAW_HI_TEMP
 # ifdef HEATER_1_USES_THERMISTOR   //In case of a thermistor the highest temperature results in the lowest ADC value
 #  define HEATER_1_RAW_HI_TEMP 0
@@ -1180,7 +1180,7 @@ const short temptable_1047[][2] PROGMEM = {
 # endif // HEATER_2_USES_THERMISTOR
 #endif
 
-//Set the high and low raw values for the heater, this indicates which raw value is a high or low temperature
+//Set the high and low raw values for the heater,this indicates which raw value is a high or low temperature
 #ifndef HEATER_2_RAW_HI_TEMP
 # ifdef HEATER_2_USES_THERMISTOR   //In case of a thermistor the highest temperature results in the lowest ADC value
 #  define HEATER_2_RAW_HI_TEMP 0
@@ -1203,7 +1203,7 @@ const short temptable_1047[][2] PROGMEM = {
 # endif // HEATER_3_USES_THERMISTOR
 #endif
 
-//Set the high and low raw values for the heater, this indicates which raw value is a high or low temperature
+//Set the high and low raw values for the heater,this indicates which raw value is a high or low temperature
 #ifndef HEATER_3_RAW_HI_TEMP
 # ifdef HEATER_3_USES_THERMISTOR   //In case of a thermistor the highest temperature results in the lowest ADC value
 #  define HEATER_3_RAW_HI_TEMP 0
@@ -1223,7 +1223,7 @@ const short temptable_1047[][2] PROGMEM = {
 # endif // BED_USES_THERMISTOR
 #endif
 
-//Set the high and low raw values for the heater, this indicates which raw value is a high or low temperature
+//Set the high and low raw values for the heater,this indicates which raw value is a high or low temperature
 #ifndef HEATER_BED_RAW_HI_TEMP
 # ifdef BED_USES_THERMISTOR   //In case of a thermistor the highest temperature results in the lowest ADC value
 #  define HEATER_BED_RAW_HI_TEMP 0

MarlinKimbra/ultralcd.cpp

@@ -861,6 +861,9 @@ static void lcd_move_y() { _lcd_move(PSTR(MSG_MOVE_Y), Y_AXIS, Y_MIN_POS, Y_MAX_
 static void lcd_move_z() { _lcd_move(PSTR(MSG_MOVE_Z), Z_AXIS, Z_MIN_POS, Z_MAX_POS); }
 static void lcd_move_e() {
   if (encoderPosition != 0) {
+    #if ENABLED(IDLE_OOZING_PREVENT)
+      IDLE_OOZING_retract(false);
+    #endif
     current_position[E_AXIS] += float((int)encoderPosition) * move_menu_scale;
     encoderPosition = 0;
     line_to_current(E_AXIS);
@@ -1021,7 +1024,7 @@ static void lcd_control_temperature_menu() {
   //
   MENU_MULTIPLIER_ITEM_EDIT(int3, MSG_FAN_SPEED, &fanSpeed, 0, 255);
   #if ENABLED(IDLE_OOZING_PREVENT)
-    MENU_ITEM_EDIT(bool, MSG_IDLEOOZING, &idleoozing_enabled);
+    MENU_ITEM_EDIT(bool, MSG_IDLEOOZING, &IDLE_OOZING_enabled);
   #endif
 
   //
@@ -1970,10 +1973,12 @@ char *ftostr32(const float &x) {
 // Convert float to string with 1.234 format
 char *ftostr43(const float &x) {
   long xx = x * 1000;
-    if (xx >= 0)
+  if (xx >= 0) {
     conv[0] = (xx / 1000) % 10 + '0';
-	else
+  }
+  else {
     conv[0] = '-';
+  }
   xx = abs(xx);
   conv[1] = '.';
   conv[2] = (xx / 100) % 10 + '0';
@@ -2589,10 +2594,12 @@ char *ftostr32(const float &x) {
 // Convert float to string with 1.234 format
 char *ftostr43(const float &x) {
   long xx = x * 1000;
-    if (xx >= 0)
+  if (xx >= 0) {
     conv[0] = (xx / 1000) % 10 + '0';
-	else
+  }
+  else {
     conv[0] = '-';
+  }
   xx = abs(xx);
   conv[1] = '.';
   conv[2] = (xx / 100) % 10 + '0';

README.md

 <img align="right" src="Documentation/Logo/MarlinKimbra%20Logo%20GitHub.png" />
 # MarlinKimbra 3D Printer Firmware
-## Version 4.1.3 dev
+## Version 4.1.4 dev
 
   * [Configuration & Compilation](/Documentation/Compilation.md)
   * Supported
@@ -34,16 +34,16 @@ Adding commands to facilitate purging of hotend.
 Step per unit varied for each extruder as well as the feedrate.
 The addition of a different feedrate for retraction. 
 Adding Debug Dryrun used by repetier.
-Add total Power on time write in EEPROM
-
+Added total Power on time writec in SD CARD.
+Added total Power consumption writed in SD CARD.
+Added anti extruder idle oozing system.
 ## Credits
 
 The current MarlinKimbra dev team consists of:
  - MagoKimbra - Alberto Cotronei (https://github.com/MagoKimbra)
 
 More features have been added by:
-  - simone97 (https://github.com/simone97)
-  -
+ - simonepri - Simone Primarosa (https://github.com/simonepri)
 
 ## License