Migrate dynamic_keymap.layer_count >= 4 (#22087)

master
Joel Challis 2023-09-20 14:11:33 +01:00 committed by GitHub
parent 4b26d9b62b
commit 9a4c307740
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
59 changed files with 81 additions and 85 deletions

View File

@ -3,8 +3,6 @@
#pragma once
#define DYNAMIC_KEYMAP_LAYER_COUNT 10
#define RGB_MATRIX_LED_COUNT 21
//#define RGB_MATRIX_FRAMEBUFFER_EFFECTS
//#define RGB_MATRIX_KEYPRESSES

View File

@ -11,6 +11,9 @@
"vid": "0x6F75"
},
"diode_direction": "COL2ROW",
"dynamic_keymap": {
"layer_count": 10
},
"features": {
"audio": false,
"backlight": false,

View File

@ -3,8 +3,6 @@
#pragma once
#define DYNAMIC_KEYMAP_LAYER_COUNT 10
#define RGB_MATRIX_LED_COUNT 16
#define RGB_MATRIX_FRAMEBUFFER_EFFECTS
#define RGB_MATRIX_KEYPRESSES

View File

@ -11,6 +11,9 @@
"vid": "0x6F75"
},
"diode_direction": "COL2ROW",
"dynamic_keymap": {
"layer_count": 10
},
"features": {
"audio": false,
"backlight": false,

View File

@ -16,8 +16,6 @@
#pragma once
#define DYNAMIC_KEYMAP_LAYER_COUNT 10
#define RGB_MATRIX_LED_COUNT 20
#define RGB_MATRIX_KEYPRESSES
#define RGB_MATRIX_FRAMEBUFFER_EFFECTS

View File

@ -33,6 +33,9 @@
"rows": ["GP26", "GP1", "GP18", "GP5"]
},
"diode_direction": "COL2ROW",
"dynamic_keymap": {
"layer_count": 10
},
"encoder": {
"enabled": true,
"rotary": [

View File

@ -16,9 +16,6 @@
#pragma once
#define DYNAMIC_KEYMAP_LAYER_COUNT 10
#define RGB_MATRIX_LED_COUNT 20
#define RGB_MATRIX_KEYPRESSES
#define RGB_MATRIX_FRAMEBUFFER_EFFECTS

View File

@ -31,6 +31,9 @@
"rows": ["D1", "B5", "B4", "E6"]
},
"diode_direction": "COL2ROW",
"dynamic_keymap": {
"layer_count": 10
},
"encoder": {
"enabled": true,
"rotary": [

View File

@ -41,6 +41,3 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define LAYER_3 A8
#define LAYER_4 A9
#define LAYER_5 B9
/* Added extra layer for use of layer leds */
#define DYNAMIC_KEYMAP_LAYER_COUNT 5

View File

@ -13,6 +13,9 @@
"rows": ["A2", "A1", "B8", "A10", "C15", "A15", "B7", "B6", "C14", "C13"]
},
"diode_direction": "COL2ROW",
"dynamic_keymap": {
"layer_count": 5
},
"backlight": {
"pin": "A3",
"levels": 10,

View File

@ -34,6 +34,3 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define LAYER_3 B0
#define LAYER_4 B9
#define LAYER_5 A9
/* Added extra layer for use of layer leds */
#define DYNAMIC_KEYMAP_LAYER_COUNT 5

View File

@ -13,6 +13,9 @@
"rows": ["A2", "A1", "B8", "A10", "C15", "A15", "B7", "B6", "C14", "C13"]
},
"diode_direction": "COL2ROW",
"dynamic_keymap": {
"layer_count": 5
},
"backlight": {
"pin": "A6",
"levels": 6,

View File

@ -16,9 +16,6 @@
#pragma once
/* Use 5 dynamic keymap layers */
#define DYNAMIC_KEYMAP_LAYER_COUNT 6
/* LED Indicators */
#define LED_WIN_LOCK_PIN C11

View File

@ -26,6 +26,9 @@
"rows": ["B15", "C6", "C7", "C8", "C9", "A8"]
},
"diode_direction": "ROW2COL",
"dynamic_keymap": {
"layer_count": 6
},
"eeprom": {
"driver": "wear_leveling",
"wear_leveling": {

View File

@ -16,9 +16,6 @@
#pragma once
/* Use 5 dynamic keymap layers */
#define DYNAMIC_KEYMAP_LAYER_COUNT 6
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE
/* Locking resynchronize hack */

View File

@ -26,6 +26,9 @@
"rows": [ "B15", "C6", "C7", "C8", "C9", "A8"]
},
"diode_direction": "ROW2COL",
"dynamic_keymap": {
"layer_count": 6
},
"eeprom": {
"driver": "wear_leveling",
"wear_leveling": {

View File

@ -16,9 +16,6 @@
#pragma once
/* Use 5 dynamic keymap layers */
#define DYNAMIC_KEYMAP_LAYER_COUNT 6
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE
/* Locking resynchronize hack */

View File

@ -26,6 +26,9 @@
"rows": ["C7", "C8", "C9", "A8"]
},
"diode_direction": "ROW2COL",
"dynamic_keymap": {
"layer_count": 6
},
"eeprom": {
"driver": "wear_leveling",
"wear_leveling": {

View File

@ -15,6 +15,4 @@
*/
#pragma once
#define DYNAMIC_KEYMAP_LAYER_COUNT 5
#define VIA_EEPROM_CUSTOM_CONFIG_SIZE 20

View File

@ -7,6 +7,9 @@
"vid": "0x626D",
"pid": "0x656B"
},
"dynamic_keymap": {
"layer_count": 5
},
"layouts": {
"LAYOUT_all": {
"layout": [

View File

@ -16,9 +16,6 @@
#pragma once
/* Use 4 dynamic keymap layers */
#define DYNAMIC_KEYMAP_LAYER_COUNT 4
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE
/* Locking resynchronize hack */

View File

@ -78,8 +78,3 @@
#define ENABLE_RGB_MATRIX_SOLID_SPLASH
#define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH
#endif
/* VIA */
#ifdef VIA_ENABLE
#define DYNAMIC_KEYMAP_LAYER_COUNT 8
#endif

View File

@ -16,6 +16,9 @@
"rows": ["B15", "A5", "A3", "A15", "B7", "B8"]
},
"diode_direction": "COL2ROW",
"dynamic_keymap": {
"layer_count": 8
},
"backlight": {
"pin": "B11",
"levels": 5,

View File

@ -12,5 +12,3 @@
#define LOCKING_SUPPORT_ENABLE
/* Locking resynchronize hack */
#define LOCKING_RESYNC_ENABLE
#define DYNAMIC_KEYMAP_LAYER_COUNT 6

View File

@ -13,6 +13,9 @@
"rows": ["C6", "D7", "D6", "D4"]
},
"diode_direction": "COL2ROW",
"dynamic_keymap": {
"layer_count": 6
},
"processor": "atmega32u4",
"bootloader": "atmel-dfu",
"layouts": {

View File

@ -89,9 +89,6 @@
#define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH
#endif
// #define DYNAMIC_KEYMAP_LAYER_COUNT 4
/*
* Feature disable options
* These options are also useful to firmware size reduction.

View File

@ -3,8 +3,6 @@
#pragma once
#define DYNAMIC_KEYMAP_LAYER_COUNT 8
#define RGB_MATRIX_LED_COUNT 16
#define RGB_MATRIX_FRAMEBUFFER_EFFECTS
#define RGB_MATRIX_KEYPRESSES

View File

@ -25,6 +25,9 @@
"rows": ["GP4", "GP5", "GP6"]
},
"diode_direction": "COL2ROW",
"dynamic_keymap": {
"layer_count": 8
},
"encoder": {
"enabled": true,
"rotary": [

View File

@ -17,9 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
#define DYNAMIC_KEYMAP_LAYER_COUNT 6
#ifdef RGB_MATRIX_ENABLE
#define RGB_MATRIX_MAXIMUM_BRIGHTNESS 255
#define RGB_MATRIX_STARTUP_VAL RGB_MATRIX_MAXIMUM_BRIGHTNESS * 7/8

View File

@ -22,6 +22,9 @@
"rgb_matrix": true
},
"diode_direction": "COL2ROW",
"dynamic_keymap": {
"layer_count": 6
},
"matrix_pins": {
"rows": ["GP0", "GP2", "GP3", "GP4", "GP7"],
"cols": ["GP29", "GP28", "GP27", "GP26", "GP25", "GP24", "GP23", "GP20", "GP19", "GP1", "GP6", "GP5"]

View File

@ -32,8 +32,3 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
/* External EEPROM */
// Use 24LC64 EEPROM
#define EEPROM_I2C_24LC64
// Set MAX_ADDR to specify actual EEPROM size.
// If it's not set, EEPROM size will be set ATmega32u4's 1023.
#define DYNAMIC_KEYMAP_EEPROM_MAX_ADDR 8191
// How many layers to use with VIA / Remap.
#define DYNAMIC_KEYMAP_LAYER_COUNT 6 // default:4

View File

@ -21,6 +21,9 @@
"pin": "F1"
},
"diode_direction": "COL2ROW",
"dynamic_keymap": {
"layer_count": 6
},
"eeprom": {
"driver": "i2c"
},

View File

@ -3,8 +3,6 @@
#pragma once
#define DYNAMIC_KEYMAP_LAYER_COUNT 5
/* Matrix COL and ROW definitions */
#define MATRIX_ROWS 9
#define MATRIX_COLS 6

View File

@ -23,6 +23,9 @@
"force_nkro": true
},
"diode_direction": "COL2ROW",
"dynamic_keymap": {
"layer_count": 5
},
"rgblight": {
"led_count": 10,
"max_brightness": 255,

View File

@ -16,9 +16,6 @@
#pragma once
/* Use 6 dynamic keymap layers */
#define DYNAMIC_KEYMAP_LAYER_COUNT 6
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE
/* Locking resynchronize hack */

View File

@ -26,6 +26,9 @@
"rows": ["B15", "C6", "C7", "C8", "C9", "A8"]
},
"diode_direction": "ROW2COL",
"dynamic_keymap": {
"layer_count": 6
},
"eeprom": {
"driver": "wear_leveling",
"wear_leveling": {

View File

@ -16,9 +16,6 @@
#pragma once
/* Use 5 dynamic keymap layers */
#define DYNAMIC_KEYMAP_LAYER_COUNT 6
/* LED Indicators */
#define LED_WIN_LOCK_PIN C11

View File

@ -25,6 +25,9 @@
"rows": ["B15", "C6", "C7", "C8", "C9", "A8"]
},
"diode_direction": "ROW2COL",
"dynamic_keymap": {
"layer_count": 6
},
"eeprom": {
"driver": "wear_leveling",
"wear_leveling": {

View File

@ -16,9 +16,6 @@
#pragma once
/* Use 6 dynamic keymap layers */
#define DYNAMIC_KEYMAP_LAYER_COUNT 6
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE
/* Locking resynchronize hack */

View File

@ -25,6 +25,9 @@
"rows": ["C6", "C7", "C8", "C9", "A8"]
},
"diode_direction": "ROW2COL",
"dynamic_keymap": {
"layer_count": 6
},
"eeprom": {
"driver": "wear_leveling",
"wear_leveling": {

View File

@ -142,10 +142,6 @@
#define FIRMWARE_VERSION_SIZE 17
#define DYNAMIC_KEYMAP_EEPROM_ADDR (EECONFIG_SIZE + FIRMWARE_VERSION_SIZE)
#ifdef EEPROM_I2C
# define DYNAMIC_KEYMAP_EEPROM_MAX_ADDR 16383
# define DYNAMIC_KEYMAP_LAYER_COUNT 8
#endif
#define AUDIO_PIN A5
#define AUDIO_PIN_ALT A4

View File

@ -8,6 +8,9 @@
"pid": "0x1969",
"device_version": "0.0.1"
},
"dynamic_keymap": {
"layer_count": 8
},
"eeprom": {
"driver": "i2c"
},

View File

@ -21,5 +21,3 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define LOCKING_SUPPORT_ENABLE
/* Locking resynchronize hack */
#define LOCKING_RESYNC_ENABLE
#define DYNAMIC_KEYMAP_LAYER_COUNT 8

View File

@ -10,6 +10,9 @@
"rows": ["E6", "C7", "B5", "B4"]
},
"diode_direction": "COL2ROW",
"dynamic_keymap": {
"layer_count": 8
},
"processor": "atmega32u4",
"bootloader": "atmel-dfu",
"layouts": {

View File

@ -37,6 +37,3 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
//#define NO_ACTION_LAYER
//#define NO_ACTION_TAPPING
//#define NO_ACTION_ONESHOT
// for via
#define DYNAMIC_KEYMAP_LAYER_COUNT 7

View File

@ -13,6 +13,9 @@
"rows": ["E6", "D7", "B4", "B5"]
},
"diode_direction": "ROW2COL",
"dynamic_keymap": {
"layer_count": 7
},
"encoder": {
"rotary": [
{"pin_a": "F5", "pin_b": "F4"}

View File

@ -16,8 +16,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
#define DYNAMIC_KEYMAP_LAYER_COUNT 5
//Digital joystick (4-way switch + encoder)
#define PIN_JU D4
#define PIN_JD B6

View File

@ -15,6 +15,9 @@
"vid": "0x04D8",
"pid": "0xE678"
},
"dynamic_keymap": {
"layer_count": 5
},
"encoder": {
"rotary": [
{"pin_a": "D6", "pin_b": "B5", "resolution": 2},

View File

@ -39,5 +39,3 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
//#define NO_ACTION_LAYER
//#define NO_ACTION_TAPPING
//#define NO_ACTION_ONESHOT
#define DYNAMIC_KEYMAP_LAYER_COUNT 4

View File

@ -39,5 +39,3 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
//#define NO_ACTION_LAYER
//#define NO_ACTION_TAPPING
//#define NO_ACTION_ONESHOT
#define DYNAMIC_KEYMAP_LAYER_COUNT 4

View File

@ -39,5 +39,3 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
//#define NO_ACTION_LAYER
//#define NO_ACTION_TAPPING
//#define NO_ACTION_ONESHOT
#define DYNAMIC_KEYMAP_LAYER_COUNT 4

View File

@ -37,5 +37,3 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
//#define NO_ACTION_LAYER
//#define NO_ACTION_TAPPING
//#define NO_ACTION_ONESHOT
#define DYNAMIC_KEYMAP_LAYER_COUNT 10

View File

@ -13,6 +13,9 @@
"rows": ["E6"]
},
"diode_direction": "COL2ROW",
"dynamic_keymap": {
"layer_count": 10
},
"backlight": {
"pin": "C6"
},

View File

@ -73,8 +73,6 @@
#define RGB_BACKLIGHT_LAYER_2_INDICATOR { .color = { .h = 0, .s = 0 }, .index = 255 }
#define RGB_BACKLIGHT_LAYER_3_INDICATOR { .color = { .h = 0, .s = 0 }, .index = 255 }
#define DYNAMIC_KEYMAP_LAYER_COUNT 10
// Backlight config starts after VIA's EEPROM usage,
// dynamic keymaps start after this.
#define VIA_EEPROM_CUSTOM_CONFIG_SIZE 51

View File

@ -13,6 +13,9 @@
"rows": ["E6"]
},
"diode_direction": "COL2ROW",
"dynamic_keymap": {
"layer_count": 10
},
"processor": "atmega32u4",
"bootloader": "atmel-dfu",
"layouts": {

View File

@ -14,8 +14,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
#define DYNAMIC_KEYMAP_LAYER_COUNT 6
#define RP2040_BOOTLOADER_DOUBLE_TAP_RESET
#define RP2040_BOOTLOADER_DOUBLE_TAP_RESET_TIMEOUT 500U

View File

@ -19,6 +19,9 @@
"rgb_matrix": true
},
"diode_direction": "COL2ROW",
"dynamic_keymap": {
"layer_count": 6
},
"matrix_pins": {
"rows": ["GP13", "GP12", "GP11", "GP10", "GP15", "GP14"],
"cols": ["GP29", "GP28", "GP26", "GP25", "GP24", "GP23", "GP22", "GP21", "GP20", "GP19", "GP18", "GP17", "GP16", "GP27", "GP9", "GP1", "GP0"]

View File

@ -14,7 +14,5 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
#define DYNAMIC_KEYMAP_LAYER_COUNT 6
#define RP2040_BOOTLOADER_DOUBLE_TAP_RESET
#define RP2040_BOOTLOADER_DOUBLE_TAP_RESET_TIMEOUT 500U

View File

@ -18,6 +18,9 @@
"nkro": true
},
"diode_direction": "COL2ROW",
"dynamic_keymap": {
"layer_count": 6
},
"matrix_pins": {
"rows": ["GP2", "GP29", "GP28", "GP27", "GP11", "GP12"],
"cols": ["GP26", "GP25", "GP24", "GP23", "GP22", "GP21", "GP20", "GP19", "GP18", "GP17", "GP16", "GP15", "GP14", "GP13", "GP0", "GP1", "GP3"]