aboutsummaryrefslogtreecommitdiff
path: root/keyboards/marksard
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/marksard')
-rw-r--r--keyboards/marksard/leftover30/keyboard.json (renamed from keyboards/marksard/leftover30/info.json)9
-rw-r--r--keyboards/marksard/leftover30/rules.mk12
-rw-r--r--keyboards/marksard/rhymestone/common/oled_helper.c4
-rw-r--r--keyboards/marksard/rhymestone/rev1/keyboard.json (renamed from keyboards/marksard/rhymestone/rev1/info.json)7
-rw-r--r--keyboards/marksard/rhymestone/rev1/rules.mk0
-rw-r--r--keyboards/marksard/rhymestone/rules.mk15
-rw-r--r--keyboards/marksard/treadstone32/info.json8
-rw-r--r--keyboards/marksard/treadstone32/lite/keyboard.json (renamed from keyboards/marksard/treadstone32/lite/info.json)0
-rw-r--r--keyboards/marksard/treadstone32/lite/rules.mk0
-rw-r--r--keyboards/marksard/treadstone32/rev1/keyboard.json (renamed from keyboards/marksard/treadstone32/rev1/info.json)0
-rw-r--r--keyboards/marksard/treadstone32/rev1/rules.mk0
-rw-r--r--keyboards/marksard/treadstone32/rules.mk14
-rw-r--r--keyboards/marksard/treadstone48/common/oled_helper.c4
-rw-r--r--keyboards/marksard/treadstone48/rev1/keyboard.json (renamed from keyboards/marksard/treadstone48/rev1/info.json)8
-rw-r--r--keyboards/marksard/treadstone48/rev1/rules.mk3
-rw-r--r--keyboards/marksard/treadstone48/rev2/keyboard.json (renamed from keyboards/marksard/treadstone48/rev2/info.json)7
-rw-r--r--keyboards/marksard/treadstone48/rev2/rules.mk1
-rw-r--r--keyboards/marksard/treadstone48/rules.mk17
18 files changed, 45 insertions, 64 deletions
diff --git a/keyboards/marksard/leftover30/info.json b/keyboards/marksard/leftover30/keyboard.json
index 139214ad49..72a1f9a3e0 100644
--- a/keyboards/marksard/leftover30/info.json
+++ b/keyboards/marksard/leftover30/keyboard.json
@@ -8,6 +8,15 @@
"pid": "0xDFA8",
"device_version": "0.0.1"
},
+ "features": {
+ "bootmagic": false,
+ "command": false,
+ "console": false,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": false,
+ "rgblight": true
+ },
"matrix_pins": {
"cols": ["B5", "B4", "E6", "D7", "C6"],
"rows": ["B6", "B2", "F7", "F6", "B3", "B1", "D4", "D0"]
diff --git a/keyboards/marksard/leftover30/rules.mk b/keyboards/marksard/leftover30/rules.mk
deleted file mode 100644
index 9f1aa1c0bf..0000000000
--- a/keyboards/marksard/leftover30/rules.mk
+++ /dev/null
@@ -1,12 +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 = no # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow
-AUDIO_ENABLE = no # Audio output
diff --git a/keyboards/marksard/rhymestone/common/oled_helper.c b/keyboards/marksard/rhymestone/common/oled_helper.c
index 613798c941..4a0ca72e89 100644
--- a/keyboards/marksard/rhymestone/common/oled_helper.c
+++ b/keyboards/marksard/rhymestone/common/oled_helper.c
@@ -1,9 +1,11 @@
#include "oled_helper.h"
-#include "quantum.h"
+#include "host.h"
+#include "progmem.h"
#include <stdio.h>
#include <string.h>
#ifdef OLED_ENABLE
+#include "oled_driver.h"
void render_logo(void) {
diff --git a/keyboards/marksard/rhymestone/rev1/info.json b/keyboards/marksard/rhymestone/rev1/keyboard.json
index bc474f0881..86af26b072 100644
--- a/keyboards/marksard/rhymestone/rev1/info.json
+++ b/keyboards/marksard/rhymestone/rev1/keyboard.json
@@ -22,6 +22,7 @@
},
"diode_direction": "COL2ROW",
"split": {
+ "enabled": true,
"soft_serial_pin": "D2"
},
"ws2812": {
@@ -43,6 +44,12 @@
},
"processor": "atmega32u4",
"bootloader": "caterina",
+ "features": {
+ "bootmagic": false,
+ "mousekey": false,
+ "extrakey": false,
+ "nkro": true
+ },
"community_layouts": ["ortho_4x10"],
"layouts": {
"LAYOUT_ortho_4x10": {
diff --git a/keyboards/marksard/rhymestone/rev1/rules.mk b/keyboards/marksard/rhymestone/rev1/rules.mk
deleted file mode 100644
index e69de29bb2..0000000000
--- a/keyboards/marksard/rhymestone/rev1/rules.mk
+++ /dev/null
diff --git a/keyboards/marksard/rhymestone/rules.mk b/keyboards/marksard/rhymestone/rules.mk
index 6f15328b5a..1833888708 100644
--- a/keyboards/marksard/rhymestone/rules.mk
+++ b/keyboards/marksard/rhymestone/rules.mk
@@ -1,16 +1 @@
-# Build Options
-# change yes to no to disable
-#
-BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no # Mouse keys
-EXTRAKEY_ENABLE = no # 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 = no # Enable keyboard RGB underglow
-AUDIO_ENABLE = no # Audio output
-SPLIT_KEYBOARD = yes
-RGB_MATRIX_ENABLE = no
-
DEFAULT_FOLDER = marksard/rhymestone/rev1
diff --git a/keyboards/marksard/treadstone32/info.json b/keyboards/marksard/treadstone32/info.json
index 098427b0a3..d93277472c 100644
--- a/keyboards/marksard/treadstone32/info.json
+++ b/keyboards/marksard/treadstone32/info.json
@@ -2,6 +2,14 @@
"manufacturer": "marksard",
"url": "https://github.com/marksard/Keyboards",
"maintainer": "marksard",
+ "features": {
+ "bootmagic": false,
+ "command": false,
+ "console": false,
+ "extrakey": false,
+ "mousekey": true,
+ "nkro": false
+ },
"usb": {
"vid": "0xFEED",
"pid": "0xDFA5"
diff --git a/keyboards/marksard/treadstone32/lite/info.json b/keyboards/marksard/treadstone32/lite/keyboard.json
index 4ca3d8b138..4ca3d8b138 100644
--- a/keyboards/marksard/treadstone32/lite/info.json
+++ b/keyboards/marksard/treadstone32/lite/keyboard.json
diff --git a/keyboards/marksard/treadstone32/lite/rules.mk b/keyboards/marksard/treadstone32/lite/rules.mk
deleted file mode 100644
index e69de29bb2..0000000000
--- a/keyboards/marksard/treadstone32/lite/rules.mk
+++ /dev/null
diff --git a/keyboards/marksard/treadstone32/rev1/info.json b/keyboards/marksard/treadstone32/rev1/keyboard.json
index 7da6e2c24e..7da6e2c24e 100644
--- a/keyboards/marksard/treadstone32/rev1/info.json
+++ b/keyboards/marksard/treadstone32/rev1/keyboard.json
diff --git a/keyboards/marksard/treadstone32/rev1/rules.mk b/keyboards/marksard/treadstone32/rev1/rules.mk
deleted file mode 100644
index e69de29bb2..0000000000
--- a/keyboards/marksard/treadstone32/rev1/rules.mk
+++ /dev/null
diff --git a/keyboards/marksard/treadstone32/rules.mk b/keyboards/marksard/treadstone32/rules.mk
index 43e13475d3..2d7ca16d86 100644
--- a/keyboards/marksard/treadstone32/rules.mk
+++ b/keyboards/marksard/treadstone32/rules.mk
@@ -1,15 +1 @@
-# Build Options
-# change yes to no to disable
-#
-BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes # Mouse keys
-EXTRAKEY_ENABLE = no # 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 = no # Enable keyboard backlight functionality
-AUDIO_ENABLE = no # Audio output
-RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight.
-LEADER_ENABLE = no
-
DEFAULT_FOLDER = marksard/treadstone32/rev1
diff --git a/keyboards/marksard/treadstone48/common/oled_helper.c b/keyboards/marksard/treadstone48/common/oled_helper.c
index e9a8cf564a..66124abe12 100644
--- a/keyboards/marksard/treadstone48/common/oled_helper.c
+++ b/keyboards/marksard/treadstone48/common/oled_helper.c
@@ -1,5 +1,7 @@
#include "oled_helper.h"
-#include "quantum.h"
+#include "oled_driver.h"
+#include "host.h"
+#include "rgblight.h"
#include <stdio.h>
#include <string.h>
diff --git a/keyboards/marksard/treadstone48/rev1/info.json b/keyboards/marksard/treadstone48/rev1/keyboard.json
index 5c13e5b15c..f8da65b7b5 100644
--- a/keyboards/marksard/treadstone48/rev1/info.json
+++ b/keyboards/marksard/treadstone48/rev1/keyboard.json
@@ -14,6 +14,7 @@
},
"diode_direction": "COL2ROW",
"split": {
+ "enabled": true,
"soft_serial_pin": "D2"
},
"ws2812": {
@@ -33,6 +34,13 @@
},
"processor": "atmega32u4",
"bootloader": "caterina",
+ "features": {
+ "bootmagic": false,
+ "mousekey": true,
+ "extrakey": false,
+ "rgblight": true,
+ "oled": true
+ },
"layouts": {
"LAYOUT_base": {
"layout": [
diff --git a/keyboards/marksard/treadstone48/rev1/rules.mk b/keyboards/marksard/treadstone48/rev1/rules.mk
deleted file mode 100644
index fff00a1b51..0000000000
--- a/keyboards/marksard/treadstone48/rev1/rules.mk
+++ /dev/null
@@ -1,3 +0,0 @@
-# Revision Specific Build Options
-# change yes to no to disable
-#
diff --git a/keyboards/marksard/treadstone48/rev2/info.json b/keyboards/marksard/treadstone48/rev2/keyboard.json
index 59af38e55d..56346d080a 100644
--- a/keyboards/marksard/treadstone48/rev2/info.json
+++ b/keyboards/marksard/treadstone48/rev2/keyboard.json
@@ -31,6 +31,13 @@
"diode_direction": "COL2ROW",
"processor": "atmega32u4",
"bootloader": "caterina",
+ "features": {
+ "bootmagic": false,
+ "mousekey": true,
+ "extrakey": false,
+ "rgblight": true,
+ "oled": true
+ },
"layout_aliases": {
"LAYOUT_full": "LAYOUT_base"
},
diff --git a/keyboards/marksard/treadstone48/rev2/rules.mk b/keyboards/marksard/treadstone48/rev2/rules.mk
deleted file mode 100644
index d29d9074a0..0000000000
--- a/keyboards/marksard/treadstone48/rev2/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-SPLIT_KEYBOARD = no
diff --git a/keyboards/marksard/treadstone48/rules.mk b/keyboards/marksard/treadstone48/rules.mk
index e9a2de4c25..23865d27e6 100644
--- a/keyboards/marksard/treadstone48/rules.mk
+++ b/keyboards/marksard/treadstone48/rules.mk
@@ -1,18 +1 @@
-# Build Options
-# change yes to no to disable
-#
-BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite
-EXTRAKEY_ENABLE = no # 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 = no # Enable keyboard backlight functionality
-AUDIO_ENABLE = no # Audio output
-SPLIT_KEYBOARD = yes
-
-MOUSEKEY_ENABLE = yes # Mouse keys
-
-RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow
-OLED_ENABLE = yes
-
DEFAULT_FOLDER = marksard/treadstone48/rev1