aboutsummaryrefslogtreecommitdiff
path: root/keyboards/novelkeys
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/novelkeys')
-rwxr-xr-xkeyboards/novelkeys/nk1/keyboard.json (renamed from keyboards/novelkeys/nk1/info.json)9
-rw-r--r--keyboards/novelkeys/nk1/rules.mk12
-rw-r--r--keyboards/novelkeys/nk20/config.h4
-rw-r--r--keyboards/novelkeys/nk20/keyboard.json (renamed from keyboards/novelkeys/nk20/info.json)7
-rw-r--r--keyboards/novelkeys/nk20/rules.mk14
-rw-r--r--keyboards/novelkeys/nk65/base/keyboard.json (renamed from keyboards/novelkeys/nk65/base/info.json)0
-rw-r--r--keyboards/novelkeys/nk65/base/rules.mk0
-rwxr-xr-xkeyboards/novelkeys/nk65/info.json6
-rwxr-xr-xkeyboards/novelkeys/nk65/rules.mk17
-rw-r--r--keyboards/novelkeys/nk65/v1_4/keyboard.json (renamed from keyboards/novelkeys/nk65/v1_4/info.json)0
-rwxr-xr-xkeyboards/novelkeys/nk65/v1_4/rules.mk1
-rwxr-xr-xkeyboards/novelkeys/nk65b/config.h4
-rwxr-xr-xkeyboards/novelkeys/nk65b/keyboard.json (renamed from keyboards/novelkeys/nk65b/info.json)7
-rwxr-xr-xkeyboards/novelkeys/nk65b/nk65b.c4
-rw-r--r--keyboards/novelkeys/nk65b/rules.mk14
-rwxr-xr-xkeyboards/novelkeys/nk87/keyboard.json (renamed from keyboards/novelkeys/nk87/info.json)6
-rwxr-xr-xkeyboards/novelkeys/nk87/rules.mk17
-rw-r--r--keyboards/novelkeys/nk87b/config.h4
-rwxr-xr-xkeyboards/novelkeys/nk87b/keyboard.json (renamed from keyboards/novelkeys/nk87b/info.json)7
-rw-r--r--keyboards/novelkeys/nk87b/nk87b.c4
-rw-r--r--keyboards/novelkeys/nk87b/rules.mk14
-rwxr-xr-xkeyboards/novelkeys/nk_classic_tkl/keyboard.json (renamed from keyboards/novelkeys/nk_classic_tkl/info.json)0
-rw-r--r--keyboards/novelkeys/nk_plus/config.h4
-rwxr-xr-xkeyboards/novelkeys/nk_plus/keyboard.json (renamed from keyboards/novelkeys/nk_plus/info.json)4
-rw-r--r--keyboards/novelkeys/novelpad/keyboard.json (renamed from keyboards/novelkeys/novelpad/info.json)10
-rwxr-xr-xkeyboards/novelkeys/novelpad/rules.mk12
-rwxr-xr-xkeyboards/novelkeys/skelett60/keyboard.json (renamed from keyboards/novelkeys/skelett60/info.json)0
-rw-r--r--keyboards/novelkeys/skelett60/rules.mk1
28 files changed, 69 insertions, 113 deletions
diff --git a/keyboards/novelkeys/nk1/info.json b/keyboards/novelkeys/nk1/keyboard.json
index 480bc968c2..0fa15cf9f2 100755
--- a/keyboards/novelkeys/nk1/info.json
+++ b/keyboards/novelkeys/nk1/keyboard.json
@@ -31,6 +31,15 @@
},
"processor": "atmega32u4",
"bootloader": "atmel-dfu",
+ "features": {
+ "bootmagic": true,
+ "command": false,
+ "console": false,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": true,
+ "rgblight": true
+ },
"matrix_pins": {
"direct": [
["D4"]
diff --git a/keyboards/novelkeys/nk1/rules.mk b/keyboards/novelkeys/nk1/rules.mk
deleted file mode 100644
index b851d0ab39..0000000000
--- a/keyboards/novelkeys/nk1/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 = no # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow
-AUDIO_ENABLE = no # Audio output
diff --git a/keyboards/novelkeys/nk20/config.h b/keyboards/novelkeys/nk20/config.h
index 317cc2c3e8..750a033568 100644
--- a/keyboards/novelkeys/nk20/config.h
+++ b/keyboards/novelkeys/nk20/config.h
@@ -20,5 +20,5 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define WS2812_PWM_DRIVER PWMD3
#define WS2812_PWM_CHANNEL 2
#define WS2812_PWM_PAL_MODE 1
-#define WS2812_DMA_STREAM STM32_DMA1_STREAM3
-#define WS2812_DMA_CHANNEL 3
+#define WS2812_PWM_DMA_STREAM STM32_DMA1_STREAM3
+#define WS2812_PWM_DMA_CHANNEL 3
diff --git a/keyboards/novelkeys/nk20/info.json b/keyboards/novelkeys/nk20/keyboard.json
index 6d25ca4c21..f2728967b4 100644
--- a/keyboards/novelkeys/nk20/info.json
+++ b/keyboards/novelkeys/nk20/keyboard.json
@@ -8,6 +8,13 @@
"pid": "0x4E4E",
"device_version": "0.0.1"
},
+ "features": {
+ "bootmagic": true,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": true,
+ "rgb_matrix": true
+ },
"ws2812": {
"pin": "A7",
"driver": "pwm"
diff --git a/keyboards/novelkeys/nk20/rules.mk b/keyboards/novelkeys/nk20/rules.mk
index 9470fce1ba..0ab54aaaf7 100644
--- a/keyboards/novelkeys/nk20/rules.mk
+++ b/keyboards/novelkeys/nk20/rules.mk
@@ -1,16 +1,2 @@
# Wildcard to allow APM32 MCU
DFU_SUFFIX_ARGS = -v FFFF -p FFFF
-
-# 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 = no # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
-AUDIO_ENABLE = no # Audio output
-RGB_MATRIX_ENABLE = yes # Enable Per-key RGB
diff --git a/keyboards/novelkeys/nk65/base/info.json b/keyboards/novelkeys/nk65/base/keyboard.json
index fc547dc134..fc547dc134 100644
--- a/keyboards/novelkeys/nk65/base/info.json
+++ b/keyboards/novelkeys/nk65/base/keyboard.json
diff --git a/keyboards/novelkeys/nk65/base/rules.mk b/keyboards/novelkeys/nk65/base/rules.mk
deleted file mode 100644
index e69de29bb2..0000000000
--- a/keyboards/novelkeys/nk65/base/rules.mk
+++ /dev/null
diff --git a/keyboards/novelkeys/nk65/info.json b/keyboards/novelkeys/nk65/info.json
index 59187f9ef8..e3bff19346 100755
--- a/keyboards/novelkeys/nk65/info.json
+++ b/keyboards/novelkeys/nk65/info.json
@@ -8,6 +8,12 @@
"pid": "0x4E4B",
"device_version": "0.0.1"
},
+ "features": {
+ "bootmagic": true,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": true
+ },
"processor": "STM32F303",
"bootloader": "stm32-dfu",
"board": "QMK_PROTON_C",
diff --git a/keyboards/novelkeys/nk65/rules.mk b/keyboards/novelkeys/nk65/rules.mk
index d71d9a6c4e..c0d789a5a6 100755
--- a/keyboards/novelkeys/nk65/rules.mk
+++ b/keyboards/novelkeys/nk65/rules.mk
@@ -1,28 +1,15 @@
# Do not put the microcontroller into power saving mode
# when we get USB suspend event. We want it to keep updating
# backlight effects.
-OPT_DEFS += -DNO_SUSPEND_POWER_DOWN
-
-# Build Options
-# change yes to no to disable
-#
-BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
-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
-AUDIO_ENABLE = no # Audio output
-NO_USB_STARTUP_CHECK = no # Disable initialization only when usb is plugged in
+NO_SUSPEND_POWER_DOWN = yes
CIE1931_CURVE = yes
+I2C_DRIVER_REQUIRED = yes
# project specific files
SRC = keyboards/wilba_tech/wt_main.c \
keyboards/wilba_tech/wt_rgb_backlight.c \
drivers/led/issi/is31fl3733.c \
quantum/color.c
-I2C_DRIVER_REQUIRED = yes
DEFAULT_FOLDER = novelkeys/nk65/base
diff --git a/keyboards/novelkeys/nk65/v1_4/info.json b/keyboards/novelkeys/nk65/v1_4/keyboard.json
index 3233797019..3233797019 100644
--- a/keyboards/novelkeys/nk65/v1_4/info.json
+++ b/keyboards/novelkeys/nk65/v1_4/keyboard.json
diff --git a/keyboards/novelkeys/nk65/v1_4/rules.mk b/keyboards/novelkeys/nk65/v1_4/rules.mk
deleted file mode 100755
index 8b13789179..0000000000
--- a/keyboards/novelkeys/nk65/v1_4/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/keyboards/novelkeys/nk65b/config.h b/keyboards/novelkeys/nk65b/config.h
index 40e3b54053..eaddb87b82 100755
--- a/keyboards/novelkeys/nk65b/config.h
+++ b/keyboards/novelkeys/nk65b/config.h
@@ -20,5 +20,5 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define WS2812_PWM_DRIVER PWMD3
#define WS2812_PWM_CHANNEL 1
#define WS2812_PWM_PAL_MODE 1
-#define WS2812_DMA_STREAM STM32_DMA1_STREAM3
-#define WS2812_DMA_CHANNEL 3
+#define WS2812_PWM_DMA_STREAM STM32_DMA1_STREAM3
+#define WS2812_PWM_DMA_CHANNEL 3
diff --git a/keyboards/novelkeys/nk65b/info.json b/keyboards/novelkeys/nk65b/keyboard.json
index 8e6e01fe46..0c2794c120 100755
--- a/keyboards/novelkeys/nk65b/info.json
+++ b/keyboards/novelkeys/nk65b/keyboard.json
@@ -8,6 +8,13 @@
"pid": "0x4E4F",
"device_version": "0.0.1"
},
+ "features": {
+ "bootmagic": true,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": true,
+ "rgb_matrix": true
+ },
"ws2812": {
"pin": "B4",
"driver": "pwm"
diff --git a/keyboards/novelkeys/nk65b/nk65b.c b/keyboards/novelkeys/nk65b/nk65b.c
index 370814aabd..369bab262f 100755
--- a/keyboards/novelkeys/nk65b/nk65b.c
+++ b/keyboards/novelkeys/nk65b/nk65b.c
@@ -24,8 +24,8 @@ void led_init_ports(void) {
}
layer_state_t layer_state_set_kb(layer_state_t state) {
- writePin(A15, !layer_state_cmp(state, 1));
- writePin(B3, !layer_state_cmp(state, 2));
+ gpio_write_pin(A15, !layer_state_cmp(state, 1));
+ gpio_write_pin(B3, !layer_state_cmp(state, 2));
return layer_state_set_user(state);
}
diff --git a/keyboards/novelkeys/nk65b/rules.mk b/keyboards/novelkeys/nk65b/rules.mk
index 9470fce1ba..0ab54aaaf7 100644
--- a/keyboards/novelkeys/nk65b/rules.mk
+++ b/keyboards/novelkeys/nk65b/rules.mk
@@ -1,16 +1,2 @@
# Wildcard to allow APM32 MCU
DFU_SUFFIX_ARGS = -v FFFF -p FFFF
-
-# 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 = no # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
-AUDIO_ENABLE = no # Audio output
-RGB_MATRIX_ENABLE = yes # Enable Per-key RGB
diff --git a/keyboards/novelkeys/nk87/info.json b/keyboards/novelkeys/nk87/keyboard.json
index 6170895405..9573ff4c9c 100755
--- a/keyboards/novelkeys/nk87/info.json
+++ b/keyboards/novelkeys/nk87/keyboard.json
@@ -8,6 +8,12 @@
"pid": "0x4E4C",
"device_version": "0.0.1"
},
+ "features": {
+ "bootmagic": true,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": true
+ },
"matrix_pins": {
"cols": ["A13", "A10", "A9", "A14", "A15", "B8", "B9", "B2", "B0", "A6", "A0", "A1", "A2", "A3", "A5", "B1", "B10"],
"rows": ["A7", "B3", "B4", "B5", "A8", "A4"]
diff --git a/keyboards/novelkeys/nk87/rules.mk b/keyboards/novelkeys/nk87/rules.mk
index a0a09c1dab..3b7a32713c 100755
--- a/keyboards/novelkeys/nk87/rules.mk
+++ b/keyboards/novelkeys/nk87/rules.mk
@@ -1,26 +1,13 @@
# Do not put the microcontroller into power saving mode
# when we get USB suspend event. We want it to keep updating
# backlight effects.
-OPT_DEFS += -DNO_SUSPEND_POWER_DOWN
-
-# 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 = no # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
-AUDIO_ENABLE = no # Audio output
+NO_SUSPEND_POWER_DOWN = yes
CIE1931_CURVE = yes
+I2C_DRIVER_REQUIRED = yes
# project specific files
SRC = keyboards/wilba_tech/wt_main.c \
keyboards/wilba_tech/wt_rgb_backlight.c \
drivers/led/issi/is31fl3733.c \
quantum/color.c
-I2C_DRIVER_REQUIRED = yes
diff --git a/keyboards/novelkeys/nk87b/config.h b/keyboards/novelkeys/nk87b/config.h
index a79137e7d9..933d4ed5c0 100644
--- a/keyboards/novelkeys/nk87b/config.h
+++ b/keyboards/novelkeys/nk87b/config.h
@@ -20,5 +20,5 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define WS2812_PWM_DRIVER PWMD3
#define WS2812_PWM_CHANNEL 3
#define WS2812_PWM_PAL_MODE 1
-#define WS2812_DMA_STREAM STM32_DMA1_STREAM3
-#define WS2812_DMA_CHANNEL 3
+#define WS2812_PWM_DMA_STREAM STM32_DMA1_STREAM3
+#define WS2812_PWM_DMA_CHANNEL 3
diff --git a/keyboards/novelkeys/nk87b/info.json b/keyboards/novelkeys/nk87b/keyboard.json
index cbcc8e2e18..f81793acee 100755
--- a/keyboards/novelkeys/nk87b/info.json
+++ b/keyboards/novelkeys/nk87b/keyboard.json
@@ -8,6 +8,13 @@
"pid": "0x4E50",
"device_version": "0.0.1"
},
+ "features": {
+ "bootmagic": true,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": true,
+ "rgb_matrix": true
+ },
"ws2812": {
"pin": "B0",
"driver": "pwm"
diff --git a/keyboards/novelkeys/nk87b/nk87b.c b/keyboards/novelkeys/nk87b/nk87b.c
index a0686d5b09..125b5d7404 100644
--- a/keyboards/novelkeys/nk87b/nk87b.c
+++ b/keyboards/novelkeys/nk87b/nk87b.c
@@ -25,8 +25,8 @@ void led_init_ports(void) {
}
layer_state_t layer_state_set_kb(layer_state_t state) {
- writePin(A3, !layer_state_cmp(state, 1));
- writePin(A4, !layer_state_cmp(state, 2));
+ gpio_write_pin(A3, !layer_state_cmp(state, 1));
+ gpio_write_pin(A4, !layer_state_cmp(state, 2));
return layer_state_set_user(state);
}
diff --git a/keyboards/novelkeys/nk87b/rules.mk b/keyboards/novelkeys/nk87b/rules.mk
index 9470fce1ba..0ab54aaaf7 100644
--- a/keyboards/novelkeys/nk87b/rules.mk
+++ b/keyboards/novelkeys/nk87b/rules.mk
@@ -1,16 +1,2 @@
# Wildcard to allow APM32 MCU
DFU_SUFFIX_ARGS = -v FFFF -p FFFF
-
-# 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 = no # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
-AUDIO_ENABLE = no # Audio output
-RGB_MATRIX_ENABLE = yes # Enable Per-key RGB
diff --git a/keyboards/novelkeys/nk_classic_tkl/info.json b/keyboards/novelkeys/nk_classic_tkl/keyboard.json
index 53d10ce32a..53d10ce32a 100755
--- a/keyboards/novelkeys/nk_classic_tkl/info.json
+++ b/keyboards/novelkeys/nk_classic_tkl/keyboard.json
diff --git a/keyboards/novelkeys/nk_plus/config.h b/keyboards/novelkeys/nk_plus/config.h
index 40e3b54053..eaddb87b82 100644
--- a/keyboards/novelkeys/nk_plus/config.h
+++ b/keyboards/novelkeys/nk_plus/config.h
@@ -20,5 +20,5 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define WS2812_PWM_DRIVER PWMD3
#define WS2812_PWM_CHANNEL 1
#define WS2812_PWM_PAL_MODE 1
-#define WS2812_DMA_STREAM STM32_DMA1_STREAM3
-#define WS2812_DMA_CHANNEL 3
+#define WS2812_PWM_DMA_STREAM STM32_DMA1_STREAM3
+#define WS2812_PWM_DMA_CHANNEL 3
diff --git a/keyboards/novelkeys/nk_plus/info.json b/keyboards/novelkeys/nk_plus/keyboard.json
index 41beca3682..b823d2808b 100755
--- a/keyboards/novelkeys/nk_plus/info.json
+++ b/keyboards/novelkeys/nk_plus/keyboard.json
@@ -14,15 +14,13 @@
"rows": ["B2", "B1", "B0", "B10", "B3"]
},
"features": {
- "backlight": false,
"bootmagic": true,
"command": false,
"console": false,
"extrakey": true,
"mousekey": true,
"nkro": true,
- "rgb_matrix": true,
- "rgblight": false
+ "rgb_matrix": true
},
"processor": "STM32F072",
"bootloader": "stm32-dfu",
diff --git a/keyboards/novelkeys/novelpad/info.json b/keyboards/novelkeys/novelpad/keyboard.json
index 1e5f6b4f73..03c76764df 100644
--- a/keyboards/novelkeys/novelpad/info.json
+++ b/keyboards/novelkeys/novelpad/keyboard.json
@@ -8,6 +8,16 @@
"pid": "0x6070",
"device_version": "0.0.1"
},
+ "features": {
+ "backlight": true,
+ "bootmagic": false,
+ "command": false,
+ "console": true,
+ "extrakey": true,
+ "mousekey": false,
+ "nkro": false,
+ "rgblight": true
+ },
"matrix_pins": {
"cols": ["D7", "D6", "D5", "D4"],
"rows": ["C2", "C4", "C5", "C6", "C7"]
diff --git a/keyboards/novelkeys/novelpad/rules.mk b/keyboards/novelkeys/novelpad/rules.mk
deleted file mode 100755
index 40888f5a30..0000000000
--- a/keyboards/novelkeys/novelpad/rules.mk
+++ /dev/null
@@ -1,12 +0,0 @@
-# Build Options
-# change yes to no to disable
-#
-BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no # Mouse keys
-EXTRAKEY_ENABLE = yes # Audio control and System control
-CONSOLE_ENABLE = yes # Console for debug
-COMMAND_ENABLE = no # Commands for debug and configuration
-NKRO_ENABLE = no # Enable N-Key Rollover
-BACKLIGHT_ENABLE = yes # In-switch LEDs
-AUDIO_ENABLE = no # There is no available timer or pin for audio on the NovelPad
-RGBLIGHT_ENABLE = yes # RGB LEDs for underglow, installed and enabled by default for the NovelPad
diff --git a/keyboards/novelkeys/skelett60/info.json b/keyboards/novelkeys/skelett60/keyboard.json
index 1a8f988b01..1a8f988b01 100755
--- a/keyboards/novelkeys/skelett60/info.json
+++ b/keyboards/novelkeys/skelett60/keyboard.json
diff --git a/keyboards/novelkeys/skelett60/rules.mk b/keyboards/novelkeys/skelett60/rules.mk
index 6dd24d8e06..0ab54aaaf7 100644
--- a/keyboards/novelkeys/skelett60/rules.mk
+++ b/keyboards/novelkeys/skelett60/rules.mk
@@ -1,3 +1,2 @@
# Wildcard to allow APM32 MCU
DFU_SUFFIX_ARGS = -v FFFF -p FFFF
-