Move PID_dT to temperature.cpp

MarlinKimbra/Configuration.h

@@ -243,8 +243,6 @@
   #define PID_INTEGRAL_DRIVE_MAX PID_MAX
   // Smoothing factor within the PID
   #define K1 0.95
-  // Sampling period of the temperature routine
-  #define PID_dT ((OVERSAMPLENR * 12.0)/(F_CPU / 64.0 / 256.0))
 
 //             HotEnd{HE0,HE1,HE2,HE3}
   #define DEFAULT_Kp {41,41,41,41}     // Kp for E0, E1, E2, E3

MarlinKimbra/language_fr.h

@@ -21,16 +21,14 @@
 #define MSG_PREHEAT_PLA0                    "Prechauff. PLA 1"
 #define MSG_PREHEAT_PLA1                    "Prechauff. PLA 2"
 #define MSG_PREHEAT_PLA2                    "Prechauff. PLA 3"
-#define MSG_PREHEAT_PLA3                    "Prechauff. PLA 4"
-#define MSG_PREHEAT_PLA0123                 "Prech. PLA Tout"
+#define MSG_PREHEAT_PLA012                  "Prech. PLA Tout"
 #define MSG_PREHEAT_PLA_BEDONLY             "Prech. PLA Plateau"
 #define MSG_PREHEAT_PLA_SETTINGS            "Regl. prech. PLA"
 #define MSG_PREHEAT_ABS                     "Prechauffage ABS"
 #define MSG_PREHEAT_ABS0                    "Prechauff. ABS 1"
 #define MSG_PREHEAT_ABS1                    "Prechauff. ABS 2"
 #define MSG_PREHEAT_ABS2                    "Prechauff. ABS 3"
-#define MSG_PREHEAT_ABS3                    "Prechauff. ABS 4"
-#define MSG_PREHEAT_ABS0123                  "Prech. ABS Tout"
+#define MSG_PREHEAT_ABS012                  "Prech. ABS Tout"
 #define MSG_PREHEAT_ABS_BEDONLY             "Prech. ABS Plateau"
 #define MSG_PREHEAT_ABS_SETTINGS            "Regl. prech. ABS"
 #define MSG_COOLDOWN                        "Refroidir"
@@ -45,7 +43,6 @@
 #define MSG_MOVE_E                          "Extruder"
 #define MSG_MOVE_E1                         "Extruder2"
 #define MSG_MOVE_E2                         "Extruder3"
-#define MSG_MOVE_E3                         "Extruder4"
 #define MSG_MOVE_01MM                       "Move 0.1mm"
 #define MSG_MOVE_1MM                        "Move 1mm"
 #define MSG_MOVE_10MM                       "Move 10mm"
@@ -53,14 +50,12 @@
 #define MSG_NOZZLE                          "Buse"
 #define MSG_NOZZLE1                         "Buse2"
 #define MSG_NOZZLE2                         "Buse3"
-#define MSG_NOZZLE3                         "Buse4"
 #define MSG_BED                             "Plateau"
 #define MSG_FAN_SPEED                       "Vite. ventilateur"
 #define MSG_FLOW                            "Flux"
 #define MSG_FLOW0                           "Flux 0"
 #define MSG_FLOW1                           "Flux 1"
 #define MSG_FLOW2                           "Flux 2"
-#define MSG_FLOW3                           "Flux 3"
 #define MSG_CONTROL                         "Controler"
 #define MSG_MIN                             " \002 Min"
 #define MSG_MAX                             " \002 Max"
@@ -71,20 +66,12 @@
 #define MSG_PID_P                           "PID-P"
 #define MSG_PID_I                           "PID-I"
 #define MSG_PID_D                           "PID-D"
-#define MSG_PID_P1                          "PID-P E2"
-#define MSG_PID_I1                          "PID-I E2"
-#define MSG_PID_D1                          "PID-D E2"
-#define MSG_PID_P2                          "PID-P E3"
-#define MSG_PID_I2                          "PID-I E3"
-#define MSG_PID_D2                          "PID-D E3"
-#define MSG_PID_P3                          "PID-P E4"
-#define MSG_PID_I3                          "PID-I E4"
-#define MSG_PID_D3                          "PID-D E4"
+#define MSG_PID_C                           "PID-C"
 #define MSG_ACC                             "Accel"
 #define MSG_VXY_JERK                        "Vxy-jerk"
 #define MSG_VZ_JERK                         "Vz-jerk"
 #define MSG_VE_JERK                         "Ve-jerk"
-#define MSG_VMAX                            "Vmax "
+#define MSG_VMAX                            "Vmax"
 #define MSG_X                               "x"
 #define MSG_Y                               "y"
 #define MSG_Z                               "z"
@@ -96,18 +83,9 @@
 #define MSG_XSTEPS                          "Xpas/mm"
 #define MSG_YSTEPS                          "Ypas/mm"
 #define MSG_ZSTEPS                          "Zpas/mm"
-#define MSG_E0STEPS                         "E0steps/mm"
-#define MSG_E1STEPS                         "E1steps/mm"
-#define MSG_E2STEPS                         "E2steps/mm"
-#define MSG_E3STEPS                         "E3steps/mm"
+#define MSG_ESTEPS                          "Epas/mm"
 #define MSG_TEMPERATURE                     "Temperature"
 #define MSG_MOTION                          "Mouvement"
-#define MSG_VOLUMETRIC                      "Filament"
-#define MSG_VOLUMETRIC_ENABLED              "E in mm3"
-#define MSG_FILAMENT_SIZE_EXTRUDER_0        "Fil. Dia. 1"
-#define MSG_FILAMENT_SIZE_EXTRUDER_1        "Fil. Dia. 2"
-#define MSG_FILAMENT_SIZE_EXTRUDER_2        "Fil. Dia. 3"
-#define MSG_FILAMENT_SIZE_EXTRUDER_3        "Fil. Dia. 4"
 #define MSG_CONTRAST                        "Contraste LCD"
 #define MSG_STORE_EPROM                     "Sauver config"
 #define MSG_LOAD_EPROM                      "Lire config"
@@ -148,37 +126,6 @@
 #define MSG_ENDSTOP_ABORT                   "Butee abandon"
 
 #define MSG_RECTRACT                        "Rectract"
-#define MSG_LASER                           "Laser Preset"
-#define MSG_CONFIG                          "Configuration"
-#define MSG_BAUDRATE                        "Baudrate"
-#define MSG_E_BOWDEN_LENGTH                 "Extrude " STRINGIFY(BOWDEN_LENGTH) "mm"
-#define MSG_R_BOWDEN_LENGTH                 "Retract " STRINGIFY(BOWDEN_LENGTH) "mm"
-#define MSG_PURGE_XMM                       "Purge " STRINGIFY(LCD_PURGE_LENGTH) "mm"
-#define MSG_RETRACT_XMM                     "Retract " STRINGIFY(LCD_RETRACT_LENGTH) "mm"
-
-#ifdef DELTA
-  #define MSG_DELTA_CALIBRATE             "Delta Calibration"
-  #define MSG_DELTA_CALIBRATE_X           "Calibrate X"
-  #define MSG_DELTA_CALIBRATE_Y           "Calibrate Y"
-  #define MSG_DELTA_CALIBRATE_Z           "Calibrate Z"
-  #define MSG_DELTA_CALIBRATE_CENTER      "Calibrate Center"
-#endif // DELTA
-
-#ifdef FIRMWARE_TEST
-#define MSG_FWTEST_YES                      "Put the Y command to go next"
-#define MSG_FWTEST_NO                       "Put the N command to go next"
-#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_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?"
-#define MSG_FWTEST_01                       "Manually move the axes X, Y and Z away from the endstop"
-#define MSG_FWTEST_02                       "Do you want check ENDSTOP?"
-#define MSG_FWTEST_03                       "Start check ENDSTOP"
-#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!"
-#endif // FIRMWARE_TEST
+#define MSG_STEPPER_RELEASED                "RELACHE."
 
 #endif // LANGUAGE_FR_H

MarlinKimbra/temperature.cpp

@@ -39,8 +39,12 @@
 
 
 //===========================================================================
-//=============================public variables============================
+//============================= public variables ============================
 //===========================================================================
+
+// Sampling period of the temperature routine
+#define PID_dT ((OVERSAMPLENR * 12.0)/(F_CPU / 64.0 / 256.0))
+
 #ifndef SINGLENOZZLE
   int target_temperature[EXTRUDERS] = { 0 };
   int current_temperature_raw[EXTRUDERS] = { 0 };