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/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/rules.mk1
-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
-rw-r--r--keyboards/novelkeys/nk87b/config.h4
-rw-r--r--keyboards/novelkeys/nk_plus/config.h4
-rwxr-xr-xkeyboards/novelkeys/nk_plus/info.json4
-rw-r--r--keyboards/novelkeys/novelpad/keyboard.json (renamed from keyboards/novelkeys/novelpad/info.json)10
-rwxr-xr-xkeyboards/novelkeys/novelpad/rules.mk12
14 files changed, 28 insertions, 37 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/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/rules.mk b/keyboards/novelkeys/nk65/rules.mk
index d71d9a6c4e..5827e557b9 100755
--- a/keyboards/novelkeys/nk65/rules.mk
+++ b/keyboards/novelkeys/nk65/rules.mk
@@ -14,7 +14,6 @@ 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
CIE1931_CURVE = yes
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/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/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/info.json
index 41beca3682..b823d2808b 100755
--- a/keyboards/novelkeys/nk_plus/info.json
+++ b/keyboards/novelkeys/nk_plus/info.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