diff options
| author | tmk <nobody@nowhere> | 2014-07-30 14:37:05 +0900 |
|---|---|---|
| committer | tmk <nobody@nowhere> | 2014-07-30 14:37:05 +0900 |
| commit | adbb86b1ec8b07e86ae7425374e95b82122e48a7 (patch) | |
| tree | 0a02e89376f69ef975096af9490034725d8eb751 /common/action_macro.h | |
| parent | 79840c678e13f9a737f80048bc3b9c9c55e3fc77 (diff) | |
| parent | a9f5f201ad6b009675fdf16c4447033cc2ac0995 (diff) | |
Merge branch 'mbed' into dev
Diffstat (limited to 'common/action_macro.h')
| -rw-r--r-- | common/action_macro.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/common/action_macro.h b/common/action_macro.h index 6218263088..aedc32ec6b 100644 --- a/common/action_macro.h +++ b/common/action_macro.h @@ -17,12 +17,12 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #ifndef ACTION_MACRO_H #define ACTION_MACRO_H #include <stdint.h> -#include <avr/pgmspace.h> +#include "progmem.h" -#define MACRO_NONE 0 -#define MACRO(...) ({ static const macro_t __m[] PROGMEM = { __VA_ARGS__ }; &__m[0]; }) - +#define MACRO_NONE 0 +#define MACRO(...) ({ static const macro_t __m[] PROGMEM = { __VA_ARGS__ }; &__m[0]; }) +#define MACRO_GET(p) pgm_read_byte(p) typedef uint8_t macro_t; |