aboutsummaryrefslogtreecommitdiff
path: root/keyboards/handwired/pill60
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/handwired/pill60')
-rw-r--r--keyboards/handwired/pill60/blackpill_f401/keyboard.json (renamed from keyboards/handwired/pill60/blackpill_f401/info.json)9
-rw-r--r--keyboards/handwired/pill60/blackpill_f401/rules.mk4
-rw-r--r--keyboards/handwired/pill60/blackpill_f411/keyboard.json (renamed from keyboards/handwired/pill60/blackpill_f411/info.json)9
-rw-r--r--keyboards/handwired/pill60/blackpill_f411/rules.mk4
-rw-r--r--keyboards/handwired/pill60/bluepill/keyboard.json (renamed from keyboards/handwired/pill60/bluepill/info.json)3
-rw-r--r--keyboards/handwired/pill60/bluepill/rules.mk1
-rw-r--r--keyboards/handwired/pill60/info.json10
-rw-r--r--keyboards/handwired/pill60/rules.mk15
8 files changed, 23 insertions, 32 deletions
diff --git a/keyboards/handwired/pill60/blackpill_f401/info.json b/keyboards/handwired/pill60/blackpill_f401/keyboard.json
index 8d85a2e930..f43fd45a85 100644
--- a/keyboards/handwired/pill60/blackpill_f401/info.json
+++ b/keyboards/handwired/pill60/blackpill_f401/keyboard.json
@@ -1,10 +1,13 @@
{
+ "usb": {
+ "shared_endpoint": {
+ "keyboard": true
+ }
+ },
"matrix_pins": {
"cols": ["A8", "B2", "B1", "B15", "A10", "A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "B0"],
"rows": ["B4", "B3", "A15", "B13", "B5"]
},
"diode_direction": "COL2ROW",
- "processor": "STM32F401",
- "bootloader": "stm32-dfu",
- "board": "BLACKPILL_STM32_F401"
+ "development_board": "blackpill_f401"
}
diff --git a/keyboards/handwired/pill60/blackpill_f401/rules.mk b/keyboards/handwired/pill60/blackpill_f401/rules.mk
deleted file mode 100644
index 3d2bfceea9..0000000000
--- a/keyboards/handwired/pill60/blackpill_f401/rules.mk
+++ /dev/null
@@ -1,4 +0,0 @@
-# Build Options
-# change yes to no to disable
-#
-KEYBOARD_SHARED_EP = yes
diff --git a/keyboards/handwired/pill60/blackpill_f411/info.json b/keyboards/handwired/pill60/blackpill_f411/keyboard.json
index 4e0935f79c..4d47a6b434 100644
--- a/keyboards/handwired/pill60/blackpill_f411/info.json
+++ b/keyboards/handwired/pill60/blackpill_f411/keyboard.json
@@ -1,10 +1,13 @@
{
+ "usb": {
+ "shared_endpoint": {
+ "keyboard": true
+ }
+ },
"matrix_pins": {
"cols": ["A8", "B2", "B1", "B15", "A10", "A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "B0"],
"rows": ["B4", "B3", "A15", "B13", "B5"]
},
"diode_direction": "COL2ROW",
- "processor": "STM32F411",
- "bootloader": "stm32-dfu",
- "board": "BLACKPILL_STM32_F411"
+ "development_board": "blackpill_f411"
}
diff --git a/keyboards/handwired/pill60/blackpill_f411/rules.mk b/keyboards/handwired/pill60/blackpill_f411/rules.mk
deleted file mode 100644
index b5f27c93ea..0000000000
--- a/keyboards/handwired/pill60/blackpill_f411/rules.mk
+++ /dev/null
@@ -1,4 +0,0 @@
-# Build Options
-# change yes to no to disable
-#
-KEYBOARD_SHARED_EP = yes
diff --git a/keyboards/handwired/pill60/bluepill/info.json b/keyboards/handwired/pill60/bluepill/keyboard.json
index 028b1d89d8..3c52f8ad2b 100644
--- a/keyboards/handwired/pill60/bluepill/info.json
+++ b/keyboards/handwired/pill60/bluepill/keyboard.json
@@ -4,6 +4,5 @@
"rows": ["B4", "B3", "A15", "B13", "B5"]
},
"diode_direction": "COL2ROW",
- "processor": "STM32F103",
- "bootloader": "stm32duino"
+ "development_board": "bluepill"
}
diff --git a/keyboards/handwired/pill60/bluepill/rules.mk b/keyboards/handwired/pill60/bluepill/rules.mk
deleted file mode 100644
index 8b13789179..0000000000
--- a/keyboards/handwired/pill60/bluepill/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/keyboards/handwired/pill60/info.json b/keyboards/handwired/pill60/info.json
index ac8c9013ba..7812956177 100644
--- a/keyboards/handwired/pill60/info.json
+++ b/keyboards/handwired/pill60/info.json
@@ -3,6 +3,16 @@
"manufacturer": "IktaS",
"url": "https://github.com/IktaS/Pill60",
"maintainer": "IktaS <[email protected]>",
+ "features": {
+ "bootmagic": false,
+ "command": true,
+ "console": true,
+ "encoder": true,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": true,
+ "oled": true
+ },
"usb": {
"vid": "0x4454",
"pid": "0x5444",
diff --git a/keyboards/handwired/pill60/rules.mk b/keyboards/handwired/pill60/rules.mk
index 6bb5fa1581..9299a64d61 100644
--- a/keyboards/handwired/pill60/rules.mk
+++ b/keyboards/handwired/pill60/rules.mk
@@ -1,16 +1 @@
-# 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 = yes # Console for debug
-COMMAND_ENABLE = yes # Commands for debug and configuration
-NKRO_ENABLE = yes # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
-AUDIO_ENABLE = no # Audio output
-OLED_ENABLE = yes
-ENCODER_ENABLE = yes
-
DEFAULT_FOLDER = handwired/pill60/bluepill