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_chibios.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_chibios.c')
| -rw-r--r-- | quantum/backlight/backlight_chibios.c | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/quantum/backlight/backlight_chibios.c b/quantum/backlight/backlight_chibios.c index 0fe812bf2..4d5a69e14 100644 --- a/quantum/backlight/backlight_chibios.c +++ b/quantum/backlight/backlight_chibios.c | |||
| @@ -3,6 +3,11 @@ | |||
| 3 | #include <hal.h> | 3 | #include <hal.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 | // GPIOV2 && GPIOV3 | 11 | // GPIOV2 && GPIOV3 |
| 7 | #ifndef BACKLIGHT_PAL_MODE | 12 | #ifndef BACKLIGHT_PAL_MODE |
| 8 | # define BACKLIGHT_PAL_MODE 2 | 13 | # define BACKLIGHT_PAL_MODE 2 |
| @@ -58,6 +63,11 @@ static uint16_t cie_lightness(uint16_t v) { | |||
| 58 | } | 63 | } |
| 59 | } | 64 | } |
| 60 | 65 | ||
| 66 | static uint32_t rescale_limit_val(uint32_t val) { | ||
| 67 | // rescale the supplied backlight value to be in terms of the value limit | ||
| 68 | return (val * (BACKLIGHT_LIMIT_VAL + 1)) / 256; | ||
| 69 | } | ||
| 70 | |||
| 61 | void backlight_init_ports(void) { | 71 | void backlight_init_ports(void) { |
| 62 | #ifdef USE_GPIOV1 | 72 | #ifdef USE_GPIOV1 |
| 63 | palSetPadMode(PAL_PORT(BACKLIGHT_PIN), PAL_PAD(BACKLIGHT_PIN), PAL_MODE_STM32_ALTERNATE_PUSHPULL); | 73 | palSetPadMode(PAL_PORT(BACKLIGHT_PIN), PAL_PAD(BACKLIGHT_PIN), PAL_MODE_STM32_ALTERNATE_PUSHPULL); |
| @@ -85,7 +95,7 @@ void backlight_set(uint8_t level) { | |||
| 85 | pwmDisableChannel(&BACKLIGHT_PWM_DRIVER, BACKLIGHT_PWM_CHANNEL - 1); | 95 | pwmDisableChannel(&BACKLIGHT_PWM_DRIVER, BACKLIGHT_PWM_CHANNEL - 1); |
| 86 | } else { | 96 | } else { |
| 87 | // Turn backlight on | 97 | // Turn backlight on |
| 88 | uint32_t duty = (uint32_t)(cie_lightness(0xFFFF * (uint32_t)level / BACKLIGHT_LEVELS)); | 98 | uint32_t duty = (uint32_t)(cie_lightness(rescale_limit_val(0xFFFF * (uint32_t)level / BACKLIGHT_LEVELS))); |
| 89 | pwmEnableChannel(&BACKLIGHT_PWM_DRIVER, BACKLIGHT_PWM_CHANNEL - 1, PWM_FRACTION_TO_WIDTH(&BACKLIGHT_PWM_DRIVER, 0xFFFF, duty)); | 99 | pwmEnableChannel(&BACKLIGHT_PWM_DRIVER, BACKLIGHT_PWM_CHANNEL - 1, PWM_FRACTION_TO_WIDTH(&BACKLIGHT_PWM_DRIVER, 0xFFFF, duty)); |
| 90 | } | 100 | } |
| 91 | } | 101 | } |
| @@ -129,7 +139,7 @@ void breathing_callback(PWMDriver *pwmp) { | |||
| 129 | static uint16_t breathing_counter = 0; | 139 | static uint16_t breathing_counter = 0; |
| 130 | breathing_counter = (breathing_counter + 1) % (breathing_period * 256); | 140 | breathing_counter = (breathing_counter + 1) % (breathing_period * 256); |
| 131 | uint8_t index = breathing_counter / interval % BREATHING_STEPS; | 141 | uint8_t index = breathing_counter / interval % BREATHING_STEPS; |
| 132 | uint32_t duty = cie_lightness(scale_backlight(breathing_table[index] * 256)); | 142 | uint32_t duty = cie_lightness(rescale_limit_val(scale_backlight(breathing_table[index] * 256))); |
| 133 | 143 | ||
| 134 | chSysLockFromISR(); | 144 | chSysLockFromISR(); |
| 135 | pwmEnableChannelI(pwmp, BACKLIGHT_PWM_CHANNEL - 1, PWM_FRACTION_TO_WIDTH(&BACKLIGHT_PWM_DRIVER, 0xFFFF, duty)); | 145 | pwmEnableChannelI(pwmp, BACKLIGHT_PWM_CHANNEL - 1, PWM_FRACTION_TO_WIDTH(&BACKLIGHT_PWM_DRIVER, 0xFFFF, duty)); |
