marco/qmk
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove ARM pgm_read_word workaround in rgblight (#16961)

Browse Source
This commit is contained in:
Joel Challis 2022-04-29 07:58:55 +01:00 committed by GitHub
parent 6e819945ed
commit ef8db9f104
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
quantum/rgblight/rgblight.c
View File

@ -559,12 +559,8 @@ void rgblight_sethsv_eeprom_helper(uint8_t hue, uint8_t sat, uint8_t val, bool w
// static gradient // static gradient
uint8_t delta = rgblight_config.mode - rgblight_status.base_mode; uint8_t delta = rgblight_config.mode - rgblight_status.base_mode;
bool direction = (delta % 2) == 0; bool direction = (delta % 2) == 0;
# ifdef __AVR__
// probably due to how pgm_read_word is defined for ARM, but the ARM compiler really hates this line uint8_t range = pgm_read_byte(&RGBLED_GRADIENT_RANGES[delta / 2]);
uint8_t range = pgm_read_word(&RGBLED_GRADIENT_RANGES[delta / 2]);
# else
uint8_t range = RGBLED_GRADIENT_RANGES[delta / 2];
# endif
for (uint8_t i = 0; i < rgblight_ranges.effect_num_leds; i++) { for (uint8_t i = 0; i < rgblight_ranges.effect_num_leds; i++) {
uint8_t _hue = ((uint16_t)i * (uint16_t)range) / rgblight_ranges.effect_num_leds; uint8_t _hue = ((uint16_t)i * (uint16_t)range) / rgblight_ranges.effect_num_leds;
if (direction) { if (direction) {