aboutsummaryrefslogtreecommitdiff
path: root/keyboards/jacky_studio
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/jacky_studio')
-rw-r--r--keyboards/jacky_studio/bear_65/rev1/keyboard.json (renamed from keyboards/jacky_studio/bear_65/rev1/info.json)10
-rw-r--r--keyboards/jacky_studio/bear_65/rev1/rules.mk16
-rw-r--r--keyboards/jacky_studio/bear_65/rev2/keyboard.json (renamed from keyboards/jacky_studio/bear_65/rev2/info.json)10
-rw-r--r--keyboards/jacky_studio/bear_65/rev2/rules.mk16
-rw-r--r--keyboards/jacky_studio/piggy60/rev1/hotswap/keyboard.json (renamed from keyboards/jacky_studio/piggy60/rev1/hotswap/info.json)0
-rw-r--r--keyboards/jacky_studio/piggy60/rev1/hotswap/rules.mk1
-rw-r--r--keyboards/jacky_studio/piggy60/rev1/solder/keyboard.json (renamed from keyboards/jacky_studio/piggy60/rev1/solder/info.json)0
-rw-r--r--keyboards/jacky_studio/piggy60/rev1/solder/rules.mk1
-rw-r--r--keyboards/jacky_studio/piggy60/rev2/config.h4
-rw-r--r--keyboards/jacky_studio/piggy60/rev2/keyboard.json (renamed from keyboards/jacky_studio/piggy60/rev2/info.json)0
-rw-r--r--keyboards/jacky_studio/s7_elephant/rev1/keyboard.json (renamed from keyboards/jacky_studio/s7_elephant/rev1/info.json)9
-rw-r--r--keyboards/jacky_studio/s7_elephant/rev1/rules.mk11
-rw-r--r--keyboards/jacky_studio/s7_elephant/rev2/keyboard.json (renamed from keyboards/jacky_studio/s7_elephant/rev2/info.json)13
-rw-r--r--keyboards/jacky_studio/s7_elephant/rev2/rules.mk13
14 files changed, 44 insertions, 60 deletions
diff --git a/keyboards/jacky_studio/bear_65/rev1/info.json b/keyboards/jacky_studio/bear_65/rev1/keyboard.json
index 098817dedb..2c79dc41f5 100644
--- a/keyboards/jacky_studio/bear_65/rev1/info.json
+++ b/keyboards/jacky_studio/bear_65/rev1/keyboard.json
@@ -5,6 +5,16 @@
"maintainer": "qmk",
"processor": "atmega32u4",
"bootloader": "atmel-dfu",
+ "features": {
+ "bootmagic": true,
+ "mousekey": true,
+ "extrakey": true,
+ "backlight": true,
+ "rgblight": true
+ },
+ "build": {
+ "lto": true
+ },
"usb": {
"vid": "0xA13B",
"pid": "0x000A",
diff --git a/keyboards/jacky_studio/bear_65/rev1/rules.mk b/keyboards/jacky_studio/bear_65/rev1/rules.mk
deleted file mode 100644
index 7e03810942..0000000000
--- a/keyboards/jacky_studio/bear_65/rev1/rules.mk
+++ /dev/null
@@ -1,16 +0,0 @@
-# Build Options
-# change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes # Mouse keys
-EXTRAKEY_ENABLE = yes # Audio control and System control
-CONSOLE_ENABLE = no # Console for debug
-COMMAND_ENABLE = no # Commands for debug and configuration
-NKRO_ENABLE = no # Enable N-Key Rollover
-BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow
-AUDIO_ENABLE = no # Audio output
-
-LTO_ENABLE = yes # Use LTO flags to reduce firmware size
-
-RGB_MATRIX_ENABLE = no # Enable keyboard RGB matrix (do not use together with RGBLIGHT_ENABLE)
diff --git a/keyboards/jacky_studio/bear_65/rev2/info.json b/keyboards/jacky_studio/bear_65/rev2/keyboard.json
index 52e8354fab..ec2ff1b7c7 100644
--- a/keyboards/jacky_studio/bear_65/rev2/info.json
+++ b/keyboards/jacky_studio/bear_65/rev2/keyboard.json
@@ -5,6 +5,16 @@
"maintainer": "qmk",
"processor": "atmega32u4",
"bootloader": "atmel-dfu",
+ "features": {
+ "bootmagic": true,
+ "mousekey": true,
+ "extrakey": true,
+ "backlight": true,
+ "rgblight": true
+ },
+ "build": {
+ "lto": true
+ },
"usb": {
"vid": "0x45D4",
"pid": "0x0428",
diff --git a/keyboards/jacky_studio/bear_65/rev2/rules.mk b/keyboards/jacky_studio/bear_65/rev2/rules.mk
deleted file mode 100644
index 7e03810942..0000000000
--- a/keyboards/jacky_studio/bear_65/rev2/rules.mk
+++ /dev/null
@@ -1,16 +0,0 @@
-# Build Options
-# change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes # Mouse keys
-EXTRAKEY_ENABLE = yes # Audio control and System control
-CONSOLE_ENABLE = no # Console for debug
-COMMAND_ENABLE = no # Commands for debug and configuration
-NKRO_ENABLE = no # Enable N-Key Rollover
-BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow
-AUDIO_ENABLE = no # Audio output
-
-LTO_ENABLE = yes # Use LTO flags to reduce firmware size
-
-RGB_MATRIX_ENABLE = no # Enable keyboard RGB matrix (do not use together with RGBLIGHT_ENABLE)
diff --git a/keyboards/jacky_studio/piggy60/rev1/hotswap/info.json b/keyboards/jacky_studio/piggy60/rev1/hotswap/keyboard.json
index 8b10920700..8b10920700 100644
--- a/keyboards/jacky_studio/piggy60/rev1/hotswap/info.json
+++ b/keyboards/jacky_studio/piggy60/rev1/hotswap/keyboard.json
diff --git a/keyboards/jacky_studio/piggy60/rev1/hotswap/rules.mk b/keyboards/jacky_studio/piggy60/rev1/hotswap/rules.mk
deleted file mode 100644
index 6e7633bfe0..0000000000
--- a/keyboards/jacky_studio/piggy60/rev1/hotswap/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/jacky_studio/piggy60/rev1/solder/info.json b/keyboards/jacky_studio/piggy60/rev1/solder/keyboard.json
index 3f4d4a2632..3f4d4a2632 100644
--- a/keyboards/jacky_studio/piggy60/rev1/solder/info.json
+++ b/keyboards/jacky_studio/piggy60/rev1/solder/keyboard.json
diff --git a/keyboards/jacky_studio/piggy60/rev1/solder/rules.mk b/keyboards/jacky_studio/piggy60/rev1/solder/rules.mk
deleted file mode 100644
index 6e7633bfe0..0000000000
--- a/keyboards/jacky_studio/piggy60/rev1/solder/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/jacky_studio/piggy60/rev2/config.h b/keyboards/jacky_studio/piggy60/rev2/config.h
index 2747834991..8c9b292fb4 100644
--- a/keyboards/jacky_studio/piggy60/rev2/config.h
+++ b/keyboards/jacky_studio/piggy60/rev2/config.h
@@ -19,5 +19,5 @@
#define WS2812_PWM_DRIVER PWMD4
#define WS2812_PWM_CHANNEL 4
#define WS2812_PWM_PAL_MODE 2
-#define WS2812_DMA_STREAM STM32_DMA1_STREAM7
-#define WS2812_DMA_CHANNEL 7
+#define WS2812_PWM_DMA_STREAM STM32_DMA1_STREAM7
+#define WS2812_PWM_DMA_CHANNEL 7
diff --git a/keyboards/jacky_studio/piggy60/rev2/info.json b/keyboards/jacky_studio/piggy60/rev2/keyboard.json
index 2a3c7e3313..2a3c7e3313 100644
--- a/keyboards/jacky_studio/piggy60/rev2/info.json
+++ b/keyboards/jacky_studio/piggy60/rev2/keyboard.json
diff --git a/keyboards/jacky_studio/s7_elephant/rev1/info.json b/keyboards/jacky_studio/s7_elephant/rev1/keyboard.json
index bf8455ee4b..fc87e986ba 100644
--- a/keyboards/jacky_studio/s7_elephant/rev1/info.json
+++ b/keyboards/jacky_studio/s7_elephant/rev1/keyboard.json
@@ -29,6 +29,15 @@
"ws2812": {
"pin": "E6"
},
+ "features": {
+ "bootmagic": false,
+ "command": false,
+ "console": false,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": true,
+ "rgblight": true
+ },
"matrix_pins": {
"cols": ["B6", "D0", "D1", "D2", "D3", "D4", "D5", "D6", "D7", "C6", "C7", "F4", "F5", "F6", "F7", "F1"],
"rows": ["B0", "B1", "B2", "B3", "B4"]
diff --git a/keyboards/jacky_studio/s7_elephant/rev1/rules.mk b/keyboards/jacky_studio/s7_elephant/rev1/rules.mk
deleted file mode 100644
index 718a761cb4..0000000000
--- a/keyboards/jacky_studio/s7_elephant/rev1/rules.mk
+++ /dev/null
@@ -1,11 +0,0 @@
-# Build Options
-# change yes to no to disable
-#
-BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes # Mouse keys
-EXTRAKEY_ENABLE = yes # Audio control and System control
-CONSOLE_ENABLE = no # Console for debug
-COMMAND_ENABLE = no # Commands for debug and configuration
-NKRO_ENABLE = yes # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = yes # Enable keyboard underlight functionality
diff --git a/keyboards/jacky_studio/s7_elephant/rev2/info.json b/keyboards/jacky_studio/s7_elephant/rev2/keyboard.json
index e98923fb45..1a32d95c77 100644
--- a/keyboards/jacky_studio/s7_elephant/rev2/info.json
+++ b/keyboards/jacky_studio/s7_elephant/rev2/keyboard.json
@@ -8,6 +8,19 @@
"pid": "0x0008",
"device_version": "0.0.2"
},
+ "build": {
+ "lto": true
+ },
+ "features": {
+ "backlight": true,
+ "bootmagic": true,
+ "command": false,
+ "console": false,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": false,
+ "rgblight": true
+ },
"matrix_pins": {
"cols": ["D0", "D1", "D2", "D3", "D5", "D4", "D6", "D7", "B4", "F7", "F6", "F5", "F4", "F1", "F0", "E6"],
"rows": ["B0", "B1", "B2", "B3", "B7"]
diff --git a/keyboards/jacky_studio/s7_elephant/rev2/rules.mk b/keyboards/jacky_studio/s7_elephant/rev2/rules.mk
deleted file mode 100644
index cafe30d929..0000000000
--- a/keyboards/jacky_studio/s7_elephant/rev2/rules.mk
+++ /dev/null
@@ -1,13 +0,0 @@
-# Build Options
-# change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes # Mouse keys
-EXTRAKEY_ENABLE = yes # Audio control and System control
-CONSOLE_ENABLE = no # Console for debug
-COMMAND_ENABLE = no # Commands for debug and configuration
-NKRO_ENABLE = no # Enable N-Key Rollover
-BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow
-AUDIO_ENABLE = no # Audio output
-LTO_ENABLE = yes