aboutsummaryrefslogtreecommitdiff
path: root/keyboards/nullbitsco
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/nullbitsco')
-rw-r--r--keyboards/nullbitsco/common/bitc_led.h3
-rw-r--r--keyboards/nullbitsco/common/remote_kb.c3
-rw-r--r--keyboards/nullbitsco/common/remote_kb.h3
-rw-r--r--keyboards/nullbitsco/nibble/big_led.h3
-rw-r--r--keyboards/nullbitsco/nibble/keyboard.json (renamed from keyboards/nullbitsco/nibble/info.json)11
-rw-r--r--keyboards/nullbitsco/nibble/keymaps/oled_status/oled_display.c9
-rw-r--r--keyboards/nullbitsco/nibble/keymaps/oled_status/oled_display.h2
-rw-r--r--keyboards/nullbitsco/nibble/matrix.c3
-rw-r--r--keyboards/nullbitsco/nibble/rules.mk19
-rw-r--r--keyboards/nullbitsco/scramble/rules.mk3
-rw-r--r--keyboards/nullbitsco/scramble/v1/keyboard.json (renamed from keyboards/nullbitsco/scramble/v1/info.json)7
-rw-r--r--keyboards/nullbitsco/scramble/v1/rules.mk13
-rw-r--r--keyboards/nullbitsco/scramble/v2/keyboard.json (renamed from keyboards/nullbitsco/scramble/v2/info.json)7
-rw-r--r--keyboards/nullbitsco/scramble/v2/rules.mk13
-rw-r--r--keyboards/nullbitsco/snap/keyboard.json (renamed from keyboards/nullbitsco/snap/info.json)13
-rw-r--r--keyboards/nullbitsco/snap/matrix.c7
-rw-r--r--keyboards/nullbitsco/snap/rules.mk21
-rw-r--r--keyboards/nullbitsco/tidbit/keyboard.json (renamed from keyboards/nullbitsco/tidbit/info.json)11
-rw-r--r--keyboards/nullbitsco/tidbit/rules.mk15
19 files changed, 78 insertions, 88 deletions
diff --git a/keyboards/nullbitsco/common/bitc_led.h b/keyboards/nullbitsco/common/bitc_led.h
index 14cd4f15b7..c649f1c1dd 100644
--- a/keyboards/nullbitsco/common/bitc_led.h
+++ b/keyboards/nullbitsco/common/bitc_led.h
@@ -15,7 +15,8 @@
*/
#pragma once
-#include "quantum.h"
+#include <stdint.h>
+#include "gpio.h"
#define LED_ON 2
#define LED_DIM 1
diff --git a/keyboards/nullbitsco/common/remote_kb.c b/keyboards/nullbitsco/common/remote_kb.c
index 8e3f7f6766..bd2b396e6b 100644
--- a/keyboards/nullbitsco/common/remote_kb.c
+++ b/keyboards/nullbitsco/common/remote_kb.c
@@ -27,7 +27,10 @@ This will require a new communication protocol, as the current one is limited.
*/
#include "remote_kb.h"
+#include "quantum.h"
#include "uart.h"
+#include "wait.h"
+#include "debug.h"
uint8_t
msg[UART_MSG_LEN],
diff --git a/keyboards/nullbitsco/common/remote_kb.h b/keyboards/nullbitsco/common/remote_kb.h
index da124bf5f4..97d299189d 100644
--- a/keyboards/nullbitsco/common/remote_kb.h
+++ b/keyboards/nullbitsco/common/remote_kb.h
@@ -15,7 +15,8 @@
*/
#pragma once
-#include "quantum.h"
+#include <stdint.h>
+#include "action.h"
#define SERIAL_UART_BAUD 76800 //low error rate for 32u4 @ 16MHz
diff --git a/keyboards/nullbitsco/nibble/big_led.h b/keyboards/nullbitsco/nibble/big_led.h
index 4ebcc35f08..1198d3490b 100644
--- a/keyboards/nullbitsco/nibble/big_led.h
+++ b/keyboards/nullbitsco/nibble/big_led.h
@@ -15,7 +15,8 @@
*/
#pragma once
-#include "quantum.h"
+#include <stdint.h>
+#include "gpio.h"
/* Optional big LED pins */
#define BIG_LED_R_PIN D7
diff --git a/keyboards/nullbitsco/nibble/info.json b/keyboards/nullbitsco/nibble/keyboard.json
index 159e501218..fb1c8098a0 100644
--- a/keyboards/nullbitsco/nibble/info.json
+++ b/keyboards/nullbitsco/nibble/keyboard.json
@@ -7,6 +7,17 @@
"pid": "0x6060",
"device_version": "0.0.1"
},
+ "build": {
+ "lto": true
+ },
+ "features": {
+ "bootmagic": false,
+ "encoder": true,
+ "extrakey": true,
+ "mousekey": false,
+ "nkro": true,
+ "rgblight": true
+ },
"encoder": {
"rotary": [
{"pin_a": "B5", "pin_b": "B4"}
diff --git a/keyboards/nullbitsco/nibble/keymaps/oled_status/oled_display.c b/keyboards/nullbitsco/nibble/keymaps/oled_status/oled_display.c
index c734e80cef..11a0e1f11e 100644
--- a/keyboards/nullbitsco/nibble/keymaps/oled_status/oled_display.c
+++ b/keyboards/nullbitsco/nibble/keymaps/oled_status/oled_display.c
@@ -13,8 +13,15 @@
* 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 "quantum.h"
+
#include "oled_display.h"
+#include "keycodes.h"
+#include "progmem.h"
+#include "host.h"
+#include "timer.h"
+#include "wpm.h"
+#include "rgblight.h"
+#include "oled_driver.h"
static const char PROGMEM oled_mode_messages[5][15] = {
"",
diff --git a/keyboards/nullbitsco/nibble/keymaps/oled_status/oled_display.h b/keyboards/nullbitsco/nibble/keymaps/oled_status/oled_display.h
index bd59d44b41..7f2b5e1e77 100644
--- a/keyboards/nullbitsco/nibble/keymaps/oled_status/oled_display.h
+++ b/keyboards/nullbitsco/nibble/keymaps/oled_status/oled_display.h
@@ -15,6 +15,8 @@
*/
#pragma once
+#include <stdint.h>
+
typedef enum {
OLED_MODE_IDLE = 0,
OLED_MODE_VOLUME_UP = 1,
diff --git a/keyboards/nullbitsco/nibble/matrix.c b/keyboards/nullbitsco/nibble/matrix.c
index 496c5dbe32..6508b704e9 100644
--- a/keyboards/nullbitsco/nibble/matrix.c
+++ b/keyboards/nullbitsco/nibble/matrix.c
@@ -13,7 +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 "quantum.h"
+#include "matrix.h"
+#include "wait.h"
#define COL_SHIFTER ((uint32_t)1)
diff --git a/keyboards/nullbitsco/nibble/rules.mk b/keyboards/nullbitsco/nibble/rules.mk
index 5a1714cc9d..ad36b7fcc9 100644
--- a/keyboards/nullbitsco/nibble/rules.mk
+++ b/keyboards/nullbitsco/nibble/rules.mk
@@ -1,22 +1,9 @@
-# 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 = 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
-ENCODER_ENABLE = yes # Use rotary encoder
-LTO_ENABLE = yes # Link-time optimization
-CUSTOM_MATRIX = lite # Lite custom matrix
+CUSTOM_MATRIX = lite
+
+UART_DRIVER_REQUIRED = yes
# Project specific files
SRC += matrix.c \
common/bitc_led.c \
big_led.c \
common/remote_kb.c
-UART_DRIVER_REQUIRED = yes
diff --git a/keyboards/nullbitsco/scramble/rules.mk b/keyboards/nullbitsco/scramble/rules.mk
index 6f83796e9f..5753f7786d 100644
--- a/keyboards/nullbitsco/scramble/rules.mk
+++ b/keyboards/nullbitsco/scramble/rules.mk
@@ -1,4 +1 @@
-# NOTE: This file is shared and only exists to set the default build
-# The real build rules are set in the v1/v2 directories
-
DEFAULT_FOLDER = nullbitsco/scramble/v2
diff --git a/keyboards/nullbitsco/scramble/v1/info.json b/keyboards/nullbitsco/scramble/v1/keyboard.json
index 5a9aeef64b..145f4f389c 100644
--- a/keyboards/nullbitsco/scramble/v1/info.json
+++ b/keyboards/nullbitsco/scramble/v1/keyboard.json
@@ -1,4 +1,11 @@
{
+ "features": {
+ "bootmagic": false,
+ "encoder": true,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": false
+ },
"encoder": {
"rotary": [
{"pin_a": "D6", "pin_b": "D7"}
diff --git a/keyboards/nullbitsco/scramble/v1/rules.mk b/keyboards/nullbitsco/scramble/v1/rules.mk
deleted file mode 100644
index f917d68f4e..0000000000
--- a/keyboards/nullbitsco/scramble/v1/rules.mk
+++ /dev/null
@@ -1,13 +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 = no # Enable keyboard RGB underglow
-AUDIO_ENABLE = no # Audio output
-ENCODER_ENABLE = yes # Use rotary encoder
diff --git a/keyboards/nullbitsco/scramble/v2/info.json b/keyboards/nullbitsco/scramble/v2/keyboard.json
index 2a89a1063b..a55e878741 100644
--- a/keyboards/nullbitsco/scramble/v2/info.json
+++ b/keyboards/nullbitsco/scramble/v2/keyboard.json
@@ -1,4 +1,11 @@
{
+ "features": {
+ "bootmagic": false,
+ "encoder": true,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": false
+ },
"encoder": {
"rotary": [
{"pin_a": "GP24", "pin_b": "GP25"}
diff --git a/keyboards/nullbitsco/scramble/v2/rules.mk b/keyboards/nullbitsco/scramble/v2/rules.mk
deleted file mode 100644
index f917d68f4e..0000000000
--- a/keyboards/nullbitsco/scramble/v2/rules.mk
+++ /dev/null
@@ -1,13 +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 = no # Enable keyboard RGB underglow
-AUDIO_ENABLE = no # Audio output
-ENCODER_ENABLE = yes # Use rotary encoder
diff --git a/keyboards/nullbitsco/snap/info.json b/keyboards/nullbitsco/snap/keyboard.json
index 65cd463708..139bbf5b45 100644
--- a/keyboards/nullbitsco/snap/info.json
+++ b/keyboards/nullbitsco/snap/keyboard.json
@@ -7,6 +7,18 @@
"pid": "0x6063",
"device_version": "0.0.1"
},
+ "build": {
+ "lto": true
+ },
+ "features": {
+ "bootmagic": false,
+ "encoder": true,
+ "extrakey": true,
+ "mousekey": false,
+ "nkro": false,
+ "rgblight": true,
+ "space_cadet": false
+ },
"encoder": {
"rotary": [
{"pin_a": "B3", "pin_b": "B1"}
@@ -31,6 +43,7 @@
}
},
"split": {
+ "enabled": true,
"encoder": {
"right": {
"rotary": [
diff --git a/keyboards/nullbitsco/snap/matrix.c b/keyboards/nullbitsco/snap/matrix.c
index ceb9cd8984..3cd3f5c37e 100644
--- a/keyboards/nullbitsco/snap/matrix.c
+++ b/keyboards/nullbitsco/snap/matrix.c
@@ -13,13 +13,10 @@
* 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 <string.h>
-#include "util.h"
#include "matrix.h"
+#include <string.h>
#include "split_util.h"
-#include "quantum.h"
+#include "wait.h"
#define VIRT_COLS_PER_HAND 1
#define PHYS_COLS_PER_HAND (MATRIX_COLS - VIRT_COLS_PER_HAND)
diff --git a/keyboards/nullbitsco/snap/rules.mk b/keyboards/nullbitsco/snap/rules.mk
index 2ad88b97c0..1603cb408c 100644
--- a/keyboards/nullbitsco/snap/rules.mk
+++ b/keyboards/nullbitsco/snap/rules.mk
@@ -1,23 +1,8 @@
-# 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 = 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 # Split common
-LTO_ENABLE = yes # Use Link Time Optimization
-ENCODER_ENABLE = yes # Enables the use of one or more encoders
-SPACE_CADET_ENABLE = no # Enables the use of Space Cadet
-RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow
-CUSTOM_MATRIX = lite # Split custom matrix
+CUSTOM_MATRIX = lite
+
+UART_DRIVER_REQUIRED = yes
# Project specific files
SRC += common/bitc_led.c \
common/remote_kb.c \
matrix.c
-UART_DRIVER_REQUIRED = yes
diff --git a/keyboards/nullbitsco/tidbit/info.json b/keyboards/nullbitsco/tidbit/keyboard.json
index b8eaf60d89..83593ad523 100644
--- a/keyboards/nullbitsco/tidbit/info.json
+++ b/keyboards/nullbitsco/tidbit/keyboard.json
@@ -7,6 +7,17 @@
"pid": "0x6064",
"device_version": "0.0.1"
},
+ "build": {
+ "lto": true
+ },
+ "features": {
+ "bootmagic": false,
+ "encoder": true,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": false,
+ "rgblight": true
+ },
"rgblight": {
"led_count": 8,
"animations": {
diff --git a/keyboards/nullbitsco/tidbit/rules.mk b/keyboards/nullbitsco/tidbit/rules.mk
index b4a06216bb..9cc22114ae 100644
--- a/keyboards/nullbitsco/tidbit/rules.mk
+++ b/keyboards/nullbitsco/tidbit/rules.mk
@@ -1,18 +1,3 @@
-# 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
-ENCODER_ENABLE = yes
-LTO_ENABLE = yes
-
# Project specific files
SRC += common/bitc_led.c \
common/remote_kb.c