diff options
Diffstat (limited to 'keyboards/8pack')
-rw-r--r-- | keyboards/8pack/8pack.c | 1 | ||||
-rw-r--r-- | keyboards/8pack/8pack.h | 11 | ||||
-rw-r--r-- | keyboards/8pack/config.h | 21 | ||||
-rw-r--r-- | keyboards/8pack/info.json | 24 | ||||
-rw-r--r-- | keyboards/8pack/rev11/info.json | 14 | ||||
-rw-r--r-- | keyboards/8pack/rev11/rev11.c | 1 | ||||
-rw-r--r-- | keyboards/8pack/rev11/rev11.h | 11 | ||||
-rw-r--r-- | keyboards/8pack/rev12/info.json | 14 | ||||
-rw-r--r-- | keyboards/8pack/rev12/rev12.c | 1 | ||||
-rw-r--r-- | keyboards/8pack/rev12/rev12.h | 11 | ||||
-rw-r--r-- | keyboards/8pack/rules.mk | 6 |
11 files changed, 39 insertions, 76 deletions
diff --git a/keyboards/8pack/8pack.c b/keyboards/8pack/8pack.c deleted file mode 100644 index e89d7281de..0000000000 --- a/keyboards/8pack/8pack.c +++ /dev/null @@ -1 +0,0 @@ -#include "8pack.h" diff --git a/keyboards/8pack/8pack.h b/keyboards/8pack/8pack.h deleted file mode 100644 index 1c4ffb55b8..0000000000 --- a/keyboards/8pack/8pack.h +++ /dev/null @@ -1,11 +0,0 @@ -#pragma once - -#include "quantum.h" - -#ifdef KEYBOARD_8pack_rev11 - #include "rev11.h" -#endif - -#ifdef KEYBOARD_8pack_rev12 - #include "rev12.h" -#endif
\ No newline at end of file diff --git a/keyboards/8pack/config.h b/keyboards/8pack/config.h index b50de5d82b..fe5d7a4982 100644 --- a/keyboards/8pack/config.h +++ b/keyboards/8pack/config.h @@ -1,32 +1,11 @@ #pragma once -#include "config_common.h" - -/* 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 */ #define LOCKING_RESYNC_ENABLE -/* key matrix size */ -#define MATRIX_ROWS 2 -#define MATRIX_COLS 4 - -/* key matrix pins */ - -#define DIRECT_PINS { { F4, F5, F6, F7 }, { B1, B3, B2, B6 } } - -#define BACKLIGHT_LED_COUNT 8 -#undef BACKLIGHT_PIN -#define BACKLIGHT_PINS { D1, D0, D4, C6, D7, E6, B4, B5 } -#define BACKLIGHT_LEVELS 8 - // ws2812 options #define RGB_DI_PIN D2 // pin the DI on the ws2812 is hooked-up to #define RGBLED_NUM 8 // number of LEDs diff --git a/keyboards/8pack/info.json b/keyboards/8pack/info.json index f36f4c9dc3..3e6b556fae 100644 --- a/keyboards/8pack/info.json +++ b/keyboards/8pack/info.json @@ -7,18 +7,16 @@ "vid": "0xFEED", "pid": "0x2171" }, - "layouts": { - "LAYOUT": { - "layout": [ - {"x":0, "y":0}, - {"x":1, "y":0}, - {"x":2, "y":0}, - {"x":3, "y":0}, - {"x":0, "y":1}, - {"x":1, "y":1}, - {"x":2, "y":1}, - {"x":3, "y":1} - ] - } + "backlight": { + "pins": ["D1", "D0", "D4", "C6", "D7", "E6", "B4", "B5"], + "levels": 8 + }, + "processor": "atmega32u4", + "bootloader": "caterina", + "matrix_pins": { + "direct": [ + ["F4", "F5", "F6", "F7"], + ["B1", "B3", "B2", "B6"] + ] } } diff --git a/keyboards/8pack/rev11/info.json b/keyboards/8pack/rev11/info.json index 90ac25f360..6d4d61fe13 100644 --- a/keyboards/8pack/rev11/info.json +++ b/keyboards/8pack/rev11/info.json @@ -1,5 +1,19 @@ { "usb": { "device_version": "0.0.1" + }, + "layouts": { + "LAYOUT": { + "layout": [ + {"x":0, "y":0, "matrix": [1, 3]}, + {"x":1, "y":0, "matrix": [1, 2]}, + {"x":2, "y":0, "matrix": [1, 1]}, + {"x":3, "y":0, "matrix": [1, 0]}, + {"x":0, "y":1, "matrix": [0, 3]}, + {"x":1, "y":1, "matrix": [0, 2]}, + {"x":2, "y":1, "matrix": [0, 1]}, + {"x":3, "y":1, "matrix": [0, 0]} + ] + } } } diff --git a/keyboards/8pack/rev11/rev11.c b/keyboards/8pack/rev11/rev11.c deleted file mode 100644 index c54ecbe87e..0000000000 --- a/keyboards/8pack/rev11/rev11.c +++ /dev/null @@ -1 +0,0 @@ -#include "rev11.h" diff --git a/keyboards/8pack/rev11/rev11.h b/keyboards/8pack/rev11/rev11.h deleted file mode 100644 index ebf8529ad0..0000000000 --- a/keyboards/8pack/rev11/rev11.h +++ /dev/null @@ -1,11 +0,0 @@ -#pragma once - -#include "8pack.h" - -#define LAYOUT( \ - K00, K01, K02, K03, \ - K10, K11, K12, K13 \ -) { \ - { K13, K12, K11, K10 }, \ - { K03, K02, K01, K00 } \ -} diff --git a/keyboards/8pack/rev12/info.json b/keyboards/8pack/rev12/info.json index e557e4d307..05b1a290ae 100644 --- a/keyboards/8pack/rev12/info.json +++ b/keyboards/8pack/rev12/info.json @@ -1,5 +1,19 @@ { "usb": { "device_version": "0.0.2" + }, + "layouts": { + "LAYOUT": { + "layout": [ + {"x":0, "y":0, "matrix": [0, 3]}, + {"x":1, "y":0, "matrix": [0, 2]}, + {"x":2, "y":0, "matrix": [0, 1]}, + {"x":3, "y":0, "matrix": [0, 0]}, + {"x":0, "y":1, "matrix": [1, 3]}, + {"x":1, "y":1, "matrix": [1, 2]}, + {"x":2, "y":1, "matrix": [1, 1]}, + {"x":3, "y":1, "matrix": [1, 0]} + ] + } } } diff --git a/keyboards/8pack/rev12/rev12.c b/keyboards/8pack/rev12/rev12.c deleted file mode 100644 index b2d091af49..0000000000 --- a/keyboards/8pack/rev12/rev12.c +++ /dev/null @@ -1 +0,0 @@ -#include "rev12.h" diff --git a/keyboards/8pack/rev12/rev12.h b/keyboards/8pack/rev12/rev12.h deleted file mode 100644 index 3efeb06de5..0000000000 --- a/keyboards/8pack/rev12/rev12.h +++ /dev/null @@ -1,11 +0,0 @@ -#pragma once - -#include "8pack.h" - -#define LAYOUT( \ - K00, K01, K02, K03, \ - K10, K11, K12, K13 \ -) { \ - { K03, K02, K01, K00 }, \ - { K13, K12, K11, K10 } \ -} diff --git a/keyboards/8pack/rules.mk b/keyboards/8pack/rules.mk index 1d62765274..ee44648259 100644 --- a/keyboards/8pack/rules.mk +++ b/keyboards/8pack/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # |