diff --git a/drivers/oled/oled_driver.c b/drivers/oled/oled_driver.c index cb50c38c4526..ce5c23cc40a6 100644 --- a/drivers/oled/oled_driver.c +++ b/drivers/oled/oled_driver.c @@ -23,9 +23,6 @@ along with this program. If not, see . #include #include "progmem.h" -#ifndef __AVR__ -# define memcpy_P(des, src, len) memcpy(des, src, len) -#endif // Used commands from spec sheet: https://cdn-shop.adafruit.com/datasheets/SSD1306.pdf // for SH1106: https://www.velleman.eu/downloads/29/infosheets/sh1106_datasheet.pdf diff --git a/quantum/rgblight.c b/quantum/rgblight.c index cc35b01ed4d5..6e863e1855d1 100644 --- a/quantum/rgblight.c +++ b/quantum/rgblight.c @@ -37,7 +37,6 @@ #ifdef VELOCIKEY_ENABLE # include "velocikey.h" #endif - #ifndef MIN # define MIN(a, b) (((a) < (b)) ? (a) : (b)) #endif diff --git a/tmk_core/common/progmem.h b/tmk_core/common/progmem.h index a06d0f940fbb..b7e05b6a4b87 100644 --- a/tmk_core/common/progmem.h +++ b/tmk_core/common/progmem.h @@ -4,7 +4,12 @@ # include #else # define PROGMEM +# define memcpy_P(dest, src, n) memcpy(dest, src, n) # define pgm_read_byte(p) *((unsigned char*)(p)) # define pgm_read_word(p) *((uint16_t*)(p)) # define pgm_read_dword(p) *((uint32_t*)(p)) +# define pgm_read_ptr(address_short) *((void*)(address_short)) +# define strcmp_P(s1, s2) strcmp(s1, s2) +# define strcpy_P(dest, src) strcpy(dest, src) +# define strlen_P(src) strlen(src) #endif