From 59f3f9d8ec1950deca5f047d349c4335a9c972f5 Mon Sep 17 00:00:00 2001 From: Robert Pelnar Date: Wed, 9 May 2018 16:55:41 +0200 Subject: [PATCH 1/2] New localization - includes fixed --- Firmware/cmdqueue.h | 2 +- Firmware/mesh_bed_calibration.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Firmware/cmdqueue.h b/Firmware/cmdqueue.h index dad81c94..357e5362 100644 --- a/Firmware/cmdqueue.h +++ b/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: diff --git a/Firmware/mesh_bed_calibration.cpp b/Firmware/mesh_bed_calibration.cpp index 266733c8..6b6eea99 100644 --- a/Firmware/mesh_bed_calibration.cpp +++ b/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" From 5b015907aabba38e093662e79a1f2c8dc7247b61 Mon Sep 17 00:00:00 2001 From: Robert Pelnar Date: Sun, 20 May 2018 13:15:46 +0200 Subject: [PATCH 2/2] New localization - macro declarations fixed --- Firmware/tmc2130.cpp | 4 ++++ Firmware/xyzcal.cpp | 2 ++ 2 files changed, 6 insertions(+) diff --git a/Firmware/tmc2130.cpp b/Firmware/tmc2130.cpp index 33991c07..5f5fe5aa 100644 --- a/Firmware/tmc2130.cpp +++ b/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 diff --git a/Firmware/xyzcal.cpp b/Firmware/xyzcal.cpp index 9eb58fd9..ed3d3210 100644 --- a/Firmware/xyzcal.cpp +++ b/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])