diff options
Diffstat (limited to 'keyboards/vitamins_included')
-rw-r--r-- | keyboards/vitamins_included/config.h | 22 | ||||
-rw-r--r-- | keyboards/vitamins_included/info.json | 2 | ||||
-rw-r--r-- | keyboards/vitamins_included/rev1/config.h | 16 | ||||
-rw-r--r-- | keyboards/vitamins_included/rev1/info.json | 6 | ||||
-rw-r--r-- | keyboards/vitamins_included/rev1/rules.mk | 3 | ||||
-rw-r--r-- | keyboards/vitamins_included/rev2/config.h | 16 | ||||
-rw-r--r-- | keyboards/vitamins_included/rev2/info.json | 6 | ||||
-rw-r--r-- | keyboards/vitamins_included/rev2/rules.mk | 3 | ||||
-rw-r--r-- | keyboards/vitamins_included/rules.mk | 5 |
9 files changed, 12 insertions, 67 deletions
diff --git a/keyboards/vitamins_included/config.h b/keyboards/vitamins_included/config.h deleted file mode 100644 index 013bf0d4e8..0000000000 --- a/keyboards/vitamins_included/config.h +++ /dev/null @@ -1,22 +0,0 @@ -/* -Copyright 2012 Jun Wako <wakojun@gmail.com> -Copyright 2015 Jack Humbert - -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 -//#define USE_I2C - -#include "config_common.h" diff --git a/keyboards/vitamins_included/info.json b/keyboards/vitamins_included/info.json index acfacd6dca..883278d983 100644 --- a/keyboards/vitamins_included/info.json +++ b/keyboards/vitamins_included/info.json @@ -7,6 +7,8 @@ "vid": "0x1209", "pid": "0xBEE5" }, + "processor": "atmega32u4", + "community_layouts": ["ortho_4x12"], "layouts": { "LAYOUT": { "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":7, "y":0}, {"x":8, "y":0}, {"x":9, "y":0}, {"x":10, "y":0}, {"x":11, "y":0}, {"x":12, "y":0}, {"x":0, "y":1}, {"x":1, "y":1}, {"x":2, "y":1}, {"x":3, "y":1}, {"x":4, "y":1}, {"x":5, "y":1}, {"x":7, "y":1}, {"x":8, "y":1}, {"x":9, "y":1}, {"x":10, "y":1}, {"x":11, "y":1}, {"x":12, "y":1}, {"x":0, "y":2}, {"x":1, "y":2}, {"x":2, "y":2}, {"x":3, "y":2}, {"x":4, "y":2}, {"x":5, "y":2}, {"x":7, "y":2}, {"x":8, "y":2}, {"x":9, "y":2}, {"x":10, "y":2}, {"x":11, "y":2}, {"x":12, "y":2}, {"x":0, "y":3}, {"x":1, "y":3}, {"x":2, "y":3}, {"x":3, "y":3}, {"x":4, "y":3}, {"x":5, "y":3}, {"x":7, "y":3}, {"x":8, "y":3}, {"x":9, "y":3}, {"x":10, "y":3}, {"x":11, "y":3}, {"x":12, "y":3}] diff --git a/keyboards/vitamins_included/rev1/config.h b/keyboards/vitamins_included/rev1/config.h index 44622b28e7..cea58affaa 100644 --- a/keyboards/vitamins_included/rev1/config.h +++ b/keyboards/vitamins_included/rev1/config.h @@ -18,17 +18,10 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once -#include "config_common.h" #define SPLIT_USB_DETECT #define EE_HANDS -#define SOFT_SERIAL_PIN D0 - -/* key matrix size */ -// Rows are doubled-up -#define MATRIX_ROWS 8 -#define MATRIX_COLS 6 // wiring of each half #define MATRIX_ROW_PINS { F5, F6, C7, F7 } @@ -36,15 +29,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #define DIODE_DIRECTION COL2ROW -/* define if matrix has ghost */ -//#define MATRIX_HAS_GHOST - -/* number of backlight levels */ -// #define BACKLIGHT_LEVELS 3 - -/* 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/vitamins_included/rev1/info.json b/keyboards/vitamins_included/rev1/info.json index 90ac25f360..e79f940440 100644 --- a/keyboards/vitamins_included/rev1/info.json +++ b/keyboards/vitamins_included/rev1/info.json @@ -1,5 +1,9 @@ { "usb": { "device_version": "0.0.1" - } + }, + "split": { + "soft_serial_pin": "D0" + }, + "bootloader": "caterina" } diff --git a/keyboards/vitamins_included/rev1/rules.mk b/keyboards/vitamins_included/rev1/rules.mk index 6e9beefafe..d38a618090 100644 --- a/keyboards/vitamins_included/rev1/rules.mk +++ b/keyboards/vitamins_included/rev1/rules.mk @@ -1,4 +1 @@ -# Bootloader selection -BOOTLOADER = caterina - SPLIT_KEYBOARD = yes diff --git a/keyboards/vitamins_included/rev2/config.h b/keyboards/vitamins_included/rev2/config.h index 2a833f4e76..f28b91a472 100644 --- a/keyboards/vitamins_included/rev2/config.h +++ b/keyboards/vitamins_included/rev2/config.h @@ -19,15 +19,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once -#include "config_common.h" #define SPLIT_HAND_PIN B4 -#define SOFT_SERIAL_PIN D0 - -/* key matrix size */ -// Rows are doubled-up -#define MATRIX_ROWS 8 -#define MATRIX_COLS 6 // wiring of each half #define MATRIX_ROW_PINS { F5, F6, C7, F7 } @@ -35,15 +28,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #define DIODE_DIRECTION COL2ROW -/* define if matrix has ghost */ -//#define MATRIX_HAS_GHOST - -/* number of backlight levels */ -// #define BACKLIGHT_LEVELS 3 - -/* Set 0 if debouncing isn't needed */ -#define DEBOUNCE 5 - /* ws2812 RGB LED */ #define RGB_DI_PIN F0 diff --git a/keyboards/vitamins_included/rev2/info.json b/keyboards/vitamins_included/rev2/info.json index e557e4d307..ec9edaf233 100644 --- a/keyboards/vitamins_included/rev2/info.json +++ b/keyboards/vitamins_included/rev2/info.json @@ -1,5 +1,9 @@ { "usb": { "device_version": "0.0.2" - } + }, + "split": { + "soft_serial_pin": "D0" + }, + "bootloader": "qmk-dfu" } diff --git a/keyboards/vitamins_included/rev2/rules.mk b/keyboards/vitamins_included/rev2/rules.mk index 05167eb3b9..9f05083d69 100644 --- a/keyboards/vitamins_included/rev2/rules.mk +++ b/keyboards/vitamins_included/rev2/rules.mk @@ -1,6 +1,3 @@ -# Bootloader selection -BOOTLOADER = qmk-dfu - SPLIT_KEYBOARD = yes # Disable unsupported hardware diff --git a/keyboards/vitamins_included/rules.mk b/keyboards/vitamins_included/rules.mk index 5de74337fd..3ca1a5cf70 100644 --- a/keyboards/vitamins_included/rules.mk +++ b/keyboards/vitamins_included/rules.mk @@ -1,6 +1,3 @@ -# MCU name -MCU = atmega32u4 - # Build Options # change yes to no to disable # @@ -15,8 +12,6 @@ MOUSEKEY_ENABLE = no # Mouse keys NKRO_ENABLE = yes # Enable N-Key Rollover RGBLIGHT_ENABLE = yes # Enable WS2812 RGB underlight. -LAYOUTS = ortho_4x12 - DEFAULT_FOLDER = vitamins_included/rev2 LTO_ENABLE = yes |