diff options
Diffstat (limited to 'keyboards/nullbitsco')
-rw-r--r-- | keyboards/nullbitsco/nibble/config.h | 4 | ||||
-rw-r--r-- | keyboards/nullbitsco/nibble/info.json | 3 | ||||
-rw-r--r-- | keyboards/nullbitsco/nibble/rules.mk | 6 | ||||
-rw-r--r-- | keyboards/nullbitsco/scramble/info.json | 1 | ||||
-rw-r--r-- | keyboards/nullbitsco/scramble/v1/config.h | 4 | ||||
-rw-r--r-- | keyboards/nullbitsco/scramble/v1/info.json | 4 | ||||
-rw-r--r-- | keyboards/nullbitsco/scramble/v1/rules.mk | 8 | ||||
-rw-r--r-- | keyboards/nullbitsco/scramble/v2/config.h | 7 | ||||
-rw-r--r-- | keyboards/nullbitsco/scramble/v2/info.json | 4 | ||||
-rw-r--r-- | keyboards/nullbitsco/scramble/v2/rules.mk | 8 | ||||
-rw-r--r-- | keyboards/nullbitsco/tidbit/config.h | 1 | ||||
-rw-r--r-- | keyboards/nullbitsco/tidbit/info.json | 2 | ||||
-rw-r--r-- | keyboards/nullbitsco/tidbit/rules.mk | 6 |
13 files changed, 15 insertions, 43 deletions
diff --git a/keyboards/nullbitsco/nibble/config.h b/keyboards/nullbitsco/nibble/config.h index 16b069dae0..2d203594bf 100644 --- a/keyboards/nullbitsco/nibble/config.h +++ b/keyboards/nullbitsco/nibble/config.h @@ -15,7 +15,6 @@ */ #pragma once -#include "config_common.h" /* Used to set host for remote KB if VUSB detect doesn't work. */ // #define KEYBOARD_HOST // Force host mode @@ -29,9 +28,6 @@ #define MATRIX_COLS 16 #define MATRIX_MUX_COLS 4 -/* Set 0 if debouncing isn't needed */ -#define DEBOUNCE 10 - /* * Keyboard Matrix Assignments * The nibble uses a demultiplexer for the cols. diff --git a/keyboards/nullbitsco/nibble/info.json b/keyboards/nullbitsco/nibble/info.json index 33ae369936..b59fee2411 100644 --- a/keyboards/nullbitsco/nibble/info.json +++ b/keyboards/nullbitsco/nibble/info.json @@ -7,6 +7,9 @@ "pid": "0x6060", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", + "debounce": 10, "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/nullbitsco/nibble/rules.mk b/keyboards/nullbitsco/nibble/rules.mk index f33bfbb9b8..0d5d3e2aac 100644 --- a/keyboards/nullbitsco/nibble/rules.mk +++ b/keyboards/nullbitsco/nibble/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/nullbitsco/scramble/info.json b/keyboards/nullbitsco/scramble/info.json index cc5fd28d76..216d83e49e 100644 --- a/keyboards/nullbitsco/scramble/info.json +++ b/keyboards/nullbitsco/scramble/info.json @@ -8,6 +8,7 @@ "pid": "0x6062", "device_version": "0.0.1" }, + "debounce": 10, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/nullbitsco/scramble/v1/config.h b/keyboards/nullbitsco/scramble/v1/config.h index b249b99851..6f512db4c5 100644 --- a/keyboards/nullbitsco/scramble/v1/config.h +++ b/keyboards/nullbitsco/scramble/v1/config.h @@ -19,7 +19,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once -#include "config_common.h" /* key matrix size */ #define MATRIX_ROWS 2 @@ -27,9 +26,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #define DIRECT_PINS {{D4,D5,B1}, {C3,C2,C1}} -/* Set 0 if debouncing isn't needed */ -#define DEBOUNCE 10 - /* Optional encoder pins */ #define ENCODERS_PAD_A { D6 } #define ENCODERS_PAD_B { D7 } diff --git a/keyboards/nullbitsco/scramble/v1/info.json b/keyboards/nullbitsco/scramble/v1/info.json new file mode 100644 index 0000000000..11307eba89 --- /dev/null +++ b/keyboards/nullbitsco/scramble/v1/info.json @@ -0,0 +1,4 @@ +{ + "processor": "atmega328p", + "bootloader": "usbasploader" +} diff --git a/keyboards/nullbitsco/scramble/v1/rules.mk b/keyboards/nullbitsco/scramble/v1/rules.mk index c1cf175c64..f917d68f4e 100644 --- a/keyboards/nullbitsco/scramble/v1/rules.mk +++ b/keyboards/nullbitsco/scramble/v1/rules.mk @@ -1,11 +1,3 @@ -# NOTE: This file is specific to AVR builds. - -# MCU name -MCU = atmega328p - -# Bootloader selection -BOOTLOADER = usbasploader - # Build Options # change yes to no to disable # diff --git a/keyboards/nullbitsco/scramble/v2/config.h b/keyboards/nullbitsco/scramble/v2/config.h index a2eb9712f9..b4d7820aad 100644 --- a/keyboards/nullbitsco/scramble/v2/config.h +++ b/keyboards/nullbitsco/scramble/v2/config.h @@ -19,17 +19,12 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once -#include "config_common.h" - /* key matrix size */ #define MATRIX_ROWS 2 #define MATRIX_COLS 3 #define DIRECT_PINS {{GP6,GP8,GP10}, {GP29,GP28,GP22}} -/* Set 0 if debouncing isn't needed */ -#define DEBOUNCE 10 - /* Optional encoder pins */ #define ENCODERS_PAD_A { GP24 } #define ENCODERS_PAD_B { GP25 } @@ -39,4 +34,4 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #define RP2040_FLASH_GENERIC_03H #define I2C1_SDA_PIN GP26 #define I2C1_SCL_PIN GP27 -#define I2C_DRIVER I2CD2 +#define I2C_DRIVER I2CD1 diff --git a/keyboards/nullbitsco/scramble/v2/info.json b/keyboards/nullbitsco/scramble/v2/info.json new file mode 100644 index 0000000000..87b7fcf7ec --- /dev/null +++ b/keyboards/nullbitsco/scramble/v2/info.json @@ -0,0 +1,4 @@ +{ + "processor": "RP2040", + "bootloader": "rp2040" +} diff --git a/keyboards/nullbitsco/scramble/v2/rules.mk b/keyboards/nullbitsco/scramble/v2/rules.mk index f93963285b..f917d68f4e 100644 --- a/keyboards/nullbitsco/scramble/v2/rules.mk +++ b/keyboards/nullbitsco/scramble/v2/rules.mk @@ -1,11 +1,3 @@ -# NOTE: This file is is specific to RP2040 builds. - -# MCU name -MCU = RP2040 - -# Bootloader selection -BOOTLOADER = rp2040 - # Build Options # change yes to no to disable # diff --git a/keyboards/nullbitsco/tidbit/config.h b/keyboards/nullbitsco/tidbit/config.h index 5e3d640dbd..4188bcf0fa 100644 --- a/keyboards/nullbitsco/tidbit/config.h +++ b/keyboards/nullbitsco/tidbit/config.h @@ -15,7 +15,6 @@ */ #pragma once -#include "config_common.h" /* Used to set remote for remote KB if VUSB detect doesn't work. */ // #define KEYBOARD_REMOTE diff --git a/keyboards/nullbitsco/tidbit/info.json b/keyboards/nullbitsco/tidbit/info.json index 7b9c4eb8ae..ec014a6680 100644 --- a/keyboards/nullbitsco/tidbit/info.json +++ b/keyboards/nullbitsco/tidbit/info.json @@ -7,6 +7,8 @@ "pid": "0x6064", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/nullbitsco/tidbit/rules.mk b/keyboards/nullbitsco/tidbit/rules.mk index 13893a69e2..3b7ff078bb 100644 --- a/keyboards/nullbitsco/tidbit/rules.mk +++ b/keyboards/nullbitsco/tidbit/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # |