diff options
| author | tmk <nobody@nowhere> | 2014-11-24 15:36:53 +0900 |
|---|---|---|
| committer | tmk <nobody@nowhere> | 2014-11-24 15:36:53 +0900 |
| commit | ed52ebb9870a26496b13a0565c1aaca8ded3465b (patch) | |
| tree | cddad806a3408e05bc29310254c564ee94e3e710 /common/action_macro.h | |
| parent | eb90ed6238426db9367e294abfaefb5de07564f5 (diff) | |
| parent | e2077cad45f1736e878e317c43bd94117c61b5e0 (diff) | |
| download | qmk_firmware-ed52ebb9870a26496b13a0565c1aaca8ded3465b.tar.gz qmk_firmware-ed52ebb9870a26496b13a0565c1aaca8ded3465b.zip | |
Merge branch 'merge_rn42'
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; |