diff options
| author |  Chris Browne <cbbrowne@hpaq.int.linuxdatabases.info> | 2016-10-10 17:18:15 -0400 |
|---|---|---|
| committer | Chris Browne <cbbrowne@hpaq.int.linuxdatabases.info> | 2016-10-10 17:18:15 -0400 |
| commit | 4b682ea63e2b3dd0bc1132917be7985ce0da57a6 (patch) | |
| tree | 6d79874c5542148c27907511ecdb2e9e5e12b24b /tmk_core/common/progmem.h | |
| parent | 04759d63ef9b520fc41d76de64bb65198448fc1c (diff) | |
| parent | a9df99b81c787862dc3fa11bd854fe39e704da81 (diff) | |
| download | qmk_firmware-4b682ea63e2b3dd0bc1132917be7985ce0da57a6.tar.gz | |
Merge branch 'master' of github.com:cbbrowne/qmk_firmware
Diffstat (limited to 'tmk_core/common/progmem.h')
| -rw-r--r-- | tmk_core/common/progmem.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tmk_core/common/progmem.h b/tmk_core/common/progmem.h index 199b1bedf..5b2765625 100644 --- a/tmk_core/common/progmem.h +++ b/tmk_core/common/progmem.h @@ -5,8 +5,8 @@ # include <avr/pgmspace.h> #elif defined(__arm__) # define PROGMEM -# define pgm_read_byte(p) *(p) -# define pgm_read_word(p) *(p) +# define pgm_read_byte(p) *((unsigned char*)p) +# define pgm_read_word(p) *((uint16_t*)p) #endif #endif |