mirror of
https://github.com/qmk/qmk_firmware.git
synced 2025-07-07 16:32:13 +00:00
Resolved requested changes
This commit is contained in:
parent
4dcf969854
commit
24567263f2
@ -13,8 +13,6 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"features": {
|
"features": {
|
||||||
"audio": false,
|
|
||||||
"backlight": false,
|
|
||||||
"bootmagic": true,
|
"bootmagic": true,
|
||||||
"command": false,
|
"command": false,
|
||||||
"console": false,
|
"console": false,
|
||||||
@ -22,8 +20,7 @@
|
|||||||
"extrakey": true,
|
"extrakey": true,
|
||||||
"mousekey": true,
|
"mousekey": true,
|
||||||
"nkro": true,
|
"nkro": true,
|
||||||
"rgb_matrix": true,
|
"rgb_matrix": true
|
||||||
"rgblight": false
|
|
||||||
},
|
},
|
||||||
"indicators": {
|
"indicators": {
|
||||||
"caps_lock": "C14"
|
"caps_lock": "C14"
|
||||||
@ -165,7 +162,7 @@
|
|||||||
{ "label": "-", "matrix": [8, 6], "x": 11, "y": 1 },
|
{ "label": "-", "matrix": [8, 6], "x": 11, "y": 1 },
|
||||||
{ "label": "=", "matrix": [6, 6], "x": 12, "y": 1 },
|
{ "label": "=", "matrix": [6, 6], "x": 12, "y": 1 },
|
||||||
{ "label": "Backspace", "matrix": [10, 1], "w": 2, "x": 13, "y": 1 },
|
{ "label": "Backspace", "matrix": [10, 1], "w": 2, "x": 13, "y": 1 },
|
||||||
{ "label": "Home", "matrix": [11, 6], " x": 15, "y": 1 },
|
{ "label": "Home", "matrix": [11, 6], "x": 15, "y": 1 },
|
||||||
{ "label": "Tab", "matrix": [1, 1], "w": 1.5, "x": 0, "y": 2 },
|
{ "label": "Tab", "matrix": [1, 1], "w": 1.5, "x": 0, "y": 2 },
|
||||||
{ "label": "Q", "matrix": [1, 0], "x": 1.5, "y": 2 },
|
{ "label": "Q", "matrix": [1, 0], "x": 1.5, "y": 2 },
|
||||||
{ "label": "W", "matrix": [2, 0], "x": 2.5, "y": 2 },
|
{ "label": "W", "matrix": [2, 0], "x": 2.5, "y": 2 },
|
||||||
|
@ -146,22 +146,6 @@ void spi_init(void) {
|
|||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef ENCODER_ENABLE
|
|
||||||
|
|
||||||
bool encoder_update_kb(uint8_t index, bool clockwise) {
|
|
||||||
|
|
||||||
if (!encoder_update_user(index, clockwise)) { return false; }
|
|
||||||
if (index == 0) {
|
|
||||||
if (clockwise) {
|
|
||||||
tap_code(KC_VOLD);
|
|
||||||
} else {
|
|
||||||
tap_code(KC_VOLU);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
|
|
||||||
void keyboard_pre_init_kb(void) {
|
void keyboard_pre_init_kb(void) {
|
||||||
setPinOutput(C0);
|
setPinOutput(C0);
|
||||||
setPinOutput(C15);
|
setPinOutput(C15);
|
||||||
|
@ -111,7 +111,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
|
|||||||
};
|
};
|
||||||
|
|
||||||
#if defined(ENCODER_MAP_ENABLE)
|
#if defined(ENCODER_MAP_ENABLE)
|
||||||
const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = {
|
const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
|
||||||
[0] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
|
[0] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
|
||||||
[1] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
|
[1] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
|
||||||
[2] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS) },
|
[2] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS) },
|
||||||
|
@ -111,7 +111,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
|
|||||||
};
|
};
|
||||||
|
|
||||||
#if defined(ENCODER_MAP_ENABLE)
|
#if defined(ENCODER_MAP_ENABLE)
|
||||||
const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = {
|
const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
|
||||||
[0] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
|
[0] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
|
||||||
[1] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
|
[1] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
|
||||||
[2] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS) },
|
[2] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS) },
|
||||||
|
@ -1,6 +1,2 @@
|
|||||||
# Build Options
|
|
||||||
# change yes to no to disable
|
|
||||||
#
|
|
||||||
|
|
||||||
EEPROM_DRIVER = wear_leveling
|
EEPROM_DRIVER = wear_leveling
|
||||||
WEAR_LEVELING_DRIVER = spi_flash
|
WEAR_LEVELING_DRIVER = spi_flash
|
||||||
|
Loading…
Reference in New Issue
Block a user