diff options
| author | James Young <18669334+noroadsleft@users.noreply.github.com> | 2020-11-28 12:02:18 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-11-28 12:02:18 -0800 |
| commit | c66df1664497546f32662409778731143e45a552 (patch) | |
| tree | da73a2d532a27685a31d932b3a44a707d4a3af81 /quantum/backlight/backlight_avr.c | |
| parent | 15385d4113414d42bd062c60c9de5df797d3157f (diff) | |
| download | qmk_firmware-c66df1664497546f32662409778731143e45a552.tar.gz qmk_firmware-c66df1664497546f32662409778731143e45a552.zip | |
2020 November 28 Breaking Changes Update (#11053)
* Branch point for 2020 November 28 Breaking Change
* Remove matrix_col_t to allow MATRIX_ROWS > 32 (#10183)
* Add support for soft serial to ATmega32U2 (#10204)
* Change MIDI velocity implementation to allow direct control of velocity value (#9940)
* Add ability to build a subset of all keyboards based on platform.
* Actually use eeprom_driver_init().
* Make bootloader_jump weak for ChibiOS. (#10417)
* Joystick 16-bit support (#10439)
* Per-encoder resolutions (#10259)
* Share button state from mousekey to pointing_device (#10179)
* Add hotfix for chibios keyboards not wake (#10088)
* Add advanced/efficient RGB Matrix Indicators (#8564)
* Naming change.
* Support for STM32 GPIOF,G,H,I,J,K (#10206)
* Add milc as a dependency and remove the installed milc (#10563)
* ChibiOS upgrade: early init conversions (#10214)
* ChibiOS upgrade: configuration file migrator (#9952)
* Haptic and solenoid cleanup (#9700)
* XD75 cleanup (#10524)
* OLED display update interval support (#10388)
* Add definition based on currently-selected serial driver. (#10716)
* New feature: Retro Tapping per key (#10622)
* Allow for modification of output RGB values when using rgblight/rgb_matrix. (#10638)
* Add housekeeping task callbacks so that keyboards/keymaps are capable of executing code for each main loop iteration. (#10530)
* Rescale both ChibiOS and AVR backlighting.
* Reduce Helix keyboard build variation (#8669)
* Minor change to behavior allowing display updates to continue between task ticks (#10750)
* Some GPIO manipulations in matrix.c change to atomic. (#10491)
* qmk cformat (#10767)
* [Keyboard] Update the Speedo firmware for v3.0 (#10657)
* Maartenwut/Maarten namechange to evyd13/Evy (#10274)
* [quantum] combine repeated lines of code (#10837)
* Add step sequencer feature (#9703)
* aeboards/ext65 refactor (#10820)
* Refactor xelus/dawn60 for Rev2 later (#10584)
* add DEBUG_MATRIX_SCAN_RATE_ENABLE to common_features.mk (#10824)
* [Core] Added `add_oneshot_mods` & `del_oneshot_mods` (#10549)
* update chibios os usb for the otg driver (#8893)
* Remove HD44780 References, Part 4 (#10735)
* [Keyboard] Add Valor FRL TKL (+refactor) (#10512)
* Fix cursor position bug in oled_write_raw functions (#10800)
* Fixup version.h writing when using SKIP_VERSION=yes (#10972)
* Allow for certain code in the codebase assuming length of string. (#10974)
* Add AT90USB support for serial.c (#10706)
* Auto shift: support repeats and early registration (#9826)
* Rename ledmatrix.h to match .c file (#7949)
* Split RGB_MATRIX_ENABLE into _ENABLE and _DRIVER (#10231)
* Split LED_MATRIX_ENABLE into _ENABLE and _DRIVER (#10840)
* Merge point for 2020 Nov 28 Breaking Change
Diffstat (limited to 'quantum/backlight/backlight_avr.c')
| -rw-r--r-- | quantum/backlight/backlight_avr.c | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/quantum/backlight/backlight_avr.c b/quantum/backlight/backlight_avr.c index b3e882ffe..4d66da80b 100644 --- a/quantum/backlight/backlight_avr.c +++ b/quantum/backlight/backlight_avr.c | |||
| @@ -3,6 +3,11 @@ | |||
| 3 | #include "backlight_driver_common.h" | 3 | #include "backlight_driver_common.h" |
| 4 | #include "debug.h" | 4 | #include "debug.h" |
| 5 | 5 | ||
| 6 | // Maximum duty cycle limit | ||
| 7 | #ifndef BACKLIGHT_LIMIT_VAL | ||
| 8 | # define BACKLIGHT_LIMIT_VAL 255 | ||
| 9 | #endif | ||
| 10 | |||
| 6 | // This logic is a bit complex, we support 3 setups: | 11 | // This logic is a bit complex, we support 3 setups: |
| 7 | // | 12 | // |
| 8 | // 1. Hardware PWM when backlight is wired to a PWM pin. | 13 | // 1. Hardware PWM when backlight is wired to a PWM pin. |
| @@ -240,6 +245,9 @@ static uint16_t cie_lightness(uint16_t v) { | |||
| 240 | } | 245 | } |
| 241 | } | 246 | } |
| 242 | 247 | ||
| 248 | // rescale the supplied backlight value to be in terms of the value limit | ||
| 249 | static uint32_t rescale_limit_val(uint32_t val) { return (val * (BACKLIGHT_LIMIT_VAL + 1)) / 256; } | ||
| 250 | |||
| 243 | // range for val is [0..TIMER_TOP]. PWM pin is high while the timer count is below val. | 251 | // range for val is [0..TIMER_TOP]. PWM pin is high while the timer count is below val. |
| 244 | static inline void set_pwm(uint16_t val) { OCRxx = val; } | 252 | static inline void set_pwm(uint16_t val) { OCRxx = val; } |
| 245 | 253 | ||
| @@ -269,7 +277,7 @@ void backlight_set(uint8_t level) { | |||
| 269 | #endif | 277 | #endif |
| 270 | } | 278 | } |
| 271 | // Set the brightness | 279 | // Set the brightness |
| 272 | set_pwm(cie_lightness(TIMER_TOP * (uint32_t)level / BACKLIGHT_LEVELS)); | 280 | set_pwm(cie_lightness(rescale_limit_val(TIMER_TOP * (uint32_t)level / BACKLIGHT_LEVELS))); |
| 273 | } | 281 | } |
| 274 | 282 | ||
| 275 | void backlight_task(void) {} | 283 | void backlight_task(void) {} |
| @@ -375,7 +383,7 @@ ISR(TIMERx_OVF_vect) | |||
| 375 | breathing_interrupt_disable(); | 383 | breathing_interrupt_disable(); |
| 376 | } | 384 | } |
| 377 | 385 | ||
| 378 | set_pwm(cie_lightness(scale_backlight((uint16_t)pgm_read_byte(&breathing_table[index]) * 0x0101U))); | 386 | set_pwm(cie_lightness(rescale_limit_val(scale_backlight((uint16_t)pgm_read_byte(&breathing_table[index]) * 0x0101U)))); |
| 379 | } | 387 | } |
| 380 | 388 | ||
| 381 | #endif // BACKLIGHT_BREATHING | 389 | #endif // BACKLIGHT_BREATHING |