summaryrefslogtreecommitdiff
path: root/keyboards/jian
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/jian')
-rw-r--r--keyboards/jian/config.h21
-rw-r--r--keyboards/jian/handwired/config.h8
-rw-r--r--keyboards/jian/handwired/info.json4
-rw-r--r--keyboards/jian/handwired/rules.mk6
-rw-r--r--keyboards/jian/keymaps/advanced/keymap.c8
-rw-r--r--keyboards/jian/keymaps/default/keymap.c2
-rw-r--r--keyboards/jian/keymaps/via/keymap.c2
-rw-r--r--keyboards/jian/nsrev2/config.h12
-rw-r--r--keyboards/jian/nsrev2/info.json8
-rw-r--r--keyboards/jian/nsrev2/rules.mk6
-rw-r--r--keyboards/jian/rev1/config.h10
-rw-r--r--keyboards/jian/rev1/info.json4
-rw-r--r--keyboards/jian/rev1/rules.mk6
-rw-r--r--keyboards/jian/rev2/config.h15
-rw-r--r--keyboards/jian/rev2/info.json11
-rw-r--r--keyboards/jian/rev2/rules.mk6
16 files changed, 29 insertions, 100 deletions
diff --git a/keyboards/jian/config.h b/keyboards/jian/config.h
deleted file mode 100644
index cfb6bf4ffc..0000000000
--- a/keyboards/jian/config.h
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
-Copyright 2012 Jun Wako <wakojun@gmail.com>
-Copyright 2015 Jack Humbert
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program. If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-#include "config_common.h"
diff --git a/keyboards/jian/handwired/config.h b/keyboards/jian/handwired/config.h
index 055568b06c..d968a5bf93 100644
--- a/keyboards/jian/handwired/config.h
+++ b/keyboards/jian/handwired/config.h
@@ -17,17 +17,9 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#pragma once
-#include "config_common.h"
-/* key matrix size */
-// Rows are doubled-up
-#define MATRIX_ROWS 4
-#define MATRIX_COLS 14
#define DIODE_DIRECTION COL2ROW
// wiring of each half
#define MATRIX_ROW_PINS { D3, D2, B5, B6 }
#define MATRIX_COL_PINS { F4, F5, F6, F7, B1, B3, B2, B4, E6, D7, C6, D4, D0, D1 }
-
-/* Set 0 if debouncing isn't needed */
-#define DEBOUNCE 5
diff --git a/keyboards/jian/handwired/info.json b/keyboards/jian/handwired/info.json
index 120c6c4a24..712c3d9b01 100644
--- a/keyboards/jian/handwired/info.json
+++ b/keyboards/jian/handwired/info.json
@@ -2,5 +2,7 @@
"keyboard_name": "Huma",
"usb": {
"device_version": "0.1.0"
- }
+ },
+ "processor": "atmega32u4",
+ "bootloader": "caterina"
}
diff --git a/keyboards/jian/handwired/rules.mk b/keyboards/jian/handwired/rules.mk
index b12d594ea1..947cf02038 100644
--- a/keyboards/jian/handwired/rules.mk
+++ b/keyboards/jian/handwired/rules.mk
@@ -1,9 +1,3 @@
-# MCU name
-MCU = atmega32u4
-
-# Bootloader selection
-BOOTLOADER = caterina
-
# Build Options
# change yes to no to disable
#
diff --git a/keyboards/jian/keymaps/advanced/keymap.c b/keyboards/jian/keymaps/advanced/keymap.c
index 0c13b2d301..6b308a4820 100644
--- a/keyboards/jian/keymaps/advanced/keymap.c
+++ b/keyboards/jian/keymaps/advanced/keymap.c
@@ -181,7 +181,7 @@ static uint8_t layout_conversion_dip_state = 0;
#define LAYOUT_base_wrapper(...) LAYOUT_base(__VA_ARGS__)
#ifdef SWAP_HANDS_ENABLE
-#define SW_TG SH_TG
+#define SW_TG SH_TOGG
#else
#define SW_TG _______
#endif
@@ -191,9 +191,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[_QWERTY] = LAYOUT_base_wrapper(QWERTY_base),
#ifdef DIPS_ENABLE
-[_DIPS] = LAYOUT_dips(\
- LAYOUT0, LAYOUT1, LAYOUT2, LAYOUT3, DIP_ISO, FLIP_TH, \
- LAYOUT0, LAYOUT1, LAYOUT2, LAYOUT3, DIP_ISO, FLIP_TH \
+[_DIPS] = LAYOUT_dips(
+ LAYOUT0, LAYOUT1, LAYOUT2, LAYOUT3, DIP_ISO, FLIP_TH,
+ LAYOUT0, LAYOUT1, LAYOUT2, LAYOUT3, DIP_ISO, FLIP_TH
),
#endif // DIPS_ENABLE
diff --git a/keyboards/jian/keymaps/default/keymap.c b/keyboards/jian/keymaps/default/keymap.c
index 8a1234e1aa..3948dd119f 100644
--- a/keyboards/jian/keymaps/default/keymap.c
+++ b/keyboards/jian/keymaps/default/keymap.c
@@ -22,7 +22,7 @@ enum jian_keycodes {
#define LOWER_T(kc) LT(_LOWER, kc)
#ifdef SWAP_HANDS_ENABLE
-#define SW_TG SH_TG
+#define SW_TG SH_TOGG
#else
#define SW_TG _______
#endif
diff --git a/keyboards/jian/keymaps/via/keymap.c b/keyboards/jian/keymaps/via/keymap.c
index 5844ef16e8..3d6c7507ba 100644
--- a/keyboards/jian/keymaps/via/keymap.c
+++ b/keyboards/jian/keymaps/via/keymap.c
@@ -23,6 +23,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
QK_BOOT, DB_TOGG, XXXXXXX, BL_UP, RGB_VAI, RGB_HUD, RGB_HUI,
XXXXXXX, XXXXXXX, BL_DOWN, RGB_VAD, RGB_SAD, RGB_SAI,
XXXXXXX, BL_BRTG, BL_TOGG, RGB_TOG, RGB_RMOD,RGB_MOD,
- _______, SH_TG, _______
+ _______, SH_TOGG, _______
)
};
diff --git a/keyboards/jian/nsrev2/config.h b/keyboards/jian/nsrev2/config.h
index 9e2e5e765e..eba3f5247b 100644
--- a/keyboards/jian/nsrev2/config.h
+++ b/keyboards/jian/nsrev2/config.h
@@ -17,12 +17,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#pragma once
-#include "config_common.h"
-/* key matrix size */
-// Rows are doubled-up
-#define MATRIX_ROWS 8
-#define MATRIX_COLS 6
#define DIODE_DIRECTION COL2ROW
@@ -30,19 +25,12 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define MATRIX_ROW_PINS { F4, F5, B1, B3, D1, D0, D7, E6 }
#define MATRIX_COL_PINS { D3, D2, B4, F6, F7, B2 }
-/* Set 0 if debouncing isn't needed */
-#define DEBOUNCE 5
-
-#define QMK_ESC_OUTPUT D3
-#define QMK_ESC_INPUT B1
-
#define PHYSICAL_LEDS_ENABLE
#ifdef BACKLIGHT_ENABLE
#define BACKLIGHT_PIN C6
#define BACKLIGHT_LEVELS 5
#define BACKLIGHT_BREATHING //not working with splits right now
-#define BREATHING_PERIOD 6
#endif
/* ws2812 RGB LED */
diff --git a/keyboards/jian/nsrev2/info.json b/keyboards/jian/nsrev2/info.json
index 06fbfeb833..bb64f79e58 100644
--- a/keyboards/jian/nsrev2/info.json
+++ b/keyboards/jian/nsrev2/info.json
@@ -2,5 +2,11 @@
"keyboard_name": "Huma",
"usb": {
"device_version": "2.1.0"
- }
+ },
+ "qmk_lufa_bootloader": {
+ "esc_input": "B1",
+ "esc_output": "D3"
+ },
+ "processor": "atmega32u4",
+ "bootloader": "qmk-dfu"
}
diff --git a/keyboards/jian/nsrev2/rules.mk b/keyboards/jian/nsrev2/rules.mk
index 7f93cad712..3d0af8ae98 100644
--- a/keyboards/jian/nsrev2/rules.mk
+++ b/keyboards/jian/nsrev2/rules.mk
@@ -1,9 +1,3 @@
-# MCU name
-MCU = atmega32u4
-
-# Bootloader selection
-BOOTLOADER = qmk-dfu
-
# Build Options
# change yes to no to disable
#
diff --git a/keyboards/jian/rev1/config.h b/keyboards/jian/rev1/config.h
index 3e8f0eed02..4b32d8fc0b 100644
--- a/keyboards/jian/rev1/config.h
+++ b/keyboards/jian/rev1/config.h
@@ -17,12 +17,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#pragma once
-#include "config_common.h"
-/* key matrix size */
-// Rows are doubled-up
-#define MATRIX_ROWS 8
-#define MATRIX_COLS 7
#define DIODE_DIRECTION COL2ROW
// wiring of each half
@@ -83,14 +78,9 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define UPDATE_SCROLL_LOCK_LED() writePin(SCROLL_LOCK_LED_PIN, !led_state.scroll_lock)
#endif // SCROLL_NMOSFET
-/* Set 0 if debouncing isn't needed */
-#define DEBOUNCE 5
-
#ifdef BACKLIGHT_ENABLE
#define BACKLIGHT_PIN B6
#define BACKLIGHT_LEVELS 5
-//#define BACKLIGHT_BREATHING //not working with splits right now
-#define BREATHING_PERIOD 6
#endif
/* ws2812 RGB LED */
diff --git a/keyboards/jian/rev1/info.json b/keyboards/jian/rev1/info.json
index 32540b3f78..bcd7c88d69 100644
--- a/keyboards/jian/rev1/info.json
+++ b/keyboards/jian/rev1/info.json
@@ -2,5 +2,7 @@
"keyboard_name": "Jian",
"usb": {
"device_version": "1.0.0"
- }
+ },
+ "processor": "atmega32u4",
+ "bootloader": "caterina"
}
diff --git a/keyboards/jian/rev1/rules.mk b/keyboards/jian/rev1/rules.mk
index cce01f50c3..8e6da2d84f 100644
--- a/keyboards/jian/rev1/rules.mk
+++ b/keyboards/jian/rev1/rules.mk
@@ -1,9 +1,3 @@
-# MCU name
-MCU = atmega32u4
-
-# Bootloader selection
-BOOTLOADER = caterina
-
# Build Options
# change yes to no to disable
#
diff --git a/keyboards/jian/rev2/config.h b/keyboards/jian/rev2/config.h
index c142100610..061e1185cf 100644
--- a/keyboards/jian/rev2/config.h
+++ b/keyboards/jian/rev2/config.h
@@ -17,37 +17,22 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#pragma once
-#include "config_common.h"
-/* key matrix size */
-// Rows are doubled-up
-#define MATRIX_ROWS 8
-#define MATRIX_COLS 6
#define DIODE_DIRECTION COL2ROW
// wiring of each half
#define MATRIX_ROW_PINS { F4, F5, B1, B3 }
#define MATRIX_COL_PINS { D3, D2, B4, F6, F7, B2 }
-#define SOFT_SERIAL_PIN D1
-
//#define EE_HANDS
#define SPLIT_HAND_PIN E6
-/* Set 0 if debouncing isn't needed */
-#define DEBOUNCE 5
-
-#define QMK_ESC_OUTPUT D3
-#define QMK_ESC_INPUT B1
-
#define PHYSICAL_LEDS_ENABLE
#define IOS_DEVICE_ENABLE
#ifdef BACKLIGHT_ENABLE
#define BACKLIGHT_PIN C6
#define BACKLIGHT_LEVELS 5
-// #define BACKLIGHT_BREATHING //not working with splits right now
-#define BREATHING_PERIOD 6
#endif
/* ws2812 RGB LED */
diff --git a/keyboards/jian/rev2/info.json b/keyboards/jian/rev2/info.json
index db130bf467..0e87ca3bb6 100644
--- a/keyboards/jian/rev2/info.json
+++ b/keyboards/jian/rev2/info.json
@@ -2,5 +2,14 @@
"keyboard_name": "Jian",
"usb": {
"device_version": "2.0.0"
- }
+ },
+ "qmk_lufa_bootloader": {
+ "esc_input": "B1",
+ "esc_output": "D3"
+ },
+ "split": {
+ "soft_serial_pin": "D1"
+ },
+ "processor": "atmega32u4",
+ "bootloader": "qmk-dfu"
}
diff --git a/keyboards/jian/rev2/rules.mk b/keyboards/jian/rev2/rules.mk
index fa43614a06..8e6da2d84f 100644
--- a/keyboards/jian/rev2/rules.mk
+++ b/keyboards/jian/rev2/rules.mk
@@ -1,9 +1,3 @@
-# MCU name
-MCU = atmega32u4
-
-# Bootloader selection
-BOOTLOADER = qmk-dfu
-
# Build Options
# change yes to no to disable
#
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-11 19:40:49 +0000