diff options
Diffstat (limited to 'keyboards/nullbitsco/scramble')
-rw-r--r-- | keyboards/nullbitsco/scramble/info.json | 1 | ||||
-rw-r--r-- | keyboards/nullbitsco/scramble/v1/config.h | 11 | ||||
-rw-r--r-- | keyboards/nullbitsco/scramble/v1/info.json | 10 | ||||
-rw-r--r-- | keyboards/nullbitsco/scramble/v1/rules.mk | 8 | ||||
-rw-r--r-- | keyboards/nullbitsco/scramble/v2/config.h | 13 | ||||
-rw-r--r-- | keyboards/nullbitsco/scramble/v2/info.json | 10 | ||||
-rw-r--r-- | keyboards/nullbitsco/scramble/v2/rules.mk | 8 |
7 files changed, 22 insertions, 39 deletions
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..6a7742ce87 100644 --- a/keyboards/nullbitsco/scramble/v1/config.h +++ b/keyboards/nullbitsco/scramble/v1/config.h @@ -19,17 +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 -#define MATRIX_COLS 3 - -#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..0acb699373 --- /dev/null +++ b/keyboards/nullbitsco/scramble/v1/info.json @@ -0,0 +1,10 @@ +{ + "processor": "atmega328p", + "bootloader": "usbasploader", + "matrix_pins": { + "direct": [ + ["D4", "D5", "B1"], + ["C3", "C2", "C1"] + ] + } +} 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..dd2ae62749 100644 --- a/keyboards/nullbitsco/scramble/v2/config.h +++ b/keyboards/nullbitsco/scramble/v2/config.h @@ -19,17 +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 -#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 +28,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..ba27823b36 --- /dev/null +++ b/keyboards/nullbitsco/scramble/v2/info.json @@ -0,0 +1,10 @@ +{ + "processor": "RP2040", + "bootloader": "rp2040", + "matrix_pins": { + "direct": [ + ["GP6", "GP8", "GP10"], + ["GP29", "GP28", "GP22"] + ] + } +} 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 # |