Henry-Hiles/qmk_userspace
1
0
Fork 0
forked from mirrors/qmk_userspace
Code Pull requests Activity

fixed problem with implicit declaration in quantum/rgblight.c (#8406)

Browse source 
* Update tmk_core/common/progmem.h

Co-Authored-By: Ryan <fauxpark@gmail.com>

* Update quantum/rgblight.c

Co-Authored-By: Ryan <fauxpark@gmail.com>

* fixed problem with implicit declaration in quantum/rgblight.c (#8381)

Co-authored-by: Ryan <fauxpark@gmail.com>
This commit is contained in:
Casper Weiss Bang 2020-03-29 00:35:11 +01:00 • committed by GitHub
commit 13fff52f6b
Failed to generate hash of commit
2 changed files with 8 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

3
drivers/oled/oled_driver.c
View file

@ -23,9 +23,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include <string.h> #include <string.h>
#include "progmem.h" #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 // 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 // for SH1106: https://www.velleman.eu/downloads/29/infosheets/sh1106_datasheet.pdf

11
tmk_core/common/progmem.h
View file

@ -4,7 +4,12 @@
# include <avr/pgmspace.h> # include <avr/pgmspace.h>
#else #else
# define PROGMEM # define PROGMEM
# define pgm_read_byte(p) *((unsigned char*)(p)) # define memcpy_P(dest, src, n) memcpy(dest, src, n)
# define pgm_read_word(p) *((uint16_t*)(p)) # define pgm_read_byte(address_short) *((uint8_t*)(address_short))
# define pgm_read_dword(p) *((uint32_t*)(p)) # define pgm_read_word(address_short) *((uint16_t*)(address_short))
# define pgm_read_dword(address_short) *((uint32_t*)(address_short))
# 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 #endif