CMS/Marlin
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Move vsnprintf_P to Marduino.h

Browse Source
This commit is contained in:
Scott Lahteine 2019-07-10 06:02:10 -05:00
parent f7de453da8
commit cf9ac4c847
4 changed files with 5 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Marlin/src/HAL/HAL_DUE/HAL.h
View File

@ -68,10 +68,6 @@
#define strncpy_P(dest, src, num) strncpy((dest), (src), (num)) #define strncpy_P(dest, src, num) strncpy((dest), (src), (num))
#endif #endif
#ifndef vsnprintf_P
#define vsnprintf_P vsnprintf
#endif
// Fix bug in pgm_read_ptr // Fix bug in pgm_read_ptr
#undef pgm_read_ptr #undef pgm_read_ptr
#define pgm_read_ptr(addr) (*((void**)(addr))) #define pgm_read_ptr(addr) (*((void**)(addr)))

4
Marlin/src/HAL/HAL_STM32F1/HAL.h
View File

@ -28,10 +28,6 @@
#define CPU_32_BIT #define CPU_32_BIT
#ifndef vsnprintf_P
#define vsnprintf_P vsnprintf
#endif
#include "../../core/macros.h" #include "../../core/macros.h"
#include "../shared/Marduino.h" #include "../shared/Marduino.h"
#include "../shared/math_32bit.h" #include "../shared/math_32bit.h"

4
Marlin/src/HAL/HAL_STM32F4/HAL.h
View File

@ -24,10 +24,6 @@
#define CPU_32_BIT #define CPU_32_BIT
#ifndef vsnprintf_P
#define vsnprintf_P vsnprintf
#endif
#include "../shared/Marduino.h" #include "../shared/Marduino.h"
#include "../shared/math_32bit.h" #include "../shared/math_32bit.h"
#include "../shared/HAL_SPI.h" #include "../shared/HAL_SPI.h"

5
Marlin/src/HAL/shared/Marduino.h
View File

@ -29,6 +29,7 @@
#undef M_PI // Redefined by all #undef M_PI // Redefined by all
#undef _BV // Redefined by some #undef _BV // Redefined by some
#undef sq // Redefined by teensy3/wiring.h #undef sq // Redefined by teensy3/wiring.h
#undef vsnprintf_P // Defined by avr/pgmspace.h in some platforms
#include <Arduino.h> // NOTE: If included earlier then this line is a NOOP #include <Arduino.h> // NOTE: If included earlier then this line is a NOOP
@ -41,6 +42,10 @@
#undef sq #undef sq
#define sq(x) ((x)*(x)) #define sq(x) ((x)*(x))
#ifndef vsnprintf_P
#define vsnprintf_P vsnprintf
#endif
#ifndef SBI #ifndef SBI
#define SBI(A,B) (A |= (1 << (B))) #define SBI(A,B) (A |= (1 << (B)))
#endif #endif