Merge pull request #756 from XPila/MK3-new_lang

Mk3 new lang

Firmware/cmdqueue.h

@@ -2,7 +2,7 @@
 #define CMDQUEUE_H
 
 #include "Marlin.h"
-#include "language_all.h"
+#include "language.h"
 
 
 // String circular buffer. Commands may be pushed to the buffer from both sides:

Firmware/mesh_bed_calibration.cpp

@@ -1,7 +1,7 @@
 #include "Marlin.h"
 #include "Configuration.h"
 #include "ConfigurationStore.h"
-#include "language_all.h"
+#include "language.h"
 #include "mesh_bed_calibration.h"
 #include "mesh_bed_leveling.h"
 #include "stepper.h"

Firmware/tmc2130.cpp

@@ -76,8 +76,12 @@ bool tmc2130_sg_change = false;
 bool skip_debug_msg = false;
 
 #define DBG(args...) printf_P(args)
+#ifndef _n
 #define _n PSTR
+#endif //_n
+#ifndef _i
 #define _i PSTR
+#endif //_i
 
 //TMC2130 registers
 #define TMC2130_REG_GCONF      0x00 // 17 bits

Firmware/xyzcal.cpp

@@ -21,7 +21,9 @@
 
 #define DBG(args...) printf_P(args)
 //#define DBG(args...)
+#ifndef _n
 #define _n PSTR
+#endif //_n
 
 #define _X ((int16_t)count_position[X_AXIS])
 #define _Y ((int16_t)count_position[Y_AXIS])