diff options
Diffstat (limited to 'quantum')
| -rw-r--r-- | quantum/bootmagic/bootmagic.h | 4 | ||||
| -rw-r--r-- | quantum/bootmagic/bootmagic_full.c | 147 | ||||
| -rw-r--r-- | quantum/bootmagic/bootmagic_full.h | 115 | ||||
| -rw-r--r-- | quantum/template/avr/rules.mk | 2 | ||||
| -rw-r--r-- | quantum/template/ps2avrgb/rules.mk | 2 |
5 files changed, 3 insertions, 267 deletions
diff --git a/quantum/bootmagic/bootmagic.h b/quantum/bootmagic/bootmagic.h index 959750178..db826025c 100644 --- a/quantum/bootmagic/bootmagic.h +++ b/quantum/bootmagic/bootmagic.h | |||
| @@ -15,9 +15,7 @@ | |||
| 15 | */ | 15 | */ |
| 16 | #pragma once | 16 | #pragma once |
| 17 | 17 | ||
| 18 | #if defined(BOOTMAGIC_ENABLE) | 18 | #if defined(BOOTMAGIC_LITE) |
| 19 | # include "bootmagic_full.h" | ||
| 20 | #elif defined(BOOTMAGIC_LITE) | ||
| 21 | # include "bootmagic_lite.h" | 19 | # include "bootmagic_lite.h" |
| 22 | #endif | 20 | #endif |
| 23 | 21 | ||
diff --git a/quantum/bootmagic/bootmagic_full.c b/quantum/bootmagic/bootmagic_full.c deleted file mode 100644 index a7a0dcfcb..000000000 --- a/quantum/bootmagic/bootmagic_full.c +++ /dev/null | |||
| @@ -1,147 +0,0 @@ | |||
| 1 | /* Copyright 2021 QMK | ||
| 2 | * | ||
| 3 | * This program is free software: you can redistribute it and/or modify | ||
| 4 | * it under the terms of the GNU General Public License as published by | ||
| 5 | * the Free Software Foundation, either version 3 of the License, or | ||
| 6 | * (at your option) any later version. | ||
| 7 | * | ||
| 8 | * This program is distributed in the hope that it will be useful, | ||
| 9 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| 10 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| 11 | * GNU General Public License for more details. | ||
| 12 | * | ||
| 13 | * You should have received a copy of the GNU General Public License | ||
| 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
| 15 | */ | ||
| 16 | #include <stdint.h> | ||
| 17 | #include <stdbool.h> | ||
| 18 | #include "wait.h" | ||
| 19 | #include "matrix.h" | ||
| 20 | #include "bootloader.h" | ||
| 21 | #include "debug.h" | ||
| 22 | #include "keymap.h" | ||
| 23 | #include "host.h" | ||
| 24 | #include "action_layer.h" | ||
| 25 | #include "eeconfig.h" | ||
| 26 | #include "bootmagic.h" | ||
| 27 | |||
| 28 | /** \brief Scan Keycode | ||
| 29 | * | ||
| 30 | * FIXME: needs doc | ||
| 31 | */ | ||
| 32 | static bool scan_keycode(uint8_t keycode) { | ||
| 33 | for (uint8_t r = 0; r < MATRIX_ROWS; r++) { | ||
| 34 | matrix_row_t matrix_row = matrix_get_row(r); | ||
| 35 | for (uint8_t c = 0; c < MATRIX_COLS; c++) { | ||
| 36 | if (matrix_row & ((matrix_row_t)1 << c)) { | ||
| 37 | if (keycode == keymap_key_to_keycode(0, (keypos_t){.row = r, .col = c})) { | ||
| 38 | return true; | ||
| 39 | } | ||
| 40 | } | ||
| 41 | } | ||
| 42 | } | ||
| 43 | return false; | ||
| 44 | } | ||
| 45 | |||
| 46 | /** \brief Bootmagic Scan Keycode | ||
| 47 | * | ||
| 48 | * FIXME: needs doc | ||
| 49 | */ | ||
| 50 | static bool bootmagic_scan_keycode(uint8_t keycode) { | ||
| 51 | if (!scan_keycode(BOOTMAGIC_KEY_SALT)) return false; | ||
| 52 | |||
| 53 | return scan_keycode(keycode); | ||
| 54 | } | ||
| 55 | |||
| 56 | void bootmagic(void) { | ||
| 57 | /* do scans in case of bounce */ | ||
| 58 | print("bootmagic scan: ... "); | ||
| 59 | uint8_t scan = 100; | ||
| 60 | while (scan--) { | ||
| 61 | matrix_scan(); | ||
| 62 | wait_ms(10); | ||
| 63 | } | ||
| 64 | print("done.\n"); | ||
| 65 | |||
| 66 | /* bootmagic skip */ | ||
| 67 | if (bootmagic_scan_keycode(BOOTMAGIC_KEY_SKIP)) { | ||
| 68 | return; | ||
| 69 | } | ||
| 70 | |||
| 71 | /* eeconfig clear */ | ||
| 72 | if (bootmagic_scan_keycode(BOOTMAGIC_KEY_EEPROM_CLEAR)) { | ||
| 73 | eeconfig_init(); | ||
| 74 | } | ||
| 75 | |||
| 76 | /* bootloader */ | ||
| 77 | if (bootmagic_scan_keycode(BOOTMAGIC_KEY_BOOTLOADER)) { | ||
| 78 | bootloader_jump(); | ||
| 79 | } | ||
| 80 | |||
| 81 | if (bootmagic_scan_keycode(BOOTMAGIC_KEY_DEBUG_ENABLE)) { | ||
| 82 | if (bootmagic_scan_keycode(BOOTMAGIC_KEY_DEBUG_MATRIX)) { | ||
| 83 | debug_config.matrix = !debug_config.matrix; | ||
| 84 | } else if (bootmagic_scan_keycode(BOOTMAGIC_KEY_DEBUG_KEYBOARD)) { | ||
| 85 | debug_config.keyboard = !debug_config.keyboard; | ||
| 86 | } else if (bootmagic_scan_keycode(BOOTMAGIC_KEY_DEBUG_MOUSE)) { | ||
| 87 | debug_config.mouse = !debug_config.mouse; | ||
| 88 | } else { | ||
| 89 | debug_config.enable = !debug_config.enable; | ||
| 90 | } | ||
| 91 | } | ||
| 92 | eeconfig_update_debug(debug_config.raw); | ||
| 93 | |||
| 94 | if (bootmagic_scan_keycode(BOOTMAGIC_KEY_SWAP_CONTROL_CAPSLOCK)) { | ||
| 95 | keymap_config.swap_control_capslock = !keymap_config.swap_control_capslock; | ||
| 96 | } | ||
| 97 | if (bootmagic_scan_keycode(BOOTMAGIC_KEY_CAPSLOCK_TO_CONTROL)) { | ||
| 98 | keymap_config.capslock_to_control = !keymap_config.capslock_to_control; | ||
| 99 | } | ||
| 100 | if (bootmagic_scan_keycode(BOOTMAGIC_KEY_SWAP_LALT_LGUI)) { | ||
| 101 | keymap_config.swap_lalt_lgui = !keymap_config.swap_lalt_lgui; | ||
| 102 | } | ||
| 103 | if (bootmagic_scan_keycode(BOOTMAGIC_KEY_SWAP_RALT_RGUI)) { | ||
| 104 | keymap_config.swap_ralt_rgui = !keymap_config.swap_ralt_rgui; | ||
| 105 | } | ||
| 106 | if (bootmagic_scan_keycode(BOOTMAGIC_KEY_NO_GUI)) { | ||
| 107 | keymap_config.no_gui = !keymap_config.no_gui; | ||
| 108 | } | ||
| 109 | if (bootmagic_scan_keycode(BOOTMAGIC_KEY_SWAP_GRAVE_ESC)) { | ||
| 110 | keymap_config.swap_grave_esc = !keymap_config.swap_grave_esc; | ||
| 111 | } | ||
| 112 | if (bootmagic_scan_keycode(BOOTMAGIC_KEY_SWAP_BACKSLASH_BACKSPACE)) { | ||
| 113 | keymap_config.swap_backslash_backspace = !keymap_config.swap_backslash_backspace; | ||
| 114 | } | ||
| 115 | if (bootmagic_scan_keycode(BOOTMAGIC_HOST_NKRO)) { | ||
| 116 | keymap_config.nkro = !keymap_config.nkro; | ||
| 117 | } | ||
| 118 | eeconfig_update_keymap(keymap_config.raw); | ||
| 119 | |||
| 120 | /* default layer */ | ||
| 121 | uint8_t default_layer = 0; | ||
| 122 | if (bootmagic_scan_keycode(BOOTMAGIC_KEY_DEFAULT_LAYER_0)) { | ||
| 123 | default_layer |= (1 << 0); | ||
| 124 | } else if (bootmagic_scan_keycode(BOOTMAGIC_KEY_DEFAULT_LAYER_1)) { | ||
| 125 | default_layer |= (1 << 1); | ||
| 126 | } else if (bootmagic_scan_keycode(BOOTMAGIC_KEY_DEFAULT_LAYER_2)) { | ||
| 127 | default_layer |= (1 << 2); | ||
| 128 | } else if (bootmagic_scan_keycode(BOOTMAGIC_KEY_DEFAULT_LAYER_3)) { | ||
| 129 | default_layer |= (1 << 3); | ||
| 130 | } else if (bootmagic_scan_keycode(BOOTMAGIC_KEY_DEFAULT_LAYER_4)) { | ||
| 131 | default_layer |= (1 << 4); | ||
| 132 | } else if (bootmagic_scan_keycode(BOOTMAGIC_KEY_DEFAULT_LAYER_5)) { | ||
| 133 | default_layer |= (1 << 5); | ||
| 134 | } else if (bootmagic_scan_keycode(BOOTMAGIC_KEY_DEFAULT_LAYER_6)) { | ||
| 135 | default_layer |= (1 << 6); | ||
| 136 | } else if (bootmagic_scan_keycode(BOOTMAGIC_KEY_DEFAULT_LAYER_7)) { | ||
| 137 | default_layer |= (1 << 7); | ||
| 138 | } | ||
| 139 | eeconfig_update_default_layer(default_layer); | ||
| 140 | |||
| 141 | /* EE_HANDS handedness */ | ||
| 142 | if (bootmagic_scan_keycode(BOOTMAGIC_KEY_EE_HANDS_LEFT)) { | ||
| 143 | eeconfig_update_handedness(true); | ||
| 144 | } else if (bootmagic_scan_keycode(BOOTMAGIC_KEY_EE_HANDS_RIGHT)) { | ||
| 145 | eeconfig_update_handedness(false); | ||
| 146 | } | ||
| 147 | } | ||
diff --git a/quantum/bootmagic/bootmagic_full.h b/quantum/bootmagic/bootmagic_full.h deleted file mode 100644 index 28f914c1b..000000000 --- a/quantum/bootmagic/bootmagic_full.h +++ /dev/null | |||
| @@ -1,115 +0,0 @@ | |||
| 1 | /* Copyright 2021 QMK | ||
| 2 | * | ||
| 3 | * This program is free software: you can redistribute it and/or modify | ||
| 4 | * it under the terms of the GNU General Public License as published by | ||
| 5 | * the Free Software Foundation, either version 3 of the License, or | ||
| 6 | * (at your option) any later version. | ||
| 7 | * | ||
| 8 | * This program is distributed in the hope that it will be useful, | ||
| 9 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| 10 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| 11 | * GNU General Public License for more details. | ||
| 12 | * | ||
| 13 | * You should have received a copy of the GNU General Public License | ||
| 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
| 15 | */ | ||
| 16 | |||
| 17 | #pragma once | ||
| 18 | |||
| 19 | /* FIXME: Add special doxygen comments for defines here. */ | ||
| 20 | |||
| 21 | /* bootmagic salt key */ | ||
| 22 | #ifndef BOOTMAGIC_KEY_SALT | ||
| 23 | # define BOOTMAGIC_KEY_SALT KC_SPACE | ||
| 24 | #endif | ||
| 25 | |||
| 26 | /* skip bootmagic and eeconfig */ | ||
| 27 | #ifndef BOOTMAGIC_KEY_SKIP | ||
| 28 | # define BOOTMAGIC_KEY_SKIP KC_ESC | ||
| 29 | #endif | ||
| 30 | |||
| 31 | /* eeprom clear */ | ||
| 32 | #ifndef BOOTMAGIC_KEY_EEPROM_CLEAR | ||
| 33 | # define BOOTMAGIC_KEY_EEPROM_CLEAR KC_BSPACE | ||
| 34 | #endif | ||
| 35 | |||
| 36 | /* kick up bootloader */ | ||
| 37 | #ifndef BOOTMAGIC_KEY_BOOTLOADER | ||
| 38 | # define BOOTMAGIC_KEY_BOOTLOADER KC_B | ||
| 39 | #endif | ||
| 40 | |||
| 41 | /* debug enable */ | ||
| 42 | #ifndef BOOTMAGIC_KEY_DEBUG_ENABLE | ||
| 43 | # define BOOTMAGIC_KEY_DEBUG_ENABLE KC_D | ||
| 44 | #endif | ||
| 45 | #ifndef BOOTMAGIC_KEY_DEBUG_MATRIX | ||
| 46 | # define BOOTMAGIC_KEY_DEBUG_MATRIX KC_X | ||
| 47 | #endif | ||
| 48 | #ifndef BOOTMAGIC_KEY_DEBUG_KEYBOARD | ||
| 49 | # define BOOTMAGIC_KEY_DEBUG_KEYBOARD KC_K | ||
| 50 | #endif | ||
| 51 | #ifndef BOOTMAGIC_KEY_DEBUG_MOUSE | ||
| 52 | # define BOOTMAGIC_KEY_DEBUG_MOUSE KC_M | ||
| 53 | #endif | ||
| 54 | #ifndef BOOTMAGIC_KEY_EE_HANDS_LEFT | ||
| 55 | # define BOOTMAGIC_KEY_EE_HANDS_LEFT KC_L | ||
| 56 | #endif | ||
| 57 | #ifndef BOOTMAGIC_KEY_EE_HANDS_RIGHT | ||
| 58 | # define BOOTMAGIC_KEY_EE_HANDS_RIGHT KC_R | ||
| 59 | #endif | ||
| 60 | |||
| 61 | /* | ||
| 62 | * keymap config | ||
| 63 | */ | ||
| 64 | #ifndef BOOTMAGIC_KEY_SWAP_CONTROL_CAPSLOCK | ||
| 65 | # define BOOTMAGIC_KEY_SWAP_CONTROL_CAPSLOCK KC_LCTRL | ||
| 66 | #endif | ||
| 67 | #ifndef BOOTMAGIC_KEY_CAPSLOCK_TO_CONTROL | ||
| 68 | # define BOOTMAGIC_KEY_CAPSLOCK_TO_CONTROL KC_CAPSLOCK | ||
| 69 | #endif | ||
| 70 | #ifndef BOOTMAGIC_KEY_SWAP_LALT_LGUI | ||
| 71 | # define BOOTMAGIC_KEY_SWAP_LALT_LGUI KC_LALT | ||
| 72 | #endif | ||
| 73 | #ifndef BOOTMAGIC_KEY_SWAP_RALT_RGUI | ||
| 74 | # define BOOTMAGIC_KEY_SWAP_RALT_RGUI KC_RALT | ||
| 75 | #endif | ||
| 76 | #ifndef BOOTMAGIC_KEY_NO_GUI | ||
| 77 | # define BOOTMAGIC_KEY_NO_GUI KC_LGUI | ||
| 78 | #endif | ||
| 79 | #ifndef BOOTMAGIC_KEY_SWAP_GRAVE_ESC | ||
| 80 | # define BOOTMAGIC_KEY_SWAP_GRAVE_ESC KC_GRAVE | ||
| 81 | #endif | ||
| 82 | #ifndef BOOTMAGIC_KEY_SWAP_BACKSLASH_BACKSPACE | ||
| 83 | # define BOOTMAGIC_KEY_SWAP_BACKSLASH_BACKSPACE KC_BSLASH | ||
| 84 | #endif | ||
| 85 | #ifndef BOOTMAGIC_HOST_NKRO | ||
| 86 | # define BOOTMAGIC_HOST_NKRO KC_N | ||
| 87 | #endif | ||
| 88 | |||
| 89 | /* | ||
| 90 | * change default layer | ||
| 91 | */ | ||
| 92 | #ifndef BOOTMAGIC_KEY_DEFAULT_LAYER_0 | ||
| 93 | # define BOOTMAGIC_KEY_DEFAULT_LAYER_0 KC_0 | ||
| 94 | #endif | ||
| 95 | #ifndef BOOTMAGIC_KEY_DEFAULT_LAYER_1 | ||
| 96 | # define BOOTMAGIC_KEY_DEFAULT_LAYER_1 KC_1 | ||
| 97 | #endif | ||
| 98 | #ifndef BOOTMAGIC_KEY_DEFAULT_LAYER_2 | ||
| 99 | # define BOOTMAGIC_KEY_DEFAULT_LAYER_2 KC_2 | ||
| 100 | #endif | ||
| 101 | #ifndef BOOTMAGIC_KEY_DEFAULT_LAYER_3 | ||
| 102 | # define BOOTMAGIC_KEY_DEFAULT_LAYER_3 KC_3 | ||
| 103 | #endif | ||
| 104 | #ifndef BOOTMAGIC_KEY_DEFAULT_LAYER_4 | ||
| 105 | # define BOOTMAGIC_KEY_DEFAULT_LAYER_4 KC_4 | ||
| 106 | #endif | ||
| 107 | #ifndef BOOTMAGIC_KEY_DEFAULT_LAYER_5 | ||
| 108 | # define BOOTMAGIC_KEY_DEFAULT_LAYER_5 KC_5 | ||
| 109 | #endif | ||
| 110 | #ifndef BOOTMAGIC_KEY_DEFAULT_LAYER_6 | ||
| 111 | # define BOOTMAGIC_KEY_DEFAULT_LAYER_6 KC_6 | ||
| 112 | #endif | ||
| 113 | #ifndef BOOTMAGIC_KEY_DEFAULT_LAYER_7 | ||
| 114 | # define BOOTMAGIC_KEY_DEFAULT_LAYER_7 KC_7 | ||
| 115 | #endif \ No newline at end of file | ||
diff --git a/quantum/template/avr/rules.mk b/quantum/template/avr/rules.mk index 5c0d8f307..62fbb3434 100644 --- a/quantum/template/avr/rules.mk +++ b/quantum/template/avr/rules.mk | |||
| @@ -7,7 +7,7 @@ BOOTLOADER = atmel-dfu | |||
| 7 | # Build Options | 7 | # Build Options |
| 8 | # change yes to no to disable | 8 | # change yes to no to disable |
| 9 | # | 9 | # |
| 10 | BOOTMAGIC_ENABLE = lite # Virtual DIP switch configuration | 10 | BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite |
| 11 | MOUSEKEY_ENABLE = yes # Mouse keys | 11 | MOUSEKEY_ENABLE = yes # Mouse keys |
| 12 | EXTRAKEY_ENABLE = yes # Audio control and System control | 12 | EXTRAKEY_ENABLE = yes # Audio control and System control |
| 13 | CONSOLE_ENABLE = no # Console for debug | 13 | CONSOLE_ENABLE = no # Console for debug |
diff --git a/quantum/template/ps2avrgb/rules.mk b/quantum/template/ps2avrgb/rules.mk index 1b61e9534..6c0b7cc23 100644 --- a/quantum/template/ps2avrgb/rules.mk +++ b/quantum/template/ps2avrgb/rules.mk | |||
| @@ -7,7 +7,7 @@ BOOTLOADER = bootloadHID | |||
| 7 | # Build Options | 7 | # Build Options |
| 8 | # change yes to no to disable | 8 | # change yes to no to disable |
| 9 | # | 9 | # |
| 10 | BOOTMAGIC_ENABLE = lite # Virtual DIP switch configuration | 10 | BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite |
| 11 | MOUSEKEY_ENABLE = yes # Mouse keys | 11 | MOUSEKEY_ENABLE = yes # Mouse keys |
| 12 | EXTRAKEY_ENABLE = yes # Audio control and System control | 12 | EXTRAKEY_ENABLE = yes # Audio control and System control |
| 13 | CONSOLE_ENABLE = no # Console for debug | 13 | CONSOLE_ENABLE = no # Console for debug |
