From 5fdb49b5dbf11025e0425950a1e32b88e21d596f Mon Sep 17 00:00:00 2001
From: jack <0x6A73@pm.me>
Date: Mon, 17 Oct 2022 10:13:40 -0600
Subject: [PATCH] Fixup handwired/kbod (#18754)
---
keyboards/handwired/kbod/config.h | 42 +------------------
.../handwired/kbod/keymaps/default/keymap.c | 24 ++++-------
.../handwired/kbod/keymaps/default/readme.md | 5 ---
.../handwired/kbod/keymaps/default/rules.mk | 9 ----
4 files changed, 9 insertions(+), 71 deletions(-)
delete mode 100644 keyboards/handwired/kbod/keymaps/default/readme.md
delete mode 100644 keyboards/handwired/kbod/keymaps/default/rules.mk
diff --git a/keyboards/handwired/kbod/config.h b/keyboards/handwired/kbod/config.h
index 44046dcfa1..6a9ea21270 100644
--- a/keyboards/handwired/kbod/config.h
+++ b/keyboards/handwired/kbod/config.h
@@ -23,60 +23,21 @@ along with this program. If not, see .
#define MATRIX_ROWS 8
#define MATRIX_COLS 8
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
-*/
#define MATRIX_ROW_PINS { C6, D7, E6, B4, B5, B6, B7, D6 }
#define MATRIX_COL_PINS { D0, D1, F0, F1, F4, F5, F6, F7 }
-/* COL2ROW, ROW2COL*/
#define DIODE_DIRECTION COL2ROW
-// #define BACKLIGHT_PIN B7
-// #define BACKLIGHT_BREATHING
-// #define BACKLIGHT_LEVELS 3
+#define LED_CAPS_LOCK_PIN B0
/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
#define DEBOUNCE 5
-/* define if matrix has ghost (lacks anti-ghosting diodes) */
-//#define MATRIX_HAS_GHOST
-
-/* number of backlight levels */
-
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE
/* Locking resynchronize hack */
#define LOCKING_RESYNC_ENABLE
-/*
- * Force NKRO
- *
- * Force NKRO (nKey Rollover) to be enabled by default, regardless of the saved
- * state in the bootmagic EEPROM settings. (Note that NKRO must be enabled in the
- * makefile for this to work.)
- *
- * If forced on, NKRO can be disabled via magic key (default = LShift+RShift+N)
- * until the next keyboard reset.
- *
- * NKRO may prevent your keystrokes from being detected in the BIOS, but it is
- * fully operational during normal computer usage.
- *
- * For a less heavy-handed approach, enable NKRO via magic key (LShift+RShift+N)
- * or via bootmagic (hold SPACE+N while plugging in the keyboard). Once set by
- * bootmagic, NKRO mode will always be enabled until it is toggled again during a
- * power-up.
- *
- */
-//#define FORCE_NKRO
-
/*
* Feature disable options
* These options are also useful to firmware size reduction.
@@ -93,5 +54,4 @@ along with this program. If not, see .
//#define NO_ACTION_TAPPING
//#define NO_ACTION_ONESHOT
-#undef TAPPING_TOGGLE
#define TAPPING_TOGGLE 2
diff --git a/keyboards/handwired/kbod/keymaps/default/keymap.c b/keyboards/handwired/kbod/keymaps/default/keymap.c
index 0ffc3e9d97..856f0eda60 100644
--- a/keyboards/handwired/kbod/keymaps/default/keymap.c
+++ b/keyboards/handwired/kbod/keymaps/default/keymap.c
@@ -61,7 +61,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
bool process_record_user(uint16_t keycode, keyrecord_t *record) {
switch (keycode) {
case SFT_ESC:
- SET_WHETHER(MODS_PRESSED(SHIFT), KC_ESC, KC_GRAVE);
+ SET_WHETHER(MODS_PRESSED(SFT), KC_ESC, KC_GRAVE);
return false;
@@ -75,24 +75,16 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
}
}
-void led_set_user(uint8_t usb_led) {
- if (usb_led & _BV(USB_LED_CAPS_LOCK)) {
- PORTB |= _BV(PB0);
- } else {
- PORTB &= ~_BV(PB0);
- }
-}
-
void matrix_init_user(void) {
- DDRB |= _BV(PB0);
- DDRC |= _BV(PC7);
+ setPinOutput(C7);
+ writePinLow(C7);
}
-void matrix_scan_user(void) {
- uint8_t layer = get_highest_layer(layer_state);
- if (layer) {
- PORTC |= _BV(PC7);
+layer_state_t layer_state_set_user(layer_state_t state) {
+ if (get_highest_layer(state)) {
+ writePinHigh(C7);
} else {
- PORTC &= ~_BV(PC7);
+ writePinLow(C7);
}
+ return state;
}
diff --git a/keyboards/handwired/kbod/keymaps/default/readme.md b/keyboards/handwired/kbod/keymaps/default/readme.md
deleted file mode 100644
index 35c22ec007..0000000000
--- a/keyboards/handwired/kbod/keymaps/default/readme.md
+++ /dev/null
@@ -1,5 +0,0 @@
-# The default keymap for kbod
-
-This is the default keymap for kbod,
-
-it consists of a base layer with QWERTY layout, a momentary cursor-layer, and mouse-keys and multimedia layers.
\ No newline at end of file
diff --git a/keyboards/handwired/kbod/keymaps/default/rules.mk b/keyboards/handwired/kbod/keymaps/default/rules.mk
deleted file mode 100644
index 0db36fdd09..0000000000
--- a/keyboards/handwired/kbod/keymaps/default/rules.mk
+++ /dev/null
@@ -1,9 +0,0 @@
-BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes # Mouse keys(+4700)
-EXTRAKEY_ENABLE = yes # Audio control and System control(+450)
-CONSOLE_ENABLE = no # Console for debug(+400)
-COMMAND_ENABLE = no # Commands for debug and configuration
-NKRO_ENABLE = yes
-BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
-AUDIO_ENABLE = no # Audio output
-RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight.