diff options
Diffstat (limited to 'keyboards/idobao/id87')
-rw-r--r-- | keyboards/idobao/id87/v1/config.h | 16 | ||||
-rw-r--r-- | keyboards/idobao/id87/v1/info.json | 9 | ||||
-rw-r--r-- | keyboards/idobao/id87/v1/rules.mk | 8 | ||||
-rw-r--r-- | keyboards/idobao/id87/v2/config.h | 1 | ||||
-rw-r--r-- | keyboards/idobao/id87/v2/info.json | 1 | ||||
-rw-r--r-- | keyboards/idobao/id87/v2/keymaps/idobao/keymap.c | 32 | ||||
-rw-r--r-- | keyboards/idobao/id87/v2/keymaps/via/keymap.c | 4 |
7 files changed, 15 insertions, 56 deletions
diff --git a/keyboards/idobao/id87/v1/config.h b/keyboards/idobao/id87/v1/config.h index 6c2d6fc9ce..2f4ebd7744 100644 --- a/keyboards/idobao/id87/v1/config.h +++ b/keyboards/idobao/id87/v1/config.h @@ -14,11 +14,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once -#include "config_common.h" - -/* key matrix size */ -#define MATRIX_ROWS 11 -#define MATRIX_COLS 9 /* * Keyboard Matrix Assignments @@ -38,19 +33,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. /* COL2ROW, ROW2COL*/ #define DIODE_DIRECTION ROW2COL -#define BACKLIGHT_PIN B6 -#ifdef BACKLIGHT_PIN -#define BACKLIGHT_LEVELS 3 -#endif - -#define LED_CAPS_LOCK_PIN C7 - -/* Set 0 if debouncing isn't needed */ -#define DEBOUNCE 5 - #define RGB_DI_PIN E2 #ifdef RGB_DI_PIN - // RGBLIGHT_ANIMATIONS #define RGBLIGHT_EFFECT_ALTERNATING #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_CHRISTMAS diff --git a/keyboards/idobao/id87/v1/info.json b/keyboards/idobao/id87/v1/info.json index 9f7c94619f..ca39654575 100644 --- a/keyboards/idobao/id87/v1/info.json +++ b/keyboards/idobao/id87/v1/info.json @@ -8,6 +8,15 @@ "pid": "0x0087", "device_version": "0.0.1" }, + "backlight": { + "pin": "B6" + }, + "indicators": { + "caps_lock": "C7" + }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", + "community_layouts": ["tkl_ansi"], "layouts": { "LAYOUT_tkl_ansi": { "layout": [ diff --git a/keyboards/idobao/id87/v1/rules.mk b/keyboards/idobao/id87/v1/rules.mk index 5009fceaf9..3d5cb57ad5 100644 --- a/keyboards/idobao/id87/v1/rules.mk +++ b/keyboards/idobao/id87/v1/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # @@ -16,5 +10,3 @@ NKRO_ENABLE = yes # Enable N-Key Rollover BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow AUDIO_ENABLE = no # Audio output - -LAYOUTS = tkl_ansi diff --git a/keyboards/idobao/id87/v2/config.h b/keyboards/idobao/id87/v2/config.h index 08ce4f0af4..02b62fc61f 100644 --- a/keyboards/idobao/id87/v2/config.h +++ b/keyboards/idobao/id87/v2/config.h @@ -3,7 +3,6 @@ #pragma once -#include "config_common.h" /* ---------------- * RGB Matrix stuff diff --git a/keyboards/idobao/id87/v2/info.json b/keyboards/idobao/id87/v2/info.json index 7292ce29ca..6272c02d96 100644 --- a/keyboards/idobao/id87/v2/info.json +++ b/keyboards/idobao/id87/v2/info.json @@ -14,7 +14,6 @@ "backlight": false, "rgblight": false }, - "debounce": 5, "matrix_pins": { "cols": ["D0", "D1", "D2", "D3", "D5", "D4", "D6", "D7", "B4"], "rows": ["E6", "B0", "B1", "B2", "B3", "B7", "F7", "F6", "F5", "F4", "F1"] diff --git a/keyboards/idobao/id87/v2/keymaps/idobao/keymap.c b/keyboards/idobao/id87/v2/keymaps/idobao/keymap.c index 387ee85ca5..53871f9161 100644 --- a/keyboards/idobao/id87/v2/keymaps/idobao/keymap.c +++ b/keyboards/idobao/id87/v2/keymaps/idobao/keymap.c @@ -22,13 +22,11 @@ typedef union { #endif // RGB_MATRIX_ENABLE enum { - KC_MCON = USER00, // macOS Open Mission Control - KC_LPAD, // macOS Open Launchpad #ifdef RGB_MATRIX_ENABLE - RGB_TPK, // Toggle Per-Key + RGB_TPK = QK_KB_0, // Toggle Per-Key RGB_TUG, // Toggle Underglow #endif // RGB_MATRIX_ENABLE - KB_VRSN = USER09 // debug, type version + KB_VRSN = QK_KB_9 // debug, type version }; #ifndef RGB_MATRIX_ENABLE @@ -36,11 +34,6 @@ enum { #define RGB_TUG _______ #endif -enum macos_consumer_usages { - _AC_SHOW_ALL_WINDOWS = 0x29F, // mapped to KC_MCON - _AC_SHOW_ALL_APPS = 0x2A0 // mapped to KC_LPAD -}; - const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { /* * ┌───┐ ┌───┬───┬───┬───┐ ┌───┬───┬───┬───┐ ┌───┬───┬───┬───┐ ┌───┬───┬───┐ @@ -110,8 +103,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { */ [2] = LAYOUT_tkl_ansi( _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - MACRO00, MACRO01, MACRO02, MACRO03, MACRO04, MACRO05, MACRO06, MACRO07, MACRO08, MACRO09, MACRO10, _______, _______, _______, _______, _______, _______, - _______, MACRO11, MACRO12, MACRO13, MACRO14, MACRO15, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + MC_0, MC_1, MC_2, MC_3, MC_4, MC_5, MC_6, MC_7, MC_8, MC_9, MC_10, _______, _______, _______, _______, _______, _______, + _______, MC_11, MC_12, MC_13, MC_14, MC_15, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ @@ -277,23 +270,6 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { } return false; - // @see: https://github.com/qmk/qmk_firmware/issues/10111#issuecomment-752300353 - case KC_MCON: - if (record->event.pressed) { - host_consumer_send(_AC_SHOW_ALL_WINDOWS); - } else { - host_consumer_send(0); - } - return false; - - case KC_LPAD: - if (record->event.pressed) { - host_consumer_send(_AC_SHOW_ALL_APPS); - } else { - host_consumer_send(0); - } - return false; - default: return true; /* Process all other keycodes normally */ } diff --git a/keyboards/idobao/id87/v2/keymaps/via/keymap.c b/keyboards/idobao/id87/v2/keymaps/via/keymap.c index 2d4ea973f8..cfdf65ae6f 100644 --- a/keyboards/idobao/id87/v2/keymaps/via/keymap.c +++ b/keyboards/idobao/id87/v2/keymaps/via/keymap.c @@ -72,8 +72,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { */ [2] = LAYOUT_tkl_ansi( _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - MACRO00, MACRO01, MACRO02, MACRO03, MACRO04, MACRO05, MACRO06, MACRO07, MACRO08, MACRO09, MACRO10, _______, _______, _______, _______, _______, _______, - _______, MACRO11, MACRO12, MACRO13, MACRO14, MACRO15, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + MC_0, MC_1, MC_2, MC_3, MC_4, MC_5, MC_6, MC_7, MC_8, MC_9, MC_10, _______, _______, _______, _______, _______, _______, + _______, MC_11, MC_12, MC_13, MC_14, MC_15, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ |