aboutsummaryrefslogtreecommitdiff
path: root/quantum/led_matrix.h
diff options
context:
space:
mode:
authorJames Young <18669334+noroadsleft@users.noreply.github.com>2021-05-29 14:38:50 -0700
committerGitHub <noreply@github.com>2021-05-29 14:38:50 -0700
commit1646c0f26cfa21a7023d404008e4d0aa4917193d (patch)
tree337ab0498a929285a234518fee34a4d9dcf51656 /quantum/led_matrix.h
parentf55e39e8a2246f6f96fd5d4a84a866e2615cde7b (diff)
downloadqmk_firmware-1646c0f26cfa21a7023d404008e4d0aa4917193d.tar.gz
qmk_firmware-1646c0f26cfa21a7023d404008e4d0aa4917193d.zip
2021 May 29 Breaking Changes Update (#13034)
* Add Per Key functionality for AutoShift (#11536) * LED Matrix: Reactive effect buffers & advanced indicators (#12588) * [Keyboard] kint36: switch to sym_eager_pk debouncing (#12626) * [Keyboard] kint2pp: reduce input latency by ≈10ms (#12625) * LED Matrix: Split (#12633) * [CI] Format code according to conventions (#12650) * feat: infinite timeout for leader key (#6580) * feat: implement leader_no_timeout logic * docs(leader_key): infinite leader timeout docs * Format code according to conventions (#12680) * Update ADC driver for STM32F1xx, STM32F3xx, STM32F4xx (#12403) * Fix default ADC_RESOLUTION for ADCv3 (and ADCv4) Recent ChibiOS update removed ADC_CFGR1_RES_10BIT from the ADCv3 headers (that macro should not have been there, because ADCv3 has CFGR instead of CFGR1). Fix the default value for ADC_RESOLUTION to use ADC_CFGR_RES_10BITS if it is defined (that name is used for ADCv3 and ADCv4). * Update ADC docs to match the actually used resolution ADC driver for ChibiOS actually uses the 10-bit resolution by default (probably to match AVR); fix the documentation accordingly. Also add both ADC_CFGR_RES_10BITS and ADC_CFGR1_RES_10BIT constants (these names differ according to the ADC implementation in the particular MCU). * Fix pinToMux() for B12 and B13 on STM32F3xx Testing on STM32F303CCT6 revealed that the ADC mux values for B12 and B13 pins were wrong. * Add support for all possible analog pins on STM32F1xx Added ADC mux values for pins A0...A7, B0, B1, C0...C5 on STM32F1xx (they are the same at least for STM32F103x8 and larger F103 devices, and also F102, F105, F107 families). Actually tested on STM32F103C8T6 (therefore pins C0...C5 were not tested). Pins F6...F10, which are present on STM32F103x[C-G] in 144-pin packages, cannot be supported at the moment, because those pins are connected only to ADC3, but the ChibiOS ADC driver for STM32F1xx supports only ADC1. * Add support for all possible analog pins on STM32F4xx Added ADC mux values for pins A0...A7, B0, B1, C0...C5 and optionally F3...F10 (if STM32_ADC_USE_ADC3 is enabled). These mux values are apparently the same for all F4xx devices, except some smaller devices may not have ADC3. Actually tested on STM32F401CCU6, STM32F401CEU6, STM32F411CEU6 (using various WeAct “Blackpill” boards); only pins A0...A7, B0, B1 were tested. Pins F3...F10 are inside `#if STM32_ADC_USE_ADC3` because some devices which don't have ADC3 also don't have the GPIOF port, therefore the code which refers to Fx pins does not compile. * Fix STM32F3xx ADC mux table in documentation The ADC driver documentation had some errors in the mux table for STM32F3xx. Fix this table to match the datasheet and the actual code (mux settings for B12 and B13 were also tested on a real STM32F303CCT6 chip). * Add STM32F1xx ADC pins to the documentation * Add STM32F4xx ADC pins to the documentation * Add initial support for tinyuf2 bootloader (when hosted on F411 blackpill) (#12600) * Add support for jumping to tinyuf2 bootloader. Adds blackpill UF2 example. * Update flashing.md * Update chconf.h * Update config.h * Update halconf.h * Update mcuconf.h * eeprom driver: Refactor where eeprom driver initialisation (and EEPROM emulation initialisation) occurs to make it non-target-specific. (#12671) * Add support for MCU = STM32F446 (#12619) * Add support for MCU = STM32F446 * Update platforms/chibios/GENERIC_STM32_F446XE/configs/config.h * Restore mcuconf.h to the one used by RT-STM32F446RE-NUCLEO64 * stm32f446: update mcuconf.h and board.h for 16MHz operation, with USB enabled, and other peripherals disabled. * Format code according to conventions (#12682) * Format code according to conventions (#12687) * Add STM32L433 and L443 support (#12063) * initial L433 commit * change to XC * fix L433 * disable all peripherals * update system and peripheral clocks * 433 change * use its own board files * revert its own board files * l433 specific change * fix stm32l432xx define * remove duplicate #define * fix bootloader jump * move to L443xx and add i2c2, spi2, usart3 to mcuconf.h * move to L443 * move to L443 * fix sdmmc in mcuconf.h * include STM32L443 * add L443 * Include L443 in compatible microcontrollers * Include L443 in compatible microcontrollers * Update config bootloader jump description * Update ChibiOS define reasoning * Update quantum/mcu_selection.mk * fix git conflict * Updated Function96 with V2 files and removed chconf.h and halconf.h (#12613) * Fix bad PR merge for #6580. (#12721) * Change RGB/LED Matrix to use a simple define for USB suspend (#12697) * [CI] Format code according to conventions (#12731) * Fixing transport's led/rgb matrix suspend state logic (#12770) * [CI] Format code according to conventions (#12772) * Fix comment parsing (#12750) * Added OLED fade out support (#12086) * fix some references to bin/qmk that slipped in (#12832) * Resolve a number of warnings in `qmk generate-api` (#12833) * New command: qmk console (#12828) * stash poc * stash * tidy up implementation * Tidy up slightly for review * Tidy up slightly for review * Bodge environment to make tests pass * Refactor away from asyncio due to windows issues * Filter devices * align vid/pid printing * Add hidapi to the installers * start preparing for multiple hid_listeners * udev rules for hid_listen * refactor to move closer to end state * very basic implementation of the threaded model * refactor how vid/pid/index are supplied and parsed * windows improvements * read the report directly when usage page isn't available * add per-device colors, the choice to show names or numbers, and refactor * add timestamps * Add support for showing bootloaders * tweak the color for bootloaders * Align bootloader disconnect with connect color * add support for showing all bootloaders * fix the pyusb check * tweaks * fix exception * hide a stack trace behind -v * add --no-bootloaders option * add documentation for qmk console * Apply suggestions from code review * pyformat * clean up and flesh out KNOWN_BOOTLOADERS * Remove pointless SERIAL_LINK_ENABLE rules (#12846) * Make Swap Hands use PROGMEM (#12284) This converts the array that the Swap Hands feature uses to use PROGMEM, and to read from that array, as such. Since this array never changes at runtime, there is no reason to keep it in memory. Especially for AVR boards, as memory is a precious resource. * Fix another bin/qmk reference (#12856) * [Keymap] Turn OLED off on suspend in soundmonster keymap (#10419) * Fixup build errors on `develop` branch. (#12723) * LED Matrix: Effects! (#12651) * Fix syntax error when compiling for ARM (#12866) * Remove KEYMAP and LAYOUT_kc (#12160) * alias KEYMAP to LAYOUT * remove KEYMAP and LAYOUT_kc * Add setup, clone, and env to the list of commands we allow even with broken modules (#12868) * Rename `point_t` -> `led_point_t` (#12864) * [Keyboard] updated a vendor name / fixed minor keymap issues (#12881) * Add missing LED Matrix suspend code to suspend.c (#12878) * LED Matrix: Documentation (#12685) * Deprecate `send_unicode_hex_string()` (#12602) * Fix spelling mistake regarding LED Matrix in split_common. (#12888) * [Keymap] Fix QWERTY/DVORAK status output for kzar keymap (#12895) * Use milc.subcommand.config instead of qmk.cli.config (#12915) * Use milc.subcommand.config instead * pyformat * remove the config test * Add function to allow repeated blinking of one layer (#12237) * Implement function rgblight_blink_layer_repeat to allow repeated blinking of one layer at a time * Update doc * Rework rgblight blinking according to requested change * optimize storage * Fixup housekeeping from being invoked twice per loop. (#12933) * matrix: wait for row signal to go HIGH for every row (#12945) I noticed this discrepancy (last row of the matrix treated differently than the others) when optimizing the input latency of my keyboard controller, see also https://michael.stapelberg.ch/posts/2021-05-08-keyboard-input-latency-qmk-kinesis/ Before this commit, when tuning the delays I noticed ghost key presses when pressing the F2 key, which is on the last row of the keyboard matrix: the dead_grave key, which is on the first row of the keyboard matrix, would be incorrectly detected as pressed. After this commit, all keyboard matrix rows are interpreted correctly. I suspect that my setup is more susceptible to this nuance than others because I use GPIO_INPUT_PIN_DELAY=0 and hence don’t have another delay that might mask the problem. * ensure we do not conflict with existing keymap aliases (#12976) * Add support for up to 4 IS31FL3733 drivers (#12342) * Convert Encoder callbacks to be boolean functions (#12805) * [Keyboard] Fix Terrazzo build failure (#12977) * Do not hard set config in CPTC files (#11864) * [Keyboard] Corne - Remove legacy revision support (#12226) * [Keymap] Update to Drashna keymap and user code (based on develop) (#12936) * Add Full-duplex serial driver for ARM boards (#9842) * Document LED_MATRIX_FRAMEBUFFER_EFFECTS (#12987) * Backlight: add defines for default level and breathing state (#12560) * Add dire message about LUFA mass storage bootloader (#13014) * [Keyboard] Remove redundant legacy and common headers for crkbd (#13023) Was causing compiler errors on some systems. * Fix keyboards/keymaps for boolean encoder callback changes (#12985) * `backlight.c`: include `eeprom.h` (#13024) * Add changelog for 2021-05-29 Breaking Changes merge (#12939) * Add ChangeLog for 2021-05-29 Breaking Changes Merge: initial version * Add recent develop changes * Sort recent develop changes * Remove sections for ChibiOS changes per tzarc No ChibiOS changes this round. * Add and sort recent develop changes * add notes about keyboard moves/deletions * import changelog for PR 12172 Documents the change to BOOTMAGIC_ENABLE. * update section headings * re-sort changelog * add additional note regarding Bootmagic changes * remove changelog timestamp * update dates in main Breaking Changes docs * fix broken section anchors in previous changelogs * add link to backlight/eeprom patch to changelog * highlight some more changes * link PRs from section headers * Restore standard readme * run: qmk cformat --core-only
Diffstat (limited to 'quantum/led_matrix.h')
-rw-r--r--quantum/led_matrix.h144
1 files changed, 105 insertions, 39 deletions
diff --git a/quantum/led_matrix.h b/quantum/led_matrix.h
index 85bae43c1..0984de73b 100644
--- a/quantum/led_matrix.h
+++ b/quantum/led_matrix.h
@@ -19,61 +19,120 @@
19 19
20#pragma once 20#pragma once
21 21
22#include <stdint.h>
23#include <stdbool.h>
22#include "led_matrix_types.h" 24#include "led_matrix_types.h"
25#include "quantum.h"
23 26
24#ifndef BACKLIGHT_ENABLE 27#ifdef IS31FL3731
25# error You must define BACKLIGHT_ENABLE with LED_MATRIX_ENABLE 28# include "is31fl3731-simple.h"
26#endif 29#endif
27 30
31#ifndef LED_MATRIX_LED_FLUSH_LIMIT
32# define LED_MATRIX_LED_FLUSH_LIMIT 16
33#endif
34
35#ifndef LED_MATRIX_LED_PROCESS_LIMIT
36# define LED_MATRIX_LED_PROCESS_LIMIT (DRIVER_LED_TOTAL + 4) / 5
37#endif
38
39#if defined(LED_MATRIX_LED_PROCESS_LIMIT) && LED_MATRIX_LED_PROCESS_LIMIT > 0 && LED_MATRIX_LED_PROCESS_LIMIT < DRIVER_LED_TOTAL
40# define LED_MATRIX_USE_LIMITS(min, max) \
41 uint8_t min = LED_MATRIX_LED_PROCESS_LIMIT * params->iter; \
42 uint8_t max = min + LED_MATRIX_LED_PROCESS_LIMIT; \
43 if (max > DRIVER_LED_TOTAL) max = DRIVER_LED_TOTAL;
44#else
45# define LED_MATRIX_USE_LIMITS(min, max) \
46 uint8_t min = 0; \
47 uint8_t max = DRIVER_LED_TOTAL;
48#endif
49
50#define LED_MATRIX_TEST_LED_FLAGS() \
51 if (!HAS_ANY_FLAGS(g_led_config.flags[i], params->flags)) continue
52
28enum led_matrix_effects { 53enum led_matrix_effects {
29 LED_MATRIX_UNIFORM_BRIGHTNESS = 1, 54 LED_MATRIX_NONE = 0,
30 // All new effects go above this line 55
56// --------------------------------------
57// -----Begin led effect enum macros-----
58#define LED_MATRIX_EFFECT(name, ...) LED_MATRIX_##name,
59#include "led_matrix_animations/led_matrix_effects.inc"
60#undef LED_MATRIX_EFFECT
61
62#if defined(LED_MATRIX_CUSTOM_KB) || defined(LED_MATRIX_CUSTOM_USER)
63# define LED_MATRIX_EFFECT(name, ...) LED_MATRIX_CUSTOM_##name,
64# ifdef LED_MATRIX_CUSTOM_KB
65# include "led_matrix_kb.inc"
66# endif
67# ifdef LED_MATRIX_CUSTOM_USER
68# include "led_matrix_user.inc"
69# endif
70# undef LED_MATRIX_EFFECT
71#endif
72 // --------------------------------------
73 // -----End led effect enum macros-------
74
31 LED_MATRIX_EFFECT_MAX 75 LED_MATRIX_EFFECT_MAX
32}; 76};
33 77
34void led_matrix_set_index_value(int index, uint8_t value); 78void eeconfig_update_led_matrix_default(void);
35void led_matrix_set_index_value_all(uint8_t value); 79void eeconfig_update_led_matrix(void);
80void eeconfig_debug_led_matrix(void);
81
82uint8_t led_matrix_map_row_column_to_led_kb(uint8_t row, uint8_t column, uint8_t *led_i);
83uint8_t led_matrix_map_row_column_to_led(uint8_t row, uint8_t column, uint8_t *led_i);
84
85void led_matrix_set_value(int index, uint8_t value);
86void led_matrix_set_value_all(uint8_t value);
87
88void process_led_matrix(uint8_t row, uint8_t col, bool pressed);
89
90void led_matrix_task(void);
36 91
37// This runs after another backlight effect and replaces 92// This runs after another backlight effect and replaces
38// colors already set 93// values already set
39void led_matrix_indicators(void); 94void led_matrix_indicators(void);
40void led_matrix_indicators_kb(void); 95void led_matrix_indicators_kb(void);
41void led_matrix_indicators_user(void); 96void led_matrix_indicators_user(void);
42 97
43void led_matrix_init(void); 98void led_matrix_indicators_advanced(effect_params_t *params);
44void led_matrix_setup_drivers(void); 99void led_matrix_indicators_advanced_kb(uint8_t led_min, uint8_t led_max);
45 100void led_matrix_indicators_advanced_user(uint8_t led_min, uint8_t led_max);
46void led_matrix_set_suspend_state(bool state);
47void led_matrix_set_indicator_state(uint8_t state);
48 101
49void led_matrix_task(void); 102void led_matrix_init(void);
50 103
51// This should not be called from an interrupt 104void led_matrix_set_suspend_state(bool state);
52// (eg. from a timer interrupt). 105bool led_matrix_get_suspend_state(void);
53// Call this while idle (in between matrix scans). 106void led_matrix_toggle(void);
54// If the buffer is dirty, it will update the driver with the buffer. 107void led_matrix_toggle_noeeprom(void);
55void led_matrix_update_pwm_buffers(void); 108void led_matrix_enable(void);
56 109void led_matrix_enable_noeeprom(void);
57bool process_led_matrix(uint16_t keycode, keyrecord_t *record); 110void led_matrix_disable(void);
58 111void led_matrix_disable_noeeprom(void);
59uint32_t led_matrix_get_tick(void); 112uint8_t led_matrix_is_enabled(void);
60 113void led_matrix_mode(uint8_t mode);
61void led_matrix_toggle(void); 114void led_matrix_mode_noeeprom(uint8_t mode);
62void led_matrix_enable(void); 115uint8_t led_matrix_get_mode(void);
63void led_matrix_enable_noeeprom(void); 116void led_matrix_step(void);
64void led_matrix_disable(void); 117void led_matrix_step_noeeprom(void);
65void led_matrix_disable_noeeprom(void); 118void led_matrix_step_reverse(void);
66void led_matrix_step(void); 119void led_matrix_step_reverse_noeeprom(void);
67void led_matrix_step_reverse(void); 120void led_matrix_set_val(uint8_t val);
68void led_matrix_increase_val(void); 121void led_matrix_set_val_noeeprom(uint8_t val);
69void led_matrix_decrease_val(void); 122uint8_t led_matrix_get_val(void);
70void led_matrix_increase_speed(void); 123void led_matrix_increase_val(void);
71void led_matrix_decrease_speed(void); 124void led_matrix_increase_val_noeeprom(void);
72void led_matrix_mode(uint8_t mode, bool eeprom_write); 125void led_matrix_decrease_val(void);
73void led_matrix_mode_noeeprom(uint8_t mode); 126void led_matrix_decrease_val_noeeprom(void);
74uint8_t led_matrix_get_mode(void); 127void led_matrix_set_speed(uint8_t speed);
75void led_matrix_set_value(uint8_t mode); 128void led_matrix_set_speed_noeeprom(uint8_t speed);
76void led_matrix_set_value_noeeprom(uint8_t mode); 129uint8_t led_matrix_get_speed(void);
130void led_matrix_increase_speed(void);
131void led_matrix_increase_speed_noeeprom(void);
132void led_matrix_decrease_speed(void);
133void led_matrix_decrease_speed_noeeprom(void);
134led_flags_t led_matrix_get_flags(void);
135void led_matrix_set_flags(led_flags_t flags);
77 136
78typedef struct { 137typedef struct {
79 /* Perform any initialisation required for the other driver functions to work. */ 138 /* Perform any initialisation required for the other driver functions to work. */
@@ -91,4 +150,11 @@ extern const led_matrix_driver_t led_matrix_driver;
91 150
92extern led_eeconfig_t led_matrix_eeconfig; 151extern led_eeconfig_t led_matrix_eeconfig;
93 152
153extern uint32_t g_led_timer;
94extern led_config_t g_led_config; 154extern led_config_t g_led_config;
155#ifdef LED_MATRIX_KEYREACTIVE_ENABLED
156extern last_hit_t g_last_hit_tracker;
157#endif
158#ifdef LED_MATRIX_FRAMEBUFFER_EFFECTS
159extern uint8_t g_led_frame_buffer[MATRIX_ROWS][MATRIX_COLS];
160#endif