aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJack Sangdahl <[email protected]>2024-07-20 17:54:32 -0600
committerJack Sangdahl <[email protected]>2024-07-20 17:54:32 -0600
commit4151a2ceac0c73adbae5e1241629d7acc2def064 (patch)
tree2294ac090c715a05a122e5b661bac4f01b326e0c
parent19001aa5bd1a5e3643229253aa8e289125a0340d (diff)
downloadqmk_me-4151a2ceac0c73adbae5e1241629d7acc2def064.tar.gz
qmk_me-4151a2ceac0c73adbae5e1241629d7acc2def064.zip
use upstream bully keyboard, fix some functions
-rw-r--r--keyboards/bully/keyboard.json67
-rw-r--r--keyboards/bully/rules.mk1
-rw-r--r--keymaps/bully/keymap.c (renamed from keyboards/bully/keymaps/waffle/keymap.c)6
-rw-r--r--keymaps/crkbd/keymap.c14
-rwxr-xr-xutil/link.sh1
-rw-r--r--waffle/waffle.c4
-rw-r--r--waffle/waffle.h1
7 files changed, 13 insertions, 81 deletions
diff --git a/keyboards/bully/keyboard.json b/keyboards/bully/keyboard.json
deleted file mode 100644
index d813721..0000000
--- a/keyboards/bully/keyboard.json
+++ /dev/null
@@ -1,67 +0,0 @@
-{
- "keyboard_name": "bully",
- "manufacturer": "jacks",
- "maintainer": "pngu.org",
- "processor": "STM32F072",
- "bootloader": "stm32-dfu",
- "diode_direction": "COL2ROW",
- "matrix_pins": {
- "cols": ["B0", "A7", "A6", "A5", "A4", "A2", "B7", "B6", "B5", "B4", "B3", "A15"],
- "rows": ["B10", "B11", "B1", "B2"]
- },
- "usb": {
- "vid": "0x6A73",
- "pid": "0x6279",
- "device_version": "1.0.0"
- },
- "layouts": {
- "LAYOUT": {
- "layout": [
- { "label": "", "matrix": [0, 0], "w": 1.5, "x": 0, "y": 0 },
- { "label": "q", "matrix": [0, 1], "x": 1.5, "y": 0 },
- { "label": "w", "matrix": [0, 2], "x": 2.5, "y": 0 },
- { "label": "e", "matrix": [0, 3], "x": 3.5, "y": 0 },
- { "label": "r", "matrix": [0, 4], "x": 4.5, "y": 0 },
- { "label": "t", "matrix": [0, 5], "x": 5.5, "y": 0 },
- { "label": "y", "matrix": [0, 6], "x": 6.5, "y": 0 },
- { "label": "u", "matrix": [0, 7], "x": 7.5, "y": 0 },
- { "label": "i", "matrix": [0, 8], "x": 8.5, "y": 0 },
- { "label": "o", "matrix": [0, 9], "x": 9.5, "y": 0 },
- { "label": "p", "matrix": [0, 10], "x": 10.5, "y": 0 },
- {"matrix": [0, 11], "x": 11.5, "y": 0},
- {"matrix": [3, 11], "x": 12.5, "y": 0},
- { "label": "", "matrix": [1, 0], "w": 1.75, "x": 0, "y": 1 },
- { "label": "a", "matrix": [1, 1], "x": 1.75, "y": 1 },
- { "label": "s", "matrix": [1, 2], "x": 2.75, "y": 1 },
- { "label": "d", "matrix": [1, 3], "x": 3.75, "y": 1 },
- { "label": "f", "matrix": [1, 4], "x": 4.75, "y": 1 },
- { "label": "g", "matrix": [1, 5], "x": 5.75, "y": 1 },
- { "label": "h", "matrix": [1, 6], "x": 6.75, "y": 1 },
- { "label": "j", "matrix": [1, 7], "x": 7.75, "y": 1 },
- { "label": "k", "matrix": [1, 8], "x": 8.75, "y": 1 },
- { "label": "l", "matrix": [1, 9], "x": 9.75, "y": 1 },
- { "label": ";", "matrix": [1, 10], "x": 10.75, "y": 1 },
- { "label": "bspc", "matrix": [1, 11], "w": 1.75, "x": 11.75, "y": 1 },
- { "label": "", "matrix": [2, 0], "w": 2.25, "x": 0, "y": 2 },
- { "label": "z", "matrix": [2, 1], "x": 2.25, "y": 2 },
- { "label": "x", "matrix": [2, 2], "x": 3.25, "y": 2 },
- { "label": "c", "matrix": [2, 3], "x": 4.25, "y": 2 },
- { "label": "v", "matrix": [2, 4], "x": 5.25, "y": 2 },
- { "label": "b", "matrix": [2, 5], "x": 6.25, "y": 2 },
- { "label": "n", "matrix": [2, 6], "x": 7.25, "y": 2 },
- { "label": "m", "matrix": [2, 7], "x": 8.25, "y": 2 },
- { "label": ",", "matrix": [2, 8], "x": 9.25, "y": 2 },
- { "label": ".", "matrix": [2, 9], "x": 10.25, "y": 2 },
- { "label": "/", "matrix": [2, 10], "x": 11.25, "y": 2 },
- { "label": "", "matrix": [2, 11], "w": 1.25, "x": 12.25, "y": 2 },
- { "label": "", "matrix": [3, 0], "w": 1.25, "x": 0, "y": 3 },
- { "label": "../", "matrix": [3, 1], "w": 1.25, "x": 1.25, "y": 3 },
- { "label": "esc", "matrix": [3, 2], "w": 1.25, "x": 2.5, "y": 3 },
- { "label": "spc", "matrix": [3, 5], "w": 6.25, "x": 3.75, "y": 3 },
- { "label": "", "matrix": [3, 8], "w": 1.25, "x": 10, "y": 3 },
- { "label": "", "matrix": [3, 9], "w": 1, "x": 11.25, "y": 3 },
- { "label": "", "matrix": [3, 10], "w": 1.25, "x": 12.25, "y": 3 }
- ]
- }
- }
-}
diff --git a/keyboards/bully/rules.mk b/keyboards/bully/rules.mk
deleted file mode 100644
index fb3dcdb..0000000
--- a/keyboards/bully/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-DFU_SUFFIX_ARGS = -p FFFF -v FFFF
diff --git a/keyboards/bully/keymaps/waffle/keymap.c b/keymaps/bully/keymap.c
index c927b21..a459da5 100644
--- a/keyboards/bully/keymaps/waffle/keymap.c
+++ b/keymaps/bully/keymap.c
@@ -8,19 +8,19 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
KC_NO, ___BASE1___, KC_BSPC, KC_BSPC,
NUKE, ___BASE2___, PNP,
KC_NO, ___BASE3___, KC_NO,
- KC_VOLD, UPDIR, KC_ESC, LT(_LOWER, KC_SPC), PSTRSE, KC_NO, KC_VOLU
+ KC_VOLD, UPDIR, KC_ESC, _______, LT(_LOWER, KC_SPC), _______, PSTRSE, KC_NO, KC_VOLU
),
[_LOWER] = LAYOUT_waffle(
_______, ___LOWER1___, _______, _______,
_______, ___LOWER2___, _______,
_______, ___LOWER3___, _______,
- _______, _______, _______, _______, _______, _______, _______
+ _______, _______, _______, _______, _______, _______, _______, _______, _______
),
[_RAISE] = LAYOUT_waffle(
_______, ___RAISE1___, _______, _______,
_______, ___RAISE2___, _______,
_______, ___RAISE3___, _______,
- _______, _______, _______, _______, _______, _______, _______
+ _______, _______, _______, _______, _______, _______, _______, _______, _______
)
};
// clang-format on
diff --git a/keymaps/crkbd/keymap.c b/keymaps/crkbd/keymap.c
index 2269e90..1e8dc2f 100644
--- a/keymaps/crkbd/keymap.c
+++ b/keymaps/crkbd/keymap.c
@@ -29,22 +29,22 @@ void housekeeping_task_keymap(void) {
if (last_input_activity_elapsed() > 300000) {
const pin_t row_pins[] = MATRIX_ROW_PINS, col_pins[] = MATRIX_COL_PINS;
for (uint8_t i = 0; i < ARRAY_SIZE(col_pins); ++i) {
- setPinOutput(col_pins[i]);
- writePinLow(col_pins[i]);
+ gpio_set_pin_output(col_pins[i]);
+ gpio_write_pin_low(col_pins[i]);
}
for (uint8_t i = 0; i < ARRAY_SIZE(row_pins); ++i) {
- setPinInputHigh(row_pins[i]);
+ gpio_set_pin_input_high(row_pins[i]);
palEnableLineEvent(row_pins[i], PAL_EVENT_MODE_BOTH_EDGES);
}
__WFI();
for (uint8_t i = 0; i < ARRAY_SIZE(row_pins); ++i) {
palDisableLineEvent(row_pins[i]);
- writePinHigh(row_pins[i]);
- setPinInputHigh(row_pins[i]);
+ gpio_write_pin_high(row_pins[i]);
+ gpio_set_pin_input_high(row_pins[i]);
}
for (uint8_t i = 0; i < ARRAY_SIZE(col_pins); ++i) {
- writePinHigh(col_pins[i]);
- setPinInputHigh(col_pins[i]);
+ gpio_write_pin_high(col_pins[i]);
+ gpio_set_pin_input_high(col_pins[i]);
}
}
}
diff --git a/util/link.sh b/util/link.sh
index 27aebeb..2d7a394 100755
--- a/util/link.sh
+++ b/util/link.sh
@@ -23,6 +23,7 @@ link() {
}
link crkbd crkbd
+link bully mkh_studio/bully
link f60 bioi/f60
link ferris ferris
link kyria splitkb/kyria
diff --git a/waffle/waffle.c b/waffle/waffle.c
index 4d63eef..b48eec6 100644
--- a/waffle/waffle.c
+++ b/waffle/waffle.c
@@ -47,11 +47,11 @@ void keyboard_post_init_user(void) {
#endif
#ifdef RGBLIGHT_ENABLE
rgblight_enable_noeeprom();
- rgblight_sethsv_noeeprom(RGB_CYAN);
+ rgblight_sethsv_noeeprom(HSV_CYAN);
rgblight_mode_noeeprom(RGBLIGHT_MODE_STATIC_LIGHT);
#elif RGB_MATRIX_ENABLE
rgb_matrix_enable_noeeprom();
- rgb_matrix_sethsv_noeeprom(RGB_CYAN);
+ rgb_matrix_sethsv_noeeprom(HSV_CYAN);
rgb_matrix_mode_noeeprom(RGB_MATRIX_SOLID_COLOR);
#endif
#ifdef CONSOLE_ENABLE
diff --git a/waffle/waffle.h b/waffle/waffle.h
index 08e67be..d95b5a7 100644
--- a/waffle/waffle.h
+++ b/waffle/waffle.h
@@ -77,5 +77,4 @@ void raise_paste(tap_dance_state_t *state, void *user_data);
#define LAYOUT_waffle_60_ts(...) LAYOUT_60_ansi_tsangan(__VA_ARGS__)
#define LAYOUT_waffle_3x6(...) LAYOUT_split_3x6_3(__VA_ARGS__)
-#define LAYOUT_waffle_3x5(...) LAYOUT_split_3x5_3(__VA_ARGS__)
#define LAYOUT_waffle(...) LAYOUT(__VA_ARGS__)