aboutsummaryrefslogtreecommitdiff
path: root/keyboards/xiudi
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/xiudi')
-rw-r--r--keyboards/xiudi/xd002/keyboard.json (renamed from keyboards/xiudi/xd002/info.json)10
-rw-r--r--keyboards/xiudi/xd002/keymaps/multilayer_rgb/keymap.c1
-rw-r--r--keyboards/xiudi/xd002/keymaps/multilayer_rgb/rgblite.h8
-rw-r--r--keyboards/xiudi/xd002/keymaps/rgb_lite/keymap.c1
-rw-r--r--keyboards/xiudi/xd002/keymaps/rgb_lite/rgblite.h8
-rw-r--r--keyboards/xiudi/xd002/rules.mk25
-rw-r--r--keyboards/xiudi/xd004/v1/keyboard.json (renamed from keyboards/xiudi/xd004/info.json)12
-rw-r--r--keyboards/xiudi/xd004/v1/rules.mk15
-rw-r--r--keyboards/xiudi/xd60/keymaps/default/keymap.c2
-rw-r--r--keyboards/xiudi/xd60/keymaps/iso/keymap.c2
-rw-r--r--keyboards/xiudi/xd60/keymaps/via/keymap.c2
-rw-r--r--keyboards/xiudi/xd60/rev2/keyboard.json (renamed from keyboards/xiudi/xd60/rev2/info.json)10
-rw-r--r--keyboards/xiudi/xd60/rev2/rules.mk12
-rw-r--r--keyboards/xiudi/xd60/rev3/keyboard.json (renamed from keyboards/xiudi/xd60/rev3/info.json)10
-rw-r--r--keyboards/xiudi/xd60/rev3/rules.mk12
-rw-r--r--keyboards/xiudi/xd60/xd60.h21
-rw-r--r--keyboards/xiudi/xd68/keyboard.json (renamed from keyboards/xiudi/xd68/info.json)10
-rw-r--r--keyboards/xiudi/xd68/keymaps/default/keymap.c2
-rw-r--r--keyboards/xiudi/xd68/keymaps/default_iso/keymap.c2
-rw-r--r--keyboards/xiudi/xd68/keymaps/via/keymap.c2
-rw-r--r--keyboards/xiudi/xd68/rules.mk12
-rw-r--r--keyboards/xiudi/xd75/keyboard.json (renamed from keyboards/xiudi/xd75/info.json)10
-rw-r--r--keyboards/xiudi/xd75/keymaps/default/keymap.c2
-rw-r--r--keyboards/xiudi/xd75/keymaps/via/keymap.c2
-rw-r--r--keyboards/xiudi/xd75/rules.mk12
-rw-r--r--keyboards/xiudi/xd75/xd75.c18
-rw-r--r--keyboards/xiudi/xd84/config.h22
-rw-r--r--keyboards/xiudi/xd84/keyboard.json (renamed from keyboards/xiudi/xd84/info.json)17
-rw-r--r--keyboards/xiudi/xd84/matrix.c13
-rw-r--r--keyboards/xiudi/xd84/rules.mk14
-rw-r--r--keyboards/xiudi/xd84pro/keyboard.json (renamed from keyboards/xiudi/xd84pro/info.json)10
-rw-r--r--keyboards/xiudi/xd84pro/rules.mk12
-rw-r--r--keyboards/xiudi/xd87/keyboard.json (renamed from keyboards/xiudi/xd87/info.json)9
-rw-r--r--keyboards/xiudi/xd87/rules.mk12
-rw-r--r--keyboards/xiudi/xd96/config.h22
-rw-r--r--keyboards/xiudi/xd96/keyboard.json (renamed from keyboards/xiudi/xd96/info.json)17
-rw-r--r--keyboards/xiudi/xd96/matrix.c14
-rw-r--r--keyboards/xiudi/xd96/rules.mk14
38 files changed, 171 insertions, 228 deletions
diff --git a/keyboards/xiudi/xd002/info.json b/keyboards/xiudi/xd002/keyboard.json
index 1e0b22f96b..98b06cb84a 100644
--- a/keyboards/xiudi/xd002/info.json
+++ b/keyboards/xiudi/xd002/keyboard.json
@@ -8,6 +8,16 @@
"pid": "0x0202",
"device_version": "0.0.1"
},
+ "processor": "attiny85",
+ "bootloader": "custom",
+ "build": {
+ "lto": true
+ },
+ "features": {
+ "grave_esc": false,
+ "magic": false,
+ "space_cadet": false
+ },
"rgblight": {
"led_count": 2
},
diff --git a/keyboards/xiudi/xd002/keymaps/multilayer_rgb/keymap.c b/keyboards/xiudi/xd002/keymaps/multilayer_rgb/keymap.c
index 4ae28fd91b..d74678d76a 100644
--- a/keyboards/xiudi/xd002/keymaps/multilayer_rgb/keymap.c
+++ b/keyboards/xiudi/xd002/keymaps/multilayer_rgb/keymap.c
@@ -169,5 +169,6 @@ layer_state_t layer_state_set_user(layer_state_t state) {
// default color
void keyboard_post_init_user(void) {
+ rgblite_init();
rgblite_setrgb(RGB_GREEN);
}
diff --git a/keyboards/xiudi/xd002/keymaps/multilayer_rgb/rgblite.h b/keyboards/xiudi/xd002/keymaps/multilayer_rgb/rgblite.h
index 1fa6f899b9..103b228d33 100644
--- a/keyboards/xiudi/xd002/keymaps/multilayer_rgb/rgblite.h
+++ b/keyboards/xiudi/xd002/keymaps/multilayer_rgb/rgblite.h
@@ -3,7 +3,11 @@
#include "ws2812.h"
#include "color.h"
+static inline void rgblite_init(void) {
+ ws2812_init();
+}
+
static inline void rgblite_setrgb(uint8_t _r, uint8_t _g, uint8_t _b) {
- rgb_led_t leds[RGBLED_NUM] = {{.r = _r, .g = _g, .b = _b}, {.r = _r, .g = _g, .b = _b}};
- ws2812_setleds(leds, RGBLED_NUM);
+ rgb_led_t leds[RGBLIGHT_LED_COUNT] = {{.r = _r, .g = _g, .b = _b}, {.r = _r, .g = _g, .b = _b}};
+ ws2812_setleds(leds, RGBLIGHT_LED_COUNT);
}
diff --git a/keyboards/xiudi/xd002/keymaps/rgb_lite/keymap.c b/keyboards/xiudi/xd002/keymaps/rgb_lite/keymap.c
index a795ca8a6d..aac4dc6fde 100644
--- a/keyboards/xiudi/xd002/keymaps/rgb_lite/keymap.c
+++ b/keyboards/xiudi/xd002/keymaps/rgb_lite/keymap.c
@@ -27,5 +27,6 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
}
void keyboard_post_init_user(void) {
+ rgblite_init();
rgblite_increase_hue();
}
diff --git a/keyboards/xiudi/xd002/keymaps/rgb_lite/rgblite.h b/keyboards/xiudi/xd002/keymaps/rgb_lite/rgblite.h
index 15ee0c0f6b..0bb0582415 100644
--- a/keyboards/xiudi/xd002/keymaps/rgb_lite/rgblite.h
+++ b/keyboards/xiudi/xd002/keymaps/rgb_lite/rgblite.h
@@ -3,9 +3,13 @@
#include "ws2812.h"
#include "color.h"
+static inline void rgblite_init(void) {
+ ws2812_init();
+}
+
static inline void rgblite_setrgb(uint8_t _r, uint8_t _g, uint8_t _b) {
- rgb_led_t leds[RGBLED_NUM] = {{.r = _r, .g = _g, .b = _b}, {.r = _r, .g = _g, .b = _b}};
- ws2812_setleds(leds, RGBLED_NUM);
+ rgb_led_t leds[RGBLIGHT_LED_COUNT] = {{.r = _r, .g = _g, .b = _b}, {.r = _r, .g = _g, .b = _b}};
+ ws2812_setleds(leds, RGBLIGHT_LED_COUNT);
}
static void rgblite_increase_hue(void) {
diff --git a/keyboards/xiudi/xd002/rules.mk b/keyboards/xiudi/xd002/rules.mk
index 70c620c8f0..e31f5d531f 100644
--- a/keyboards/xiudi/xd002/rules.mk
+++ b/keyboards/xiudi/xd002/rules.mk
@@ -1,26 +1,3 @@
-# MCU name
-MCU = attiny85
-
-# Bootloader selection
-BOOTLOADER = custom
+# custom bootloader
OPT_DEFS += -DBOOTLOADER_SIZE=1862
PROGRAM_CMD = micronucleus --run $(BUILD_DIR)/$(TARGET).hex
-
-# 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 = no # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
-AUDIO_ENABLE = no # Audio output
-
-# Save as much space as we can...
-LTO_ENABLE = yes
-GRAVE_ESC_ENABLE = no
-MAGIC_ENABLE = no
-SPACE_CADET_ENABLE = no
diff --git a/keyboards/xiudi/xd004/info.json b/keyboards/xiudi/xd004/v1/keyboard.json
index 531283c78a..a6211edfec 100644
--- a/keyboards/xiudi/xd004/info.json
+++ b/keyboards/xiudi/xd004/v1/keyboard.json
@@ -7,6 +7,18 @@
"pid": "0x0404",
"device_version": "0.0.1"
},
+ "build": {
+ "lto": true
+ },
+ "features": {
+ "bootmagic": true,
+ "command": false,
+ "console": false,
+ "extrakey": true,
+ "mousekey": false,
+ "nkro": false,
+ "space_cadet": false
+ },
"backlight": {
"pin": "D5",
"levels": 6
diff --git a/keyboards/xiudi/xd004/v1/rules.mk b/keyboards/xiudi/xd004/v1/rules.mk
deleted file mode 100644
index f5f2138436..0000000000
--- a/keyboards/xiudi/xd004/v1/rules.mk
+++ /dev/null
@@ -1,15 +0,0 @@
-# Build Options
-# change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no # 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
-AUDIO_ENABLE = no # Audio output
-RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight.
-SPACE_CADET_ENABLE = no
-# Saves about 5% of space:
-LTO_ENABLE = yes
diff --git a/keyboards/xiudi/xd60/keymaps/default/keymap.c b/keyboards/xiudi/xd60/keymaps/default/keymap.c
index fc95035bd2..af133d9b3a 100644
--- a/keyboards/xiudi/xd60/keymaps/default/keymap.c
+++ b/keyboards/xiudi/xd60/keymaps/default/keymap.c
@@ -12,7 +12,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
// 1: Function Layer
LAYOUT_all(
- QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_F13, KC_F14,
+ QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_F13, KC_F14,
KC_NO, KC_WH_U, KC_UP, KC_WH_D, KC_BSPC,KC_HOME,KC_CALC,KC_NO, KC_INS, KC_NO, KC_PSCR, KC_SCRL, KC_PAUS, KC_DEL,
KC_NO, KC_LEFT, KC_DOWN, KC_RIGHT,KC_DEL, KC_END, KC_PGDN,KC_NO, KC_NO, KC_NO, KC_HOME, KC_PGUP, KC_NO, KC_ENT,
KC_LSFT, KC_NO, KC_NO, KC_APP, BL_STEP,KC_NO, KC_NO, KC_VOLD,KC_VOLU,KC_MUTE, KC_END, KC_PGDN, KC_RSFT, KC_PGUP, KC_INS,
diff --git a/keyboards/xiudi/xd60/keymaps/iso/keymap.c b/keyboards/xiudi/xd60/keymaps/iso/keymap.c
index d4ec91919e..74d582159e 100644
--- a/keyboards/xiudi/xd60/keymaps/iso/keymap.c
+++ b/keyboards/xiudi/xd60/keymaps/iso/keymap.c
@@ -18,7 +18,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
//,: Function Layer
[_FL] = LAYOUT_60_iso(
- QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL,
+ QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL,
XXXXXXX, KC_VOLD, KC_MUTE, KC_VOLU, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, BL_TOGG, BL_DOWN, BL_UP,
XXXXXXX, KC_MPLY, KC_MSTP, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_ENT,
KC_LSFT, RGB_TOG, RGB_MOD, KC_CUT, KC_COPY, KC_PSTE, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_RSFT,
diff --git a/keyboards/xiudi/xd60/keymaps/via/keymap.c b/keyboards/xiudi/xd60/keymaps/via/keymap.c
index 6d1ce4ed04..c75400c63f 100644
--- a/keyboards/xiudi/xd60/keymaps/via/keymap.c
+++ b/keyboards/xiudi/xd60/keymaps/via/keymap.c
@@ -12,7 +12,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
// 1: Function Layer
[1] = LAYOUT_all(
- QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_F13, KC_F14,
+ QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_F13, KC_F14,
KC_NO, KC_WH_U, KC_UP, KC_WH_D, KC_BSPC,KC_HOME,KC_CALC,KC_NO, KC_INS, KC_NO, KC_PSCR, KC_SCRL, KC_PAUS, KC_DEL,
KC_NO, KC_LEFT, KC_DOWN, KC_RIGHT,KC_DEL, KC_END, KC_PGDN,KC_NO, KC_NO, KC_NO, KC_HOME, KC_PGUP, KC_NO, KC_ENT,
KC_LSFT, KC_NO, KC_NO, KC_APP, BL_STEP,KC_NO, KC_NO, KC_VOLD,KC_VOLU,KC_MUTE, KC_END, KC_PGDN, KC_RSFT, KC_PGUP, KC_INS,
diff --git a/keyboards/xiudi/xd60/rev2/info.json b/keyboards/xiudi/xd60/rev2/keyboard.json
index 2f994ac2e4..639c2dda9e 100644
--- a/keyboards/xiudi/xd60/rev2/info.json
+++ b/keyboards/xiudi/xd60/rev2/keyboard.json
@@ -3,6 +3,16 @@
"usb": {
"pid": "0x6060"
},
+ "features": {
+ "backlight": true,
+ "bootmagic": true,
+ "command": false,
+ "console": false,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": true,
+ "rgblight": true
+ },
"matrix_pins": {
"cols": ["F0", "F1", "E6", "C7", "C6", "B6", "D4", "B1", "B7", "B5", "B4", "D7", "D6", "B3"],
"rows": ["D0", "D1", "D2", "D3", "D5"]
diff --git a/keyboards/xiudi/xd60/rev2/rules.mk b/keyboards/xiudi/xd60/rev2/rules.mk
deleted file mode 100644
index 7dfcc1d898..0000000000
--- a/keyboards/xiudi/xd60/rev2/rules.mk
+++ /dev/null
@@ -1,12 +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 = yes # Enable N-Key Rollover
-BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality
-AUDIO_ENABLE = no # Audio output
-RGBLIGHT_ENABLE = yes # Enable WS2812 RGB underlight.
diff --git a/keyboards/xiudi/xd60/rev3/info.json b/keyboards/xiudi/xd60/rev3/keyboard.json
index 89a0983bf4..5b12c38f8e 100644
--- a/keyboards/xiudi/xd60/rev3/info.json
+++ b/keyboards/xiudi/xd60/rev3/keyboard.json
@@ -3,6 +3,16 @@
"usb": {
"pid": "0x6363"
},
+ "features": {
+ "backlight": true,
+ "bootmagic": true,
+ "command": false,
+ "console": false,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": true,
+ "rgblight": true
+ },
"matrix_pins": {
"cols": ["F0", "F1", "E6", "C7", "C6", "B6", "D4", "B1", "B7", "B5", "B4", "D7", "D6", "B3"],
"rows": ["D0", "D1", "D2", "D3", "D5"]
diff --git a/keyboards/xiudi/xd60/rev3/rules.mk b/keyboards/xiudi/xd60/rev3/rules.mk
deleted file mode 100644
index 7dfcc1d898..0000000000
--- a/keyboards/xiudi/xd60/rev3/rules.mk
+++ /dev/null
@@ -1,12 +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 = yes # Enable N-Key Rollover
-BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality
-AUDIO_ENABLE = no # Audio output
-RGBLIGHT_ENABLE = yes # Enable WS2812 RGB underlight.
diff --git a/keyboards/xiudi/xd60/xd60.h b/keyboards/xiudi/xd60/xd60.h
index 3d3c1ae885..c399b2965d 100644
--- a/keyboards/xiudi/xd60/xd60.h
+++ b/keyboards/xiudi/xd60/xd60.h
@@ -2,6 +2,9 @@
#include "quantum.h"
+#define XD60_CAPS_LOCK_LED_PIN B2
+#define XD60_BACKLIGHT_PIN F5
+
/* XD60 LEDs
* GPIO pads
* 0 F7 not connected
@@ -11,8 +14,18 @@
* B2 Capslock LED
* B0 not connected
*/
-inline void xd60_caps_led_on(void) { DDRB |= (1<<2); PORTB &= ~(1<<2); }
-inline void xd60_bl_led_on(void) { DDRF |= (1<<5); PORTF &= ~(1<<5); }
+inline void xd60_caps_led_on(void) {
+ gpio_set_pin_output(XD60_CAPS_LOCK_LED_PIN);
+ gpio_write_pin_low(XD60_CAPS_LOCK_LED_PIN);
+}
+inline void xd60_bl_led_on(void) {
+ gpio_set_pin_output(XD60_BACKLIGHT_PIN);
+ gpio_write_pin_low(XD60_BACKLIGHT_PIN);
+}
-inline void xd60_caps_led_off(void) { DDRB &= ~(1<<2); PORTB &= ~(1<<2); }
-inline void xd60_bl_led_off(void) { DDRF &= ~(1<<5); PORTF &= ~(1<<5); }
+inline void xd60_caps_led_off(void) {
+ gpio_set_pin_input(XD60_CAPS_LOCK_LED_PIN);
+}
+inline void xd60_bl_led_off(void) {
+ gpio_set_pin_input(XD60_BACKLIGHT_PIN);
+}
diff --git a/keyboards/xiudi/xd68/info.json b/keyboards/xiudi/xd68/keyboard.json
index d55a8535c6..1836feb49d 100644
--- a/keyboards/xiudi/xd68/info.json
+++ b/keyboards/xiudi/xd68/keyboard.json
@@ -8,6 +8,16 @@
"pid": "0x6868",
"device_version": "0.0.1"
},
+ "features": {
+ "backlight": true,
+ "bootmagic": true,
+ "command": true,
+ "console": false,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": true,
+ "rgblight": true
+ },
"matrix_pins": {
"cols": ["F0", "F1", "E6", "C7", "C6", "B6", "D4", "B1", "B7", "B5", "B4", "D7", "D6", "B3", "F7"],
"rows": ["D0", "D1", "D2", "D3", "D5"]
diff --git a/keyboards/xiudi/xd68/keymaps/default/keymap.c b/keyboards/xiudi/xd68/keymaps/default/keymap.c
index bc8484e7f9..1311ea9f23 100644
--- a/keyboards/xiudi/xd68/keymaps/default/keymap.c
+++ b/keyboards/xiudi/xd68/keymaps/default/keymap.c
@@ -40,7 +40,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
*/
[_FL] = LAYOUT_65_ansi(
KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, KC_INS,
- QK_BOOT, _______, KC_UP, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ QK_BOOT, _______, KC_UP, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
RGB_HUI, RGB_SAI, RGB_VAI, RGB_MOD, BL_DOWN, BL_TOGG, BL_UP, _______, _______, _______, _______, KC_MPLY, KC_VOLU, KC_MUTE,
RGB_HUD, RGB_SAD, RGB_VAD, RGB_TOG, _______, _______, KC_TRNS, KC_MPRV, KC_VOLD, KC_MNXT
diff --git a/keyboards/xiudi/xd68/keymaps/default_iso/keymap.c b/keyboards/xiudi/xd68/keymaps/default_iso/keymap.c
index 2c9cce92d1..7949b4e2a2 100644
--- a/keyboards/xiudi/xd68/keymaps/default_iso/keymap.c
+++ b/keyboards/xiudi/xd68/keymaps/default_iso/keymap.c
@@ -40,7 +40,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
*/
[_FL] = LAYOUT_65_iso(
KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, KC_INS,
- QK_BOOT, _______, KC_UP, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ QK_BOOT, _______, KC_UP, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
RGB_HUI, RGB_SAI, RGB_VAI, RGB_MOD, BL_DOWN, BL_TOGG, BL_UP, _______, _______, _______, _______, _______, KC_MPLY, KC_VOLU, KC_MUTE,
RGB_HUD, RGB_SAD, RGB_VAD, RGB_TOG, _______, _______, KC_TRNS, KC_MPRV, KC_VOLD, KC_MNXT
diff --git a/keyboards/xiudi/xd68/keymaps/via/keymap.c b/keyboards/xiudi/xd68/keymaps/via/keymap.c
index 5dd09992bd..461d1cf6b9 100644
--- a/keyboards/xiudi/xd68/keymaps/via/keymap.c
+++ b/keyboards/xiudi/xd68/keymaps/via/keymap.c
@@ -40,7 +40,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
*/
[_FL] = LAYOUT_all(
KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, KC_INS,
- QK_BOOT, _______, KC_UP, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ QK_BOOT, _______, KC_UP, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
RGB_HUI, _______, RGB_SAI, RGB_VAI, RGB_MOD, BL_DOWN, BL_TOGG, BL_UP, _______, _______, _______, _______, KC_MPLY, KC_VOLU, KC_MUTE,
RGB_HUD, RGB_SAD, RGB_VAD, RGB_TOG, _______, _______, KC_TRNS, KC_MPRV, KC_VOLD, KC_MNXT
diff --git a/keyboards/xiudi/xd68/rules.mk b/keyboards/xiudi/xd68/rules.mk
deleted file mode 100644
index 4537738380..0000000000
--- a/keyboards/xiudi/xd68/rules.mk
+++ /dev/null
@@ -1,12 +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 = yes # Commands for debug and configuration
-NKRO_ENABLE = yes # Enable N-Key Rollover
-BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow
-AUDIO_ENABLE = no # Audio output
diff --git a/keyboards/xiudi/xd75/info.json b/keyboards/xiudi/xd75/keyboard.json
index 58af00e972..5086134cf1 100644
--- a/keyboards/xiudi/xd75/info.json
+++ b/keyboards/xiudi/xd75/keyboard.json
@@ -8,12 +8,22 @@
"pid": "0x7575",
"device_version": "0.0.1"
},
+ "features": {
+ "bootmagic": true,
+ "command": true,
+ "console": false,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": false,
+ "rgblight": true
+ },
"matrix_pins": {
"cols": ["F0", "F1", "E6", "C7", "C6", "B6", "D4", "B1", "B7", "B5", "B4", "D7", "D6", "B3", "B0"],
"rows": ["D0", "D1", "D2", "D3", "D5"]
},
"diode_direction": "COL2ROW",
"backlight": {
+ "driver": "timer",
"pin": "F5",
"levels": 6,
"on_state": 0
diff --git a/keyboards/xiudi/xd75/keymaps/default/keymap.c b/keyboards/xiudi/xd75/keymaps/default/keymap.c
index cc193c9749..7c0faed9b1 100644
--- a/keyboards/xiudi/xd75/keymaps/default/keymap.c
+++ b/keyboards/xiudi/xd75/keymaps/default/keymap.c
@@ -59,7 +59,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[_FN] = LAYOUT_ortho_5x15( /* FUNCTION */
KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_NUM, KC_SLSH, KC_ASTR, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12,
KC_MSEL, KC_CALC, KC_MYCM, KC_MAIL, RGB_HUD, RGB_HUI, KC_P7, KC_P8, KC_P9, KC_MINS, _______, _______, KC_PSCR, KC_SCRL, KC_PAUS,
- KC_MPRV, KC_MPLY, KC_MNXT, KC_MSTP, RGB_SAD, RGB_SAI, KC_P4, KC_P5, KC_P6, KC_PLUS, _______, QK_BOOT, _______, _______, _______,
+ KC_MPRV, KC_MPLY, KC_MNXT, KC_MSTP, RGB_SAD, RGB_SAI, KC_P4, KC_P5, KC_P6, KC_PLUS, _______, QK_BOOT, _______, _______, _______,
KC_VOLD, KC_MUTE, KC_VOLU, KC_APP, RGB_VAD, RGB_VAI, KC_P1, KC_P2, KC_P3, KC_PENT, _______, _______, _______, _______, _______,
_______, _______, RGB_TOG, MO(_FN), RGB_RMOD,RGB_MOD, KC_P0, _______, KC_PDOT, KC_PENT, KC_PENT, MO(_FN), _______, _______, _______
)
diff --git a/keyboards/xiudi/xd75/keymaps/via/keymap.c b/keyboards/xiudi/xd75/keymaps/via/keymap.c
index a156f60317..2b7b5177e1 100644
--- a/keyboards/xiudi/xd75/keymaps/via/keymap.c
+++ b/keyboards/xiudi/xd75/keymaps/via/keymap.c
@@ -54,7 +54,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[1] = LAYOUT_ortho_5x15(
KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_NUM, KC_SLSH, KC_ASTR, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12,
KC_MSEL, KC_CALC, KC_MYCM, KC_MAIL, RGB_HUD, RGB_HUI, KC_P7, KC_P8, KC_P9, KC_MINS, _______, _______, KC_PSCR, KC_SCRL, KC_PAUS,
- KC_MPRV, KC_MPLY, KC_MNXT, KC_MSTP, RGB_SAD, RGB_SAI, KC_P4, KC_P5, KC_P6, KC_PLUS, _______, QK_BOOT, _______, _______, _______,
+ KC_MPRV, KC_MPLY, KC_MNXT, KC_MSTP, RGB_SAD, RGB_SAI, KC_P4, KC_P5, KC_P6, KC_PLUS, _______, QK_BOOT, _______, _______, _______,
KC_VOLD, KC_MUTE, KC_VOLU, KC_APP, RGB_VAD, RGB_VAI, KC_P1, KC_P2, KC_P3, KC_PENT, _______, _______, _______, _______, _______,
_______, _______, RGB_TOG, _______, RGB_RMOD,RGB_MOD, KC_P0, _______, KC_PDOT, KC_PENT, KC_PENT, _______, _______, _______, _______
),
diff --git a/keyboards/xiudi/xd75/rules.mk b/keyboards/xiudi/xd75/rules.mk
deleted file mode 100644
index ffa61ba8c5..0000000000
--- a/keyboards/xiudi/xd75/rules.mk
+++ /dev/null
@@ -1,12 +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 = yes # 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/xiudi/xd75/xd75.c b/keyboards/xiudi/xd75/xd75.c
index b016643572..47bfd6d3dd 100644
--- a/keyboards/xiudi/xd75/xd75.c
+++ b/keyboards/xiudi/xd75/xd75.c
@@ -29,40 +29,40 @@ void matrix_init_kb(void) {
}
void capslock_led_init(void) {
- setPinOutput(XD75_CAPSLOCK_LED);
+ gpio_set_pin_output(XD75_CAPSLOCK_LED);
capslock_led_off();
}
void capslock_led_off(void) {
- writePinHigh(XD75_CAPSLOCK_LED);
+ gpio_write_pin_high(XD75_CAPSLOCK_LED);
}
void capslock_led_on(void) {
- writePinLow(XD75_CAPSLOCK_LED);
+ gpio_write_pin_low(XD75_CAPSLOCK_LED);
}
void gp100_led_init(void) {
- setPinOutput(XD75_GP100_LED);
+ gpio_set_pin_output(XD75_GP100_LED);
gp100_led_off();
}
void gp100_led_off(void) {
- writePinHigh(XD75_GP100_LED);
+ gpio_write_pin_high(XD75_GP100_LED);
}
void gp100_led_on(void) {
- writePinLow(XD75_GP100_LED);
+ gpio_write_pin_low(XD75_GP100_LED);
}
void gp103_led_init(void) {
- setPinOutput(XD75_GP103_LED);
+ gpio_set_pin_output(XD75_GP103_LED);
gp103_led_off();
}
void gp103_led_off(void) {
- writePinLow(XD75_GP103_LED);
+ gpio_write_pin_low(XD75_GP103_LED);
}
void gp103_led_on(void) {
- writePinHigh(XD75_GP103_LED);
+ gpio_write_pin_high(XD75_GP103_LED);
}
diff --git a/keyboards/xiudi/xd84/config.h b/keyboards/xiudi/xd84/config.h
index 0ad3910060..e40e570c14 100644
--- a/keyboards/xiudi/xd84/config.h
+++ b/keyboards/xiudi/xd84/config.h
@@ -16,28 +16,6 @@
#pragma once
-
/* key matrix size */
#define MATRIX_ROWS 6
#define MATRIX_COLS 15
-
-/* 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
-
-/*
- * Feature disable options
- * These options are also useful to firmware size reduction.
- */
-
-/* disable debug print */
-//#define NO_DEBUG
-
-/* disable print */
-//#define NO_PRINT
-
-/* disable action features */
-//#define NO_ACTION_LAYER
-//#define NO_ACTION_TAPPING
-//#define NO_ACTION_ONESHOT
diff --git a/keyboards/xiudi/xd84/info.json b/keyboards/xiudi/xd84/keyboard.json
index b97efe9cf8..0411869633 100644
--- a/keyboards/xiudi/xd84/info.json
+++ b/keyboards/xiudi/xd84/keyboard.json
@@ -8,6 +8,23 @@
"pid": "0x8484",
"device_version": "0.0.1"
},
+ "build": {
+ "lto": true
+ },
+ "features": {
+ "backlight": true,
+ "bootmagic": true,
+ "extrakey": true,
+ "mousekey": false,
+ "nkro": false,
+ "rgblight": true
+ },
+ "qmk": {
+ "locking": {
+ "enabled": true,
+ "resync": true
+ }
+ },
"backlight": {
"pin": "B5",
"levels": 10,
diff --git a/keyboards/xiudi/xd84/matrix.c b/keyboards/xiudi/xd84/matrix.c
index 04128561ee..ea1b4f55b4 100644
--- a/keyboards/xiudi/xd84/matrix.c
+++ b/keyboards/xiudi/xd84/matrix.c
@@ -13,15 +13,8 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include <stdint.h>
-#include <stdbool.h>
-#include <avr/io.h>
-#include <string.h>
#include "matrix.h"
#include "pca9555.h"
-#include "quantum.h"
-
-#include "debug.h"
// PCA9555 slave addresses
#define IC1 0x20
@@ -51,10 +44,10 @@ static void select_row(uint8_t row) {
}
static uint16_t read_cols(void) {
- // uint16_t state_1 = pca9555_readPins(IC2, PCA9555_PORT0);
- // uint16_t state_2 = pca9555_readPins(IC2, PCA9555_PORT1);
+ // uint16_t state_1 = pca9555_read_pins(IC2, PCA9555_PORT0);
+ // uint16_t state_2 = pca9555_read_pins(IC2, PCA9555_PORT1);
uint16_t state = 0;
- pca9555_readPins_all(IC2, &state);
+ pca9555_read_pins_all(IC2, &state);
// For the XD84 all cols are on the same IC and mapped sequentially
// while this technically gives 16 column reads,
diff --git a/keyboards/xiudi/xd84/rules.mk b/keyboards/xiudi/xd84/rules.mk
index 89d05c5487..e11c65db02 100644
--- a/keyboards/xiudi/xd84/rules.mk
+++ b/keyboards/xiudi/xd84/rules.mk
@@ -1,17 +1,3 @@
-# Build Options
-# change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no # 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
-
# custom matrix setup
CUSTOM_MATRIX = lite
diff --git a/keyboards/xiudi/xd84pro/info.json b/keyboards/xiudi/xd84pro/keyboard.json
index bcdc0d2cf1..23bad3fcab 100644
--- a/keyboards/xiudi/xd84pro/info.json
+++ b/keyboards/xiudi/xd84pro/keyboard.json
@@ -8,6 +8,16 @@
"pid": "0x8450",
"device_version": "0.0.1"
},
+ "features": {
+ "backlight": true,
+ "bootmagic": true,
+ "command": false,
+ "console": false,
+ "extrakey": true,
+ "mousekey": false,
+ "nkro": true,
+ "rgblight": true
+ },
"matrix_pins": {
"cols": ["F0", "F1", "E6", "C7", "C6", "B6", "D4", "B1", "B7", "B5", "B4", "D7", "D6", "B3", "F7"],
"rows": ["F4", "D0", "D1", "D2", "D3", "D5"]
diff --git a/keyboards/xiudi/xd84pro/rules.mk b/keyboards/xiudi/xd84pro/rules.mk
deleted file mode 100644
index 1955f1d315..0000000000
--- a/keyboards/xiudi/xd84pro/rules.mk
+++ /dev/null
@@ -1,12 +0,0 @@
-# Build Options
-# change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no # 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 = yes # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow
-AUDIO_ENABLE = no # Audio output
diff --git a/keyboards/xiudi/xd87/info.json b/keyboards/xiudi/xd87/keyboard.json
index 3c30f69ba9..a84c5660a8 100644
--- a/keyboards/xiudi/xd87/info.json
+++ b/keyboards/xiudi/xd87/keyboard.json
@@ -8,6 +8,15 @@
"pid": "0x8787",
"device_version": "0.0.1"
},
+ "features": {
+ "backlight": true,
+ "bootmagic": true,
+ "command": true,
+ "console": true,
+ "extrakey": true,
+ "mousekey": false,
+ "nkro": false
+ },
"matrix_pins": {
"cols": ["E6", "F0", "F1", "F4", "F5", "F6", "F7", "B5", "B6", "C6", "D4", "D6", "D7", "B4", "B2", "B3", "D2"],
"rows": ["D1", "B0", "B1", "C7", "D3", "D5"]
diff --git a/keyboards/xiudi/xd87/rules.mk b/keyboards/xiudi/xd87/rules.mk
deleted file mode 100644
index a2444417d6..0000000000
--- a/keyboards/xiudi/xd87/rules.mk
+++ /dev/null
@@ -1,12 +0,0 @@
-# Build Options
-# change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no # 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 = no # Enable N-Key Rollover
-BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
-AUDIO_ENABLE = no # Audio output
diff --git a/keyboards/xiudi/xd96/config.h b/keyboards/xiudi/xd96/config.h
index 059b57a0c6..6eb4fc5f58 100644
--- a/keyboards/xiudi/xd96/config.h
+++ b/keyboards/xiudi/xd96/config.h
@@ -16,28 +16,6 @@
#pragma once
-
/* key matrix size */
#define MATRIX_ROWS 6
#define MATRIX_COLS 18
-
-/* 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
-
-/*
- * Feature disable options
- * These options are also useful to firmware size reduction.
- */
-
-/* disable debug print */
-//#define NO_DEBUG
-
-/* disable print */
-//#define NO_PRINT
-
-/* disable action features */
-//#define NO_ACTION_LAYER
-//#define NO_ACTION_TAPPING
-//#define NO_ACTION_ONESHOT
diff --git a/keyboards/xiudi/xd96/info.json b/keyboards/xiudi/xd96/keyboard.json
index 2b4ee4aad0..df1fd1cfd4 100644
--- a/keyboards/xiudi/xd96/info.json
+++ b/keyboards/xiudi/xd96/keyboard.json
@@ -8,6 +8,23 @@
"pid": "0x9696",
"device_version": "0.0.1"
},
+ "build": {
+ "lto": true
+ },
+ "features": {
+ "backlight": true,
+ "bootmagic": true,
+ "extrakey": true,
+ "mousekey": false,
+ "nkro": false,
+ "rgblight": true
+ },
+ "qmk": {
+ "locking": {
+ "enabled": true,
+ "resync": true
+ }
+ },
"backlight": {
"pin": "B5",
"levels": 10
diff --git a/keyboards/xiudi/xd96/matrix.c b/keyboards/xiudi/xd96/matrix.c
index beef7fae12..2c433f02b8 100644
--- a/keyboards/xiudi/xd96/matrix.c
+++ b/keyboards/xiudi/xd96/matrix.c
@@ -13,15 +13,9 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include <stdint.h>
-#include <stdbool.h>
-#include <avr/io.h>
-#include <string.h>
#include "matrix.h"
#include "pca9555.h"
-#include "quantum.h"
-
-#include "debug.h"
+#include "wait.h"
// PCA9555 slave addresses
#define IC1 0x20
@@ -53,9 +47,9 @@ static uint32_t read_cols(void) {
uint8_t state_1 = 0;
uint8_t state_2 = 0;
uint8_t state_3 = 0;
- pca9555_readPins(IC2, PCA9555_PORT0, &state_1);
- pca9555_readPins(IC2, PCA9555_PORT1, &state_2);
- pca9555_readPins(IC1, PCA9555_PORT1, &state_3);
+ pca9555_read_pins(IC2, PCA9555_PORT0, &state_1);
+ pca9555_read_pins(IC2, PCA9555_PORT1, &state_2);
+ pca9555_read_pins(IC1, PCA9555_PORT1, &state_3);
// For the XD96 the pins are mapped to port expanders as follows:
// all 8 pins port 0 IC2, first 6 pins port 1 IC2, first 4 pins port 1 IC1
diff --git a/keyboards/xiudi/xd96/rules.mk b/keyboards/xiudi/xd96/rules.mk
index 89d05c5487..e11c65db02 100644
--- a/keyboards/xiudi/xd96/rules.mk
+++ b/keyboards/xiudi/xd96/rules.mk
@@ -1,17 +1,3 @@
-# Build Options
-# change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no # 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
-
# custom matrix setup
CUSTOM_MATRIX = lite