diff options
Diffstat (limited to 'keyboards/jacky_studio')
-rw-r--r-- | keyboards/jacky_studio/bear_65/bear_65.c | 20 | ||||
-rw-r--r-- | keyboards/jacky_studio/bear_65/config.h | 1 | ||||
-rw-r--r-- | keyboards/jacky_studio/bear_65/rev2/info.json | 2 | ||||
-rw-r--r-- | keyboards/jacky_studio/bear_65/rules.mk | 2 | ||||
-rw-r--r-- | keyboards/jacky_studio/s7_elephant/rev1/config.h | 4 | ||||
-rw-r--r-- | keyboards/jacky_studio/s7_elephant/rev1/info.json | 2 | ||||
-rw-r--r-- | keyboards/jacky_studio/s7_elephant/rev1/rules.mk | 6 | ||||
-rw-r--r-- | keyboards/jacky_studio/s7_elephant/rev2/config.h | 5 | ||||
-rw-r--r-- | keyboards/jacky_studio/s7_elephant/rev2/info.json | 2 | ||||
-rw-r--r-- | keyboards/jacky_studio/s7_elephant/rev2/rules.mk | 6 |
10 files changed, 6 insertions, 44 deletions
diff --git a/keyboards/jacky_studio/bear_65/bear_65.c b/keyboards/jacky_studio/bear_65/bear_65.c index b4ed1318f0..a2ae572b82 100644 --- a/keyboards/jacky_studio/bear_65/bear_65.c +++ b/keyboards/jacky_studio/bear_65/bear_65.c @@ -15,23 +15,3 @@ */ #include "bear_65.h" - -#ifdef RGB_MATRIX_ENABLE -led_config_t g_led_config = { { - // Key Matrix to LED Index - { NO_LED, 4 , 4 , 4 , 4 , 3 , 3 , 3 , 3 , 2 , 2 , 2 , 2 , 1 , NO_LED}, - { NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, 6 }, - { 6 , NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, 6 , 0 , 6 }, - { 7 , 5 , NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, 11 }, - { 7 , NO_LED, NO_LED, 8 , NO_LED, 8 , 9 , NO_LED, 9 , 7 , 10 , 11 , 11 , 11 , 1 }, -}, { - // LED Index to Physical Position - {224, 32}, {224, 10}, {192, 10}, {128, 25}, - {70, 10}, {16, 10}, {16, 32}, {16, 64}, - {64, 64}, {112, 64}, {176, 64}, {224, 64} -}, { - // LED Index to Flag - LED_FLAG_ALL, LED_FLAG_ALL, LED_FLAG_ALL, LED_FLAG_ALL, LED_FLAG_ALL, LED_FLAG_ALL, - LED_FLAG_ALL, LED_FLAG_ALL, LED_FLAG_ALL, LED_FLAG_ALL, LED_FLAG_ALL, LED_FLAG_ALL -} }; -#endif diff --git a/keyboards/jacky_studio/bear_65/config.h b/keyboards/jacky_studio/bear_65/config.h index 391697633c..9b9f7b7cab 100644 --- a/keyboards/jacky_studio/bear_65/config.h +++ b/keyboards/jacky_studio/bear_65/config.h @@ -3,7 +3,6 @@ #pragma once -#include "config_common.h" /* key matrix size */ #define MATRIX_ROWS 5 diff --git a/keyboards/jacky_studio/bear_65/rev2/info.json b/keyboards/jacky_studio/bear_65/rev2/info.json index 661ebecc92..e3d3a31132 100644 --- a/keyboards/jacky_studio/bear_65/rev2/info.json +++ b/keyboards/jacky_studio/bear_65/rev2/info.json @@ -168,7 +168,7 @@ {"label":"Left", "x":17.25, "y":4}, {"label":"Down", "x":18.25, "y":4}, {"label":"Right", "x":19.25, "y":4}] - } + }, "LAYOUT_wk_bs": { "layout": [ {"label":"Esc", "x":0.5, "y":0}, diff --git a/keyboards/jacky_studio/bear_65/rules.mk b/keyboards/jacky_studio/bear_65/rules.mk index 67e93335d8..91bb6f74b9 100644 --- a/keyboards/jacky_studio/bear_65/rules.mk +++ b/keyboards/jacky_studio/bear_65/rules.mk @@ -1 +1 @@ -DEFAULT_FOLDER = jacky_studio/bear65/rev1 +DEFAULT_FOLDER = jacky_studio/bear_65/rev1 diff --git a/keyboards/jacky_studio/s7_elephant/rev1/config.h b/keyboards/jacky_studio/s7_elephant/rev1/config.h index ccef8fb63d..24ccc3bac3 100644 --- a/keyboards/jacky_studio/s7_elephant/rev1/config.h +++ b/keyboards/jacky_studio/s7_elephant/rev1/config.h @@ -16,7 +16,6 @@ #pragma once -#include "config_common.h" /* key matrix size */ #define MATRIX_ROWS 5 @@ -54,9 +53,6 @@ #define RGBLIGHT_SLEEP #endif -/* 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 diff --git a/keyboards/jacky_studio/s7_elephant/rev1/info.json b/keyboards/jacky_studio/s7_elephant/rev1/info.json index b1621eecd7..f2e51f63ac 100644 --- a/keyboards/jacky_studio/s7_elephant/rev1/info.json +++ b/keyboards/jacky_studio/s7_elephant/rev1/info.json @@ -8,6 +8,8 @@ "pid": "0x0007", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT_ansi": { "layout": [ diff --git a/keyboards/jacky_studio/s7_elephant/rev1/rules.mk b/keyboards/jacky_studio/s7_elephant/rev1/rules.mk index 543f0f79da..718a761cb4 100644 --- a/keyboards/jacky_studio/s7_elephant/rev1/rules.mk +++ b/keyboards/jacky_studio/s7_elephant/rev1/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/jacky_studio/s7_elephant/rev2/config.h b/keyboards/jacky_studio/s7_elephant/rev2/config.h index cbddf31674..8746825ea6 100644 --- a/keyboards/jacky_studio/s7_elephant/rev2/config.h +++ b/keyboards/jacky_studio/s7_elephant/rev2/config.h @@ -16,7 +16,6 @@ #pragma once -#include "config_common.h" /* key matrix size */ #define MATRIX_ROWS 5 @@ -43,7 +42,6 @@ #define DIODE_DIRECTION ROW2COL #define BACKLIGHT_PIN B6 -// #define BACKLIGHT_BREATHING #define BACKLIGHT_LEVELS 15 #define RGB_DI_PIN E2 @@ -66,9 +64,6 @@ #define RGBLIGHT_SLEEP /* If defined, the RGB lighting will be switched off when the host goes to sleep */ #endif // RGB_DI_PIN -/* 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 diff --git a/keyboards/jacky_studio/s7_elephant/rev2/info.json b/keyboards/jacky_studio/s7_elephant/rev2/info.json index c9f45edca9..c7cc5aaf14 100644 --- a/keyboards/jacky_studio/s7_elephant/rev2/info.json +++ b/keyboards/jacky_studio/s7_elephant/rev2/info.json @@ -8,6 +8,8 @@ "pid": "0x0008", "device_version": "0.0.2" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/jacky_studio/s7_elephant/rev2/rules.mk b/keyboards/jacky_studio/s7_elephant/rev2/rules.mk index 1daeed7bd7..cafe30d929 100644 --- a/keyboards/jacky_studio/s7_elephant/rev2/rules.mk +++ b/keyboards/jacky_studio/s7_elephant/rev2/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # |