diff options
| author | Joel Challis <git@zvecr.com> | 2020-01-19 16:30:34 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-01-19 16:30:34 +0000 |
| commit | 667045b4928badaedb38f535d885a46ff8a454fb (patch) | |
| tree | 5ae5e7002381a7359eabe627b936f0c253e2822e /quantum/dynamic_keymap.c | |
| parent | f5209aa4e941c7f3a942ef4a7e256ab432ec98ce (diff) | |
| download | qmk_firmware-667045b4928badaedb38f535d885a46ff8a454fb.tar.gz qmk_firmware-667045b4928badaedb38f535d885a46ff8a454fb.zip | |
Run clang-format manually to fix recently changed files (#7934)
* Run clang-format manually to fix recently changed files
* Run clang-format manually to fix recently changed files - revert template files
* Run clang-format manually to fix recently changed files - format off for ascii_to_keycode_lut
Diffstat (limited to 'quantum/dynamic_keymap.c')
| -rw-r--r-- | quantum/dynamic_keymap.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/quantum/dynamic_keymap.c b/quantum/dynamic_keymap.c index 11d28592d..0d8ea56b7 100644 --- a/quantum/dynamic_keymap.c +++ b/quantum/dynamic_keymap.c | |||
| @@ -20,36 +20,36 @@ | |||
| 20 | #include "progmem.h" // to read default from flash | 20 | #include "progmem.h" // to read default from flash |
| 21 | #include "quantum.h" // for send_string() | 21 | #include "quantum.h" // for send_string() |
| 22 | #include "dynamic_keymap.h" | 22 | #include "dynamic_keymap.h" |
| 23 | #include "via.h" // for default VIA_EEPROM_ADDR_END | 23 | #include "via.h" // for default VIA_EEPROM_ADDR_END |
| 24 | 24 | ||
| 25 | #ifndef DYNAMIC_KEYMAP_LAYER_COUNT | 25 | #ifndef DYNAMIC_KEYMAP_LAYER_COUNT |
| 26 | # define DYNAMIC_KEYMAP_LAYER_COUNT 4 | 26 | # define DYNAMIC_KEYMAP_LAYER_COUNT 4 |
| 27 | #endif | 27 | #endif |
| 28 | 28 | ||
| 29 | #ifndef DYNAMIC_KEYMAP_MACRO_COUNT | 29 | #ifndef DYNAMIC_KEYMAP_MACRO_COUNT |
| 30 | # define DYNAMIC_KEYMAP_MACRO_COUNT 16 | 30 | # define DYNAMIC_KEYMAP_MACRO_COUNT 16 |
| 31 | #endif | 31 | #endif |
| 32 | 32 | ||
| 33 | // If DYNAMIC_KEYMAP_EEPROM_ADDR not explicitly defined in config.h, | 33 | // If DYNAMIC_KEYMAP_EEPROM_ADDR not explicitly defined in config.h, |
| 34 | // default it start after VIA_EEPROM_CUSTOM_ADDR+VIA_EEPROM_CUSTOM_SIZE | 34 | // default it start after VIA_EEPROM_CUSTOM_ADDR+VIA_EEPROM_CUSTOM_SIZE |
| 35 | #ifndef DYNAMIC_KEYMAP_EEPROM_ADDR | 35 | #ifndef DYNAMIC_KEYMAP_EEPROM_ADDR |
| 36 | # ifdef VIA_EEPROM_CUSTOM_CONFIG_ADDR | 36 | # ifdef VIA_EEPROM_CUSTOM_CONFIG_ADDR |
| 37 | # define DYNAMIC_KEYMAP_EEPROM_ADDR (VIA_EEPROM_CUSTOM_CONFIG_ADDR+VIA_EEPROM_CUSTOM_CONFIG_SIZE) | 37 | # define DYNAMIC_KEYMAP_EEPROM_ADDR (VIA_EEPROM_CUSTOM_CONFIG_ADDR + VIA_EEPROM_CUSTOM_CONFIG_SIZE) |
| 38 | # else | 38 | # else |
| 39 | # error DYNAMIC_KEYMAP_EEPROM_ADDR not defined | 39 | # error DYNAMIC_KEYMAP_EEPROM_ADDR not defined |
| 40 | # endif | 40 | # endif |
| 41 | #endif | 41 | #endif |
| 42 | 42 | ||
| 43 | // Dynamic macro starts after dynamic keymaps | 43 | // Dynamic macro starts after dynamic keymaps |
| 44 | #ifndef DYNAMIC_KEYMAP_MACRO_EEPROM_ADDR | 44 | #ifndef DYNAMIC_KEYMAP_MACRO_EEPROM_ADDR |
| 45 | # define DYNAMIC_KEYMAP_MACRO_EEPROM_ADDR (DYNAMIC_KEYMAP_EEPROM_ADDR+(DYNAMIC_KEYMAP_LAYER_COUNT*MATRIX_ROWS*MATRIX_COLS*2)) | 45 | # define DYNAMIC_KEYMAP_MACRO_EEPROM_ADDR (DYNAMIC_KEYMAP_EEPROM_ADDR + (DYNAMIC_KEYMAP_LAYER_COUNT * MATRIX_ROWS * MATRIX_COLS * 2)) |
| 46 | #endif | 46 | #endif |
| 47 | 47 | ||
| 48 | // Dynamic macro uses up all remaining memory | 48 | // Dynamic macro uses up all remaining memory |
| 49 | // Assumes 1K EEPROM on ATMega32U4 | 49 | // Assumes 1K EEPROM on ATMega32U4 |
| 50 | // Override for anything different | 50 | // Override for anything different |
| 51 | #ifndef DYNAMIC_KEYMAP_MACRO_EEPROM_SIZE | 51 | #ifndef DYNAMIC_KEYMAP_MACRO_EEPROM_SIZE |
| 52 | # define DYNAMIC_KEYMAP_MACRO_EEPROM_SIZE (1024-DYNAMIC_KEYMAP_MACRO_EEPROM_ADDR) | 52 | # define DYNAMIC_KEYMAP_MACRO_EEPROM_SIZE (1024 - DYNAMIC_KEYMAP_MACRO_EEPROM_ADDR) |
| 53 | #endif | 53 | #endif |
| 54 | 54 | ||
| 55 | uint8_t dynamic_keymap_get_layer_count(void) { return DYNAMIC_KEYMAP_LAYER_COUNT; } | 55 | uint8_t dynamic_keymap_get_layer_count(void) { return DYNAMIC_KEYMAP_LAYER_COUNT; } |
