bissen21/Marlin_Firmware
1
0
Fork 0
Code Issues Pull Requests Projects Releases 4 Wiki Activity

🎨 Update F string declarations

Browse Source
This commit is contained in:
Scott Lahteine 2021-09-25 18:22:37 -05:00 committed by Scott Lahteine
parent 1de265ea5d
commit 433a27e475
3 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -87,3 +87,10 @@
#endif #endif
#include "progmem.h" #include "progmem.h"
class __FlashStringHelper;
typedef const __FlashStringHelper* FSTR_P;
#ifndef FPSTR
#define FPSTR(S) (reinterpret_cast<FSTR_P>(S))
#endif
#define FTOP(S) (reinterpret_cast<const char*>(S))

3
Marlin/src/HAL/shared/progmem.h
View File

@ -38,7 +38,8 @@
#define PSTR(str) (str) #define PSTR(str) (str)
#endif #endif
#ifndef F #ifndef F
#define F(str) (str) class __FlashStringHelper;
#define F(str) (reinterpret_cast<const __FlashStringHelper *>(PSTR(str)))
#endif #endif
#ifndef _SFR_BYTE #ifndef _SFR_BYTE
#define _SFR_BYTE(n) (n) #define _SFR_BYTE(n) (n)

7
Marlin/src/core/types.h
View File

@ -26,13 +26,6 @@
#include "../inc/MarlinConfigPre.h" #include "../inc/MarlinConfigPre.h"
class __FlashStringHelper;
typedef const __FlashStringHelper* FSTR_P;
#ifndef FPSTR
#define FPSTR(S) (reinterpret_cast<FSTR_P>(S))
#endif
#define FTOP(S) (reinterpret_cast<const char*>(S))
// //
// Conditional type assignment magic. For example... // Conditional type assignment magic. For example...
// //