diff options
author | Nick Brassel <nick@tzarc.org> | 2023-02-28 11:22:29 +1100 |
---|---|---|
committer | Nick Brassel <nick@tzarc.org> | 2023-02-28 11:22:29 +1100 |
commit | bacec14073b2e897d5a52caf12de5a6a1f7b4078 (patch) | |
tree | d4e3e57aac1a829a191831efd2e62c8a43217885 /keyboards/keebio/viterbi | |
parent | d70e9b8659a7fbbd7069fd542bd07e67e04327a1 (diff) | |
parent | b865b9e1706ad28ae4882bd2e0331e98808295fa (diff) |
Merge remote-tracking branch 'upstream/develop'
Diffstat (limited to 'keyboards/keebio/viterbi')
-rw-r--r-- | keyboards/keebio/viterbi/config.h | 20 | ||||
-rw-r--r-- | keyboards/keebio/viterbi/info.json | 3 | ||||
-rw-r--r-- | keyboards/keebio/viterbi/keymaps/met/keymap.c | 10 | ||||
-rw-r--r-- | keyboards/keebio/viterbi/rev1/config.h | 10 | ||||
-rw-r--r-- | keyboards/keebio/viterbi/rev1/info.json | 3 | ||||
-rw-r--r-- | keyboards/keebio/viterbi/rev1/rules.mk | 2 | ||||
-rw-r--r-- | keyboards/keebio/viterbi/rev2/config.h | 13 | ||||
-rw-r--r-- | keyboards/keebio/viterbi/rev2/info.json | 7 | ||||
-rw-r--r-- | keyboards/keebio/viterbi/rev2/rules.mk | 2 | ||||
-rw-r--r-- | keyboards/keebio/viterbi/rules.mk | 7 |
10 files changed, 18 insertions, 59 deletions
diff --git a/keyboards/keebio/viterbi/config.h b/keyboards/keebio/viterbi/config.h deleted file mode 100644 index b628c83c85..0000000000 --- a/keyboards/keebio/viterbi/config.h +++ /dev/null @@ -1,20 +0,0 @@ -/* -Copyright 2019 Danny Nguyen <danny@keeb.io> - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 2 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program. If not, see <http://www.gnu.org/licenses/>. -*/ - -#pragma once - -#include "config_common.h" diff --git a/keyboards/keebio/viterbi/info.json b/keyboards/keebio/viterbi/info.json index 1c42bd8f87..0b6d002758 100644 --- a/keyboards/keebio/viterbi/info.json +++ b/keyboards/keebio/viterbi/info.json @@ -5,6 +5,9 @@ "usb": { "vid": "0xCB10" }, + "processor": "atmega32u4", + "bootloader": "caterina", + "community_layouts": ["ortho_5x14"], "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/keebio/viterbi/keymaps/met/keymap.c b/keyboards/keebio/viterbi/keymaps/met/keymap.c index b81c5ce314..4848038bef 100644 --- a/keyboards/keebio/viterbi/keymaps/met/keymap.c +++ b/keyboards/keebio/viterbi/keymaps/met/keymap.c @@ -221,11 +221,11 @@ case CSPEAK: const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_BASE] = LAYOUT_ortho_5x14( - KC_NO, STOP , TST , _______, _______, _______, BUS , _______, _______, _______, _______, _______, _______, _______, \ - KC_NO, _______, SET , SET , SET , _______, _______, _______, _______, _______, _______, _______, _______, _______, \ - KC_NO, _______, SET , SET , SET , _______, _______, _______, _______, _______, _______, _______, _______, _______, \ - KC_NO, LNAME , SET , SET , SET , _______, _______, _______, _______, _______, _______, _______, _______, _______, \ - KC_NO, MO(_FN), _______, SET , _______, _______, _______, TG(_QWERTY),KC_B, _______, _______, _______, _______, _______ \ + KC_NO, STOP , TST , _______, _______, _______, BUS , _______, _______, _______, _______, _______, _______, _______, + KC_NO, _______, SET , SET , SET , _______, _______, _______, _______, _______, _______, _______, _______, _______, + KC_NO, _______, SET , SET , SET , _______, _______, _______, _______, _______, _______, _______, _______, _______, + KC_NO, LNAME , SET , SET , SET , _______, _______, _______, _______, _______, _______, _______, _______, _______, + KC_NO, MO(_FN), _______, SET , _______, _______, _______, TG(_QWERTY),KC_B, _______, _______, _______, _______, _______ ), [_PLAYING] = LAYOUT_ortho_5x14( diff --git a/keyboards/keebio/viterbi/rev1/config.h b/keyboards/keebio/viterbi/rev1/config.h index 5aa5ef234c..d911b45208 100644 --- a/keyboards/keebio/viterbi/rev1/config.h +++ b/keyboards/keebio/viterbi/rev1/config.h @@ -17,24 +17,14 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once -#include "config_common.h" - -/* key matrix size */ -// Rows are doubled-up -#define MATRIX_ROWS 10 -#define MATRIX_COLS 7 // wiring of each half #define MATRIX_ROW_PINS { D4, D7, E6, B4, B5 } #define MATRIX_COL_PINS { F5, F6, F7, B1, B3, B2, B6 } -#define SOFT_SERIAL_PIN D0 /* COL2ROW or ROW2COL */ #define DIODE_DIRECTION COL2ROW -/* Set 0 if debouncing isn't needed */ -#define DEBOUNCE 5 - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE /* Locking resynchronize hack */ diff --git a/keyboards/keebio/viterbi/rev1/info.json b/keyboards/keebio/viterbi/rev1/info.json index 5801f5f638..d91c35fc85 100644 --- a/keyboards/keebio/viterbi/rev1/info.json +++ b/keyboards/keebio/viterbi/rev1/info.json @@ -1,5 +1,8 @@ { "keyboard_name": "Viterbi Rev. 1", + "split": { + "soft_serial_pin": "D0" + }, "usb": { "pid": "0x1157", "device_version": "1.0.0" diff --git a/keyboards/keebio/viterbi/rev1/rules.mk b/keyboards/keebio/viterbi/rev1/rules.mk index 2bf03237c0..7b30c0beff 100644 --- a/keyboards/keebio/viterbi/rev1/rules.mk +++ b/keyboards/keebio/viterbi/rev1/rules.mk @@ -1,3 +1 @@ BACKLIGHT_ENABLE = no - -LAYOUTS = ortho_5x14 diff --git a/keyboards/keebio/viterbi/rev2/config.h b/keyboards/keebio/viterbi/rev2/config.h index 9d87517c0a..898ba3d786 100644 --- a/keyboards/keebio/viterbi/rev2/config.h +++ b/keyboards/keebio/viterbi/rev2/config.h @@ -17,23 +17,14 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once -/* key matrix size */ -// Rows are doubled-up -#define MATRIX_ROWS 10 -#define MATRIX_COLS 7 - // wiring of each half #define MATRIX_ROW_PINS { D4, D7, E6, B4, B5 } #define MATRIX_COL_PINS { F4, F5, F6, F7, B1, B3, B2 } #define SPLIT_HAND_PIN D2 -#define SOFT_SERIAL_PIN D0 /* COL2ROW or ROW2COL */ #define DIODE_DIRECTION COL2ROW -/* Set 0 if debouncing isn't needed */ -#define DEBOUNCE 5 - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE /* Locking resynchronize hack */ @@ -43,7 +34,3 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #define RGB_DI_PIN D3 #define RGBLED_NUM 14 #define RGBLED_SPLIT { 7, 7 } - -/* Backlight LEDs */ -#define BACKLIGHT_PIN B6 -#define BACKLIGHT_LEVELS 7 diff --git a/keyboards/keebio/viterbi/rev2/info.json b/keyboards/keebio/viterbi/rev2/info.json index 9759016521..dd375f3053 100644 --- a/keyboards/keebio/viterbi/rev2/info.json +++ b/keyboards/keebio/viterbi/rev2/info.json @@ -1,7 +1,14 @@ { "keyboard_name": "Viterbi Rev. 2", + "split": { + "soft_serial_pin": "D0" + }, "usb": { "pid": "0x2157", "device_version": "2.0.0" + }, + "backlight": { + "pin": "B6", + "levels": 7 } } diff --git a/keyboards/keebio/viterbi/rev2/rules.mk b/keyboards/keebio/viterbi/rev2/rules.mk index 829d6a56e0..674318183b 100644 --- a/keyboards/keebio/viterbi/rev2/rules.mk +++ b/keyboards/keebio/viterbi/rev2/rules.mk @@ -1,5 +1,3 @@ BACKLIGHT_ENABLE = yes -LAYOUTS = ortho_5x14 - LTO_ENABLE = yes
\ No newline at end of file diff --git a/keyboards/keebio/viterbi/rules.mk b/keyboards/keebio/viterbi/rules.mk index c3ad2ad7e6..2008e63b00 100644 --- a/keyboards/keebio/viterbi/rules.mk +++ b/keyboards/keebio/viterbi/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # @@ -20,4 +14,3 @@ RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight. SPLIT_KEYBOARD = yes DEFAULT_FOLDER = keebio/viterbi/rev2 -LAYOUTS = ortho_5x14 |