diff options
author | jack <[email protected]> | 2022-11-06 11:22:46 -0700 |
---|---|---|
committer | jack <[email protected]> | 2022-11-06 11:22:46 -0700 |
commit | bf28a42da8aabbac4dec0cb767c64e4af5585e51 (patch) | |
tree | 564d555211a8692bf1660345eb76b210bdf34af5 | |
parent | e55177fb5b88a09c8d9882a33c33c5bfbc19e1fb (diff) | |
download | qmk_me-bf28a42da8aabbac4dec0cb767c64e4af5585e51.tar.gz qmk_me-bf28a42da8aabbac4dec0cb767c64e4af5585e51.zip |
leftover30 data driven
develop alignment updates
misc readme updates
-rw-r--r-- | keyboards/leftover30/chconf.h | 6 | ||||
-rw-r--r-- | keyboards/leftover30/config.h | 18 | ||||
-rw-r--r-- | keyboards/leftover30/halconf.h | 4 | ||||
-rw-r--r-- | keyboards/leftover30/info.json | 70 | ||||
-rw-r--r-- | keyboards/leftover30/keymaps/waffle/keymap.c | 2 | ||||
-rw-r--r-- | keyboards/leftover30/leftover30.c | 1 | ||||
-rw-r--r-- | keyboards/leftover30/leftover30.h | 18 | ||||
-rw-r--r-- | keyboards/leftover30/mcuconf.h | 4 | ||||
-rw-r--r-- | keyboards/leftover30/readme.md | 5 | ||||
-rw-r--r-- | keyboards/leftover30/rules.mk | 4 | ||||
-rw-r--r-- | keyboards/minidox/readme.md | 6 | ||||
-rw-r--r-- | keyboards/relic/readme.md | 3 | ||||
-rw-r--r-- | keymaps/f60/readme.md | 4 | ||||
-rw-r--r-- | keymaps/ferris/config.h | 2 | ||||
-rw-r--r-- | waffle/config.h | 2 | ||||
-rw-r--r-- | waffle/tapping.c | 4 | ||||
-rw-r--r-- | waffle/unicode.c | 4 | ||||
-rw-r--r-- | waffle/waffle.c | 2 |
18 files changed, 102 insertions, 57 deletions
diff --git a/keyboards/leftover30/chconf.h b/keyboards/leftover30/chconf.h index 558dd84..2f7d0b2 100644 --- a/keyboards/leftover30/chconf.h +++ b/keyboards/leftover30/chconf.h @@ -1,9 +1,7 @@ +// Copyright 2022 jack (@waffle87) +// SPDX-License-Identifier: GPL-3.0-or-later #pragma once - #define CH_CFG_ST_FREQUENCY 10000 - #define CH_CFG_OPTIMIZE_SPEED FALSE - #define CH_CFG_USE_CONDVARS_TIMEOUT FALSE - #include_next <chconf.h> diff --git a/keyboards/leftover30/config.h b/keyboards/leftover30/config.h index d775cd3..7c9bf59 100644 --- a/keyboards/leftover30/config.h +++ b/keyboards/leftover30/config.h @@ -1,20 +1,6 @@ +// Copyright 2022 jack (@waffle87) +// SPDX-License-Identifier: GPL-3.0-or-later #pragma once -#define VENDOR_ID 0x6A73 -#define PRODUCT_ID 0x6C6F -#define DEVICE_VER 0x0001 -#define PRODUCT "leftover" - -#define MATRIX_ROWS 4 -#define MATRIX_COLS 11 -#define MATRIX_ROW_PINS { B3, B4, C13, A5 } -#define MATRIX_COL_PINS { A15, B9, B8, B7, B6, B5, C14, C15, F1, F0, A1 } -#define DIODE_DIRECTION COL2ROW - -#define ENCODERS_PAD_A { B12 } -#define ENCODERS_PAD_B { B14 } - -#define RGB_DI_PIN B15 -#define RGBLED_NUM 7 #define WS2812_SPI SPID2 #define WS2812_SPI_MOSI_PAL_MODE 0 #define WS2812_SPI_SCK_PIN B13 diff --git a/keyboards/leftover30/halconf.h b/keyboards/leftover30/halconf.h index 02ef4f6..c539e8e 100644 --- a/keyboards/leftover30/halconf.h +++ b/keyboards/leftover30/halconf.h @@ -1,5 +1,5 @@ +// Copyright 2022 jack (@waffle87) +// SPDX-License-Identifier: GPL-3.0-or-later #pragma once - #define HAL_USE_SPI TRUE - #include_next <halconf.h> diff --git a/keyboards/leftover30/info.json b/keyboards/leftover30/info.json new file mode 100644 index 0000000..1bb80a0 --- /dev/null +++ b/keyboards/leftover30/info.json @@ -0,0 +1,70 @@ +{ + "keyboard_name": "leftover30", + "processor": "STM32F072", + "bootloader": "stm32-dfu", + "diode_direction": "COL2ROW", + "encoder": { + "enabled": true, + "rotary": [ + {"pin_a": "B12", "pin_b": "B14"} + ] + }, + "features": { + "rgblight": true + }, + "matrix_pins": { + "cols": ["A15", "B9", "B8", "B7", "B6", "B5", "C14", "C15", "F1", "F0", "A1"], + "rows": ["B3", "B4", "C13", "A5"] + }, + "rgblight": { + "led_count": 7, + "pin": "B15" + }, + "usb": { + "device_version": "0.0.1", + "pid": "0x6C6F", + "vid": "0x6A73" + }, + "layouts": { + "LAYOUT": { + "layout": [ + { "matrix": [0, 0]}, + { "matrix": [0, 1]}, + { "matrix": [0, 2]}, + { "matrix": [0, 3]}, + { "matrix": [0, 4]}, + { "matrix": [0, 5]}, + { "matrix": [0, 6]}, + { "matrix": [0, 7]}, + { "matrix": [0, 8]}, + { "matrix": [0, 9]}, + { "matrix": [0, 10]}, + { "matrix": [1, 0]}, + { "matrix": [1, 1]}, + { "matrix": [1, 2]}, + { "matrix": [1, 3]}, + { "matrix": [1, 4]}, + { "matrix": [1, 5]}, + { "matrix": [1, 6]}, + { "matrix": [1, 7]}, + { "matrix": [1, 8]}, + { "matrix": [1, 10]}, + { "matrix": [2, 0]}, + { "matrix": [2, 1]}, + { "matrix": [2, 2]}, + { "matrix": [2, 3]}, + { "matrix": [2, 4]}, + { "matrix": [2, 5]}, + { "matrix": [2, 6]}, + { "matrix": [2, 7]}, + { "matrix": [2, 8]}, + { "matrix": [2, 9]}, + { "matrix": [3, 0]}, + { "matrix": [3, 1]}, + { "matrix": [3, 5]}, + { "matrix": [3, 8]}, + { "matrix": [3, 9]} + ] + } + } +} diff --git a/keyboards/leftover30/keymaps/waffle/keymap.c b/keyboards/leftover30/keymaps/waffle/keymap.c index 6c02950..b7cf496 100644 --- a/keyboards/leftover30/keymaps/waffle/keymap.c +++ b/keyboards/leftover30/keymaps/waffle/keymap.c @@ -1,3 +1,5 @@ +// Copyright 2022 jack (@waffle87) +// SPDX-License-Identifier: GPL-3.0-or-later #include "waffle.h" const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_BASE] = LAYOUT_waffle( diff --git a/keyboards/leftover30/leftover30.c b/keyboards/leftover30/leftover30.c deleted file mode 100644 index b7b9c32..0000000 --- a/keyboards/leftover30/leftover30.c +++ /dev/null @@ -1 +0,0 @@ -#include "leftover30_arm.h" diff --git a/keyboards/leftover30/leftover30.h b/keyboards/leftover30/leftover30.h deleted file mode 100644 index 05500ab..0000000 --- a/keyboards/leftover30/leftover30.h +++ /dev/null @@ -1,18 +0,0 @@ -#pragma once - -#include "quantum.h" - -#define XXX KC_NO - -#define LAYOUT( \ - k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, \ - k10, k11, k12, k13, k14, k15, k16, k17, k18, k1a, \ - k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, \ - k30, k31, k35, k38, k39 \ -) \ -{ \ - { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a }, \ - { k10, k11, k12, k13, k14, k15, k16, k17, k18, XXX, k1a }, \ - { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, XXX }, \ - { k30, k31, XXX, XXX, XXX, k35, XXX, XXX, k38, k39, XXX } \ -} diff --git a/keyboards/leftover30/mcuconf.h b/keyboards/leftover30/mcuconf.h index 2e058f3..c683195 100644 --- a/keyboards/leftover30/mcuconf.h +++ b/keyboards/leftover30/mcuconf.h @@ -1,6 +1,6 @@ +// Copyright 2022 jack (@waffle87) +// SPDX-License-Identifier: GPL-3.0-or-later #pragma once - #include_next <mcuconf.h> - #undef STM32_SPI_USE_SPI2 #define STM32_SPI_USE_SPI2 TRUE diff --git a/keyboards/leftover30/readme.md b/keyboards/leftover30/readme.md new file mode 100644 index 0000000..7eb9850 --- /dev/null +++ b/keyboards/leftover30/readme.md @@ -0,0 +1,5 @@ +### leftover30 +originally designed by [marksard](https://github.com/marksard/Keyboards/tree/master/leftover30), but the pcb seems to be mia...\ +(arm) pcb redesigned by [tominabox1](https://github.com/tominabox1/) with a somewhat jank case from p3d. +![front](https://i.imgur.com/O6vY5omh.jpeg) +![back](https://i.imgur.com/on9pBoAh.jpeg) diff --git a/keyboards/leftover30/rules.mk b/keyboards/leftover30/rules.mk index 9bfb262..38f8df2 100644 --- a/keyboards/leftover30/rules.mk +++ b/keyboards/leftover30/rules.mk @@ -1,6 +1,2 @@ -MCU = STM32F072 -BOOTLOADER = stm32-dfu -RGBLIGHT_ENABLE = yes WS2812_DRIVER = spi -ENCODER_ENABLE = yes OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE diff --git a/keyboards/minidox/readme.md b/keyboards/minidox/readme.md index 5f8e5d3..87a35c1 100644 --- a/keyboards/minidox/readme.md +++ b/keyboards/minidox/readme.md @@ -1,4 +1,4 @@ -## handwired minidox -![Front/Top](https://i.imgur.com/E4Pq2g8.jpeg) -![Back](https://i.imgur.com/0zt3L3r.jpeg) +### handwired minidox +![Front/Top](https://i.imgur.com/E4Pq2g8h.jpeg) +![Back](https://i.imgur.com/0zt3L3rh.jpeg) ![Inside](https://i.imgur.com/s77FOeB_d.webp?maxwidth=760&fidelity=grand) diff --git a/keyboards/relic/readme.md b/keyboards/relic/readme.md new file mode 100644 index 0000000..a8e6d47 --- /dev/null +++ b/keyboards/relic/readme.md @@ -0,0 +1,3 @@ +### relic +![front](https://i.imgur.com/FMkKVs0h.jpeg) +![back](https://i.imgur.com/s1HrBumh.jpeg) diff --git a/keymaps/f60/readme.md b/keymaps/f60/readme.md new file mode 100644 index 0000000..8244d1b --- /dev/null +++ b/keymaps/f60/readme.md @@ -0,0 +1,4 @@ +### trio60 +![front](https://i.imgur.com/MsKEbeBh.jpeg) +![back](https://i.imgur.com/1D9xUYTh.jpeg) +![rear](https://i.imgur.com/x6MBDMdh.jpeg) diff --git a/keymaps/ferris/config.h b/keymaps/ferris/config.h index a317957..9cdcaab 100644 --- a/keymaps/ferris/config.h +++ b/keymaps/ferris/config.h @@ -1,6 +1,6 @@ #pragma once #define RGB_DI_PIN B0 -#define DRIVER_LED_TOTAL 34 +#define RGB_MATRIX_LED_COUNT 34 #define RGB_MATRIX_SPLIT {17,17} #define RGB_DISABLE_WHEN_USB_SUSPENDED #define ENABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS diff --git a/waffle/config.h b/waffle/config.h index 8957333..edf92d6 100644 --- a/waffle/config.h +++ b/waffle/config.h @@ -11,7 +11,7 @@ #define BOTH_SHIFTS_TURNS_ON_CAPS_WORD #define COMBO_TERM 40 #define NO_ACTION_ONESHOT -#define UNICODE_SELECTED_MODES UC_LNX +#define UNICODE_SELECTED_MODES UNICODE_MODE_LINUX #define ENABLE_COMPILE_KEYCODE #define IGNORE_ATOMIC_BLOCK #ifdef RAW_ENABLE diff --git a/waffle/tapping.c b/waffle/tapping.c index 6ade625..7ef50df 100644 --- a/waffle/tapping.c +++ b/waffle/tapping.c @@ -41,11 +41,11 @@ void td_reset(qk_tap_dance_state_t *state, void *user_data) { void qmk_dance(qk_tap_dance_state_t *state, void *user_data) { if (state->count == 1) { tap_code16(C(KC_T)); - SEND_STRING(qmkstr); + send_string(qmkstr); tap_code(KC_ENT); } else { tap_code16(C(KC_T)); - SEND_STRING(confstr); + send_string(confstr); tap_code(KC_ENT); } } diff --git a/waffle/unicode.c b/waffle/unicode.c index e831883..138efbb 100644 --- a/waffle/unicode.c +++ b/waffle/unicode.c @@ -176,9 +176,9 @@ bool process_record_aussie(uint16_t keycode, keyrecord_t *record) { tap_code16_nomods(KC_HOME); return false; } else if (record->event.pressed && keycode == KC_BSPC) { - tap_code16_nomods(KC_DELT); + tap_code16_nomods(KC_DEL); return false; - } else if (record->event.pressed && keycode == KC_DELT) { + } else if (record->event.pressed && keycode == KC_DEL) { tap_code16_nomods(KC_BSPC); return false; } else if (record->event.pressed && keycode == KC_QUOT) { diff --git a/waffle/waffle.c b/waffle/waffle.c index 40fca48..63754ce 100644 --- a/waffle/waffle.c +++ b/waffle/waffle.c @@ -38,7 +38,7 @@ __attribute__ ((weak)) void housekeeping_task_user(void) { } #endif -void matrix_io_delay(void) { +void matrix_output_unselect_delay(uint8_t line, bool key_pressed) { __asm__ volatile("nop\nnop\nnop\n"); } |