diff options
author | Nick Brassel <[email protected]> | 2023-11-28 16:39:48 +1100 |
---|---|---|
committer | Nick Brassel <[email protected]> | 2023-11-28 16:40:47 +1100 |
commit | 0115951de12bd4c798a43a380651c34552552e85 (patch) | |
tree | 62999011ae782d93aa6dc9c889615db2a840cafc /keyboards/dumbpad | |
parent | 0379d1f59e58cefa18cdb72ba1b77507d1108ae6 (diff) | |
parent | 4d99e0a23cff02f4c6e55e093b5de08a9be0df7c (diff) | |
download | qmk_firmware-0.23.0.tar.gz qmk_firmware-0.23.0.zip |
`develop` -> `master`, 2023q4 edition0.23.0
Diffstat (limited to 'keyboards/dumbpad')
-rw-r--r-- | keyboards/dumbpad/v0x/v0x.c | 6 | ||||
-rw-r--r-- | keyboards/dumbpad/v0x_dualencoder/v0x_dualencoder.c | 6 | ||||
-rw-r--r-- | keyboards/dumbpad/v0x_right/v0x_right.c | 6 | ||||
-rw-r--r-- | keyboards/dumbpad/v1x/keymaps/imchipwood/keymap.c | 95 | ||||
-rw-r--r-- | keyboards/dumbpad/v1x/v1x.c | 6 | ||||
-rw-r--r-- | keyboards/dumbpad/v1x_dualencoder/v1x_dualencoder.c | 6 | ||||
-rw-r--r-- | keyboards/dumbpad/v1x_right/v1x_right.c | 6 | ||||
-rw-r--r-- | keyboards/dumbpad/v3x/v3x.c | 6 |
8 files changed, 35 insertions, 102 deletions
diff --git a/keyboards/dumbpad/v0x/v0x.c b/keyboards/dumbpad/v0x/v0x.c index 6c89edaa11..d7e3841d76 100644 --- a/keyboards/dumbpad/v0x/v0x.c +++ b/keyboards/dumbpad/v0x/v0x.c @@ -22,10 +22,14 @@ void keyboard_pre_init_kb(void) { keyboard_pre_init_user(); } -void shutdown_user(void) { +bool shutdown_kb(bool jump_to_bootloader) { + if (!shutdown_user(jump_to_bootloader)) { + return false; + } // Shutdown LEDs writePinLow(LED_00); writePinLow(LED_01); + return true; } layer_state_t layer_state_set_kb(layer_state_t state) { diff --git a/keyboards/dumbpad/v0x_dualencoder/v0x_dualencoder.c b/keyboards/dumbpad/v0x_dualencoder/v0x_dualencoder.c index 6c89edaa11..d7e3841d76 100644 --- a/keyboards/dumbpad/v0x_dualencoder/v0x_dualencoder.c +++ b/keyboards/dumbpad/v0x_dualencoder/v0x_dualencoder.c @@ -22,10 +22,14 @@ void keyboard_pre_init_kb(void) { keyboard_pre_init_user(); } -void shutdown_user(void) { +bool shutdown_kb(bool jump_to_bootloader) { + if (!shutdown_user(jump_to_bootloader)) { + return false; + } // Shutdown LEDs writePinLow(LED_00); writePinLow(LED_01); + return true; } layer_state_t layer_state_set_kb(layer_state_t state) { diff --git a/keyboards/dumbpad/v0x_right/v0x_right.c b/keyboards/dumbpad/v0x_right/v0x_right.c index 6c89edaa11..d7e3841d76 100644 --- a/keyboards/dumbpad/v0x_right/v0x_right.c +++ b/keyboards/dumbpad/v0x_right/v0x_right.c @@ -22,10 +22,14 @@ void keyboard_pre_init_kb(void) { keyboard_pre_init_user(); } -void shutdown_user(void) { +bool shutdown_kb(bool jump_to_bootloader) { + if (!shutdown_user(jump_to_bootloader)) { + return false; + } // Shutdown LEDs writePinLow(LED_00); writePinLow(LED_01); + return true; } layer_state_t layer_state_set_kb(layer_state_t state) { diff --git a/keyboards/dumbpad/v1x/keymaps/imchipwood/keymap.c b/keyboards/dumbpad/v1x/keymaps/imchipwood/keymap.c deleted file mode 100644 index 96a98b11c5..0000000000 --- a/keyboards/dumbpad/v1x/keymaps/imchipwood/keymap.c +++ /dev/null @@ -1,95 +0,0 @@ -/* Copyright 2020 imchipwood - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - */ -#include QMK_KEYBOARD_H -#include "imchipwood.h" - -enum custom_layers { - _BASE, - _SUB, -}; - -const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - /* - BASE LAYER - /-----------------------------------------------------` - | | 7 | 8 | 9 | Bkspc | - | |---------|---------|---------|---------| - | | 4 | 5 | 6 | + | - | |---------|---------|---------|---------| - | | 1 | 2 | 3 | * | - |-------------|---------|---------|---------|---------| - | Play/Pause | TT(SUB) | 0 | . | Enter | - \-----------------------------------------------------' - */ - [_BASE] = LAYOUT( - KC_P7, KC_P8, KC_P9, KC_BSPC, - KC_P4, KC_P5, KC_P6, KC_KP_PLUS, - KC_P1, KC_P2, KC_P3, KC_KP_ASTERISK, - MEH_T(KC_MPLY), TT(_SUB), KC_P0, KC_PDOT, KC_KP_ENTER - ), - /* - SUB LAYER - /-----------------------------------------------------` - | | F7 | F8 | F9 | Del/NLK | - | |---------|---------|---------|---------| - | | F4 | F5 | F6 | - | - | |---------|---------|---------|---------| - | | F1 | F2 | F3 | / | - |-------------|---------|---------|---------|---------| - | MUTE | | LSFT | LCTL | = | - \-----------------------------------------------------' - */ - [_SUB] = LAYOUT( - TD(ALT_F7), KC_F8, KC_F9, TD(DEL_NLCK), - KC_F4, TD(CTL_F5), KC_F6, KC_KP_MINUS, - KC_F1, TD(ALT_F2), KC_F3, KC_KP_SLASH, - KC_MUTE, _______, OSM(MOD_LSFT), OSM(MOD_LCTL), KC_KP_EQUAL - ) -}; - -bool encoder_update_user(uint8_t index, bool clockwise) { - if (index == 0) { - switch (get_highest_layer(layer_state)) { - case _BASE: - // main layer - volume up/down - if (clockwise) { - tap_code(KC_VOLU); - } else { - tap_code(KC_VOLD); - } - break; - - case _SUB: - // sub layer - next/previous track - if (clockwise) { - tap_code(KC_MNXT); - } else { - tap_code(KC_MPRV); - } - break; - - default: - // default - volume up/down - if (clockwise) { - tap_code(KC_VOLU); - } else { - tap_code(KC_VOLD); - } - break; - } - } - return true; -} diff --git a/keyboards/dumbpad/v1x/v1x.c b/keyboards/dumbpad/v1x/v1x.c index f1b1d66c7f..1022ad0605 100644 --- a/keyboards/dumbpad/v1x/v1x.c +++ b/keyboards/dumbpad/v1x/v1x.c @@ -23,11 +23,15 @@ void keyboard_pre_init_kb(void) { keyboard_pre_init_user(); } -void shutdown_user(void) { +bool shutdown_kb(bool jump_to_bootloader) { + if (!shutdown_user(jump_to_bootloader)) { + return false; + } // Shutdown LEDs writePinLow(LED_00); writePinLow(LED_01); writePinLow(LED_02); + return true; } layer_state_t layer_state_set_kb(layer_state_t state) { diff --git a/keyboards/dumbpad/v1x_dualencoder/v1x_dualencoder.c b/keyboards/dumbpad/v1x_dualencoder/v1x_dualencoder.c index f1b1d66c7f..1022ad0605 100644 --- a/keyboards/dumbpad/v1x_dualencoder/v1x_dualencoder.c +++ b/keyboards/dumbpad/v1x_dualencoder/v1x_dualencoder.c @@ -23,11 +23,15 @@ void keyboard_pre_init_kb(void) { keyboard_pre_init_user(); } -void shutdown_user(void) { +bool shutdown_kb(bool jump_to_bootloader) { + if (!shutdown_user(jump_to_bootloader)) { + return false; + } // Shutdown LEDs writePinLow(LED_00); writePinLow(LED_01); writePinLow(LED_02); + return true; } layer_state_t layer_state_set_kb(layer_state_t state) { diff --git a/keyboards/dumbpad/v1x_right/v1x_right.c b/keyboards/dumbpad/v1x_right/v1x_right.c index f1b1d66c7f..1022ad0605 100644 --- a/keyboards/dumbpad/v1x_right/v1x_right.c +++ b/keyboards/dumbpad/v1x_right/v1x_right.c @@ -23,11 +23,15 @@ void keyboard_pre_init_kb(void) { keyboard_pre_init_user(); } -void shutdown_user(void) { +bool shutdown_kb(bool jump_to_bootloader) { + if (!shutdown_user(jump_to_bootloader)) { + return false; + } // Shutdown LEDs writePinLow(LED_00); writePinLow(LED_01); writePinLow(LED_02); + return true; } layer_state_t layer_state_set_kb(layer_state_t state) { diff --git a/keyboards/dumbpad/v3x/v3x.c b/keyboards/dumbpad/v3x/v3x.c index d0acca1947..89f13684f2 100644 --- a/keyboards/dumbpad/v3x/v3x.c +++ b/keyboards/dumbpad/v3x/v3x.c @@ -54,11 +54,15 @@ void keyboard_pre_init_kb(void) { keyboard_pre_init_user(); } -void shutdown_user(void) { +bool shutdown_kb(bool jump_to_bootloader) { + if (!shutdown_user(jump_to_bootloader)) { + return false; + } // Shutdown LEDs writePinLow(LED_00); writePinLow(LED_01); writePinLow(LED_02); + return true; } layer_state_t layer_state_set_kb(layer_state_t state) { |