From 5b015907aabba38e093662e79a1f2c8dc7247b61 Mon Sep 17 00:00:00 2001 From: Robert Pelnar Date: Sun, 20 May 2018 13:15:46 +0200 Subject: [PATCH] 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])