fix F macro
This commit is contained in:
parent
7530db5f06
commit
31773cff31
@ -26,7 +26,7 @@
|
|||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
#include <ctype.h>
|
#include <ctype.h>
|
||||||
//#include <pgmspace.h>
|
#include <pgmspace.h>
|
||||||
|
|
||||||
// An inherited class for holding the result of a concatenation. These
|
// An inherited class for holding the result of a concatenation. These
|
||||||
// result objects are assumed to be writable by subsequent concatenations.
|
// result objects are assumed to be writable by subsequent concatenations.
|
||||||
@ -34,9 +34,7 @@ class StringSumHelper;
|
|||||||
|
|
||||||
// an abstract class used as a means to proide a unique pointer type
|
// an abstract class used as a means to proide a unique pointer type
|
||||||
// but really has no body
|
// but really has no body
|
||||||
class __FlashStringHelper;
|
//class __FlashStringHelper;
|
||||||
#define FPSTR(pstr_pointer) (reinterpret_cast<const __FlashStringHelper *>(pstr_pointer))
|
|
||||||
#define F(string_literal) (FPSTR(PSTR(string_literal)))
|
|
||||||
|
|
||||||
// The string class
|
// The string class
|
||||||
class String
|
class String
|
||||||
|
@ -22,7 +22,8 @@
|
|||||||
typedef char __FlashStringHelper;
|
typedef char __FlashStringHelper;
|
||||||
#define PROGMEM
|
#define PROGMEM
|
||||||
#define PSTR(s) (s)
|
#define PSTR(s) (s)
|
||||||
#define F(string_literal) (reinterpret_cast<const __FlashStringHelper *>(PSTR(string_literal)))
|
#define FPSTR(pstr_pointer) ((const char *)(pstr_pointer))
|
||||||
|
#define F(string_literal) (string_literal)
|
||||||
|
|
||||||
#define pgm_read_byte(addr) (*(const unsigned char *)(addr))
|
#define pgm_read_byte(addr) (*(const unsigned char *)(addr))
|
||||||
#define pgm_read_word(addr) (*(const unsigned short *)(addr))
|
#define pgm_read_word(addr) (*(const unsigned short *)(addr))
|
||||||
|
Loading…
Reference in New Issue
Block a user