summaryrefslogtreecommitdiffstats
path: root/keyboards/nullbitsco/scramble
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/nullbitsco/scramble')
-rw-r--r--keyboards/nullbitsco/scramble/info.json32
-rw-r--r--keyboards/nullbitsco/scramble/scramble.c18
-rw-r--r--keyboards/nullbitsco/scramble/scramble.h34
-rw-r--r--keyboards/nullbitsco/scramble/v1/config.h11
-rw-r--r--keyboards/nullbitsco/scramble/v1/info.json10
-rw-r--r--keyboards/nullbitsco/scramble/v1/rules.mk8
-rw-r--r--keyboards/nullbitsco/scramble/v1/v1.h2
-rw-r--r--keyboards/nullbitsco/scramble/v2/config.h13
-rw-r--r--keyboards/nullbitsco/scramble/v2/info.json10
-rw-r--r--keyboards/nullbitsco/scramble/v2/rules.mk8
-rw-r--r--keyboards/nullbitsco/scramble/v2/v2.h2
11 files changed, 30 insertions, 118 deletions
diff --git a/keyboards/nullbitsco/scramble/info.json b/keyboards/nullbitsco/scramble/info.json
index cc5fd28d76..32bb6f299e 100644
--- a/keyboards/nullbitsco/scramble/info.json
+++ b/keyboards/nullbitsco/scramble/info.json
@@ -8,34 +8,16 @@
"pid": "0x6062",
"device_version": "0.0.1"
},
+ "debounce": 10,
"layouts": {
"LAYOUT": {
"layout": [
- {
- "label": "n",
- "x": 0,
- "y": 0
- },
- {
- "x": 1,
- "y": 0
- },
- {
- "x": 2,
- "y": 0
- },
- {
- "x": 0,
- "y": 1
- },
- {
- "x": 1,
- "y": 1
- },
- {
- "x": 2,
- "y": 1
- }
+ {"x": 0, "y": 0, "matrix": [0, 0]},
+ {"x": 1, "y": 0, "matrix": [0, 1]},
+ {"x": 2, "y": 0, "matrix": [0, 2]},
+ {"x": 0, "y": 1, "matrix": [1, 0]},
+ {"x": 1, "y": 1, "matrix": [1, 1]},
+ {"x": 2, "y": 1, "matrix": [1, 2]}
]
}
}
diff --git a/keyboards/nullbitsco/scramble/scramble.c b/keyboards/nullbitsco/scramble/scramble.c
deleted file mode 100644
index c8a55e0d48..0000000000
--- a/keyboards/nullbitsco/scramble/scramble.c
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
-Copyright 2021 Jay Greco
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-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 QMK_KEYBOARD_H
diff --git a/keyboards/nullbitsco/scramble/scramble.h b/keyboards/nullbitsco/scramble/scramble.h
deleted file mode 100644
index 22c112040b..0000000000
--- a/keyboards/nullbitsco/scramble/scramble.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/* Copyright 2021 Jay Greco
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-#if defined(KEYBOARD_nullbitsco_scramble_v1)
- #include "v1.h"
-#elif defined(KEYBOARD_nullbitsco_scramble_v2)
- #include "v2.h"
-#endif
-
-// Layout is the same in all revisions
-#define LAYOUT( \
- K01, K02, K03, \
- K11, K12, K13 \
-) { \
- {K01, K02, K03}, \
- {K11, K12, K13}, \
-}
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/v1/v1.h b/keyboards/nullbitsco/scramble/v1/v1.h
index 5dc6d4a0e8..5c0b62357f 100644
--- a/keyboards/nullbitsco/scramble/v1/v1.h
+++ b/keyboards/nullbitsco/scramble/v1/v1.h
@@ -3,7 +3,7 @@
#pragma once
-#include "scramble.h"
+#include "quantum.h"
// Indication LED settings
#define LED_ON 2
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
#
diff --git a/keyboards/nullbitsco/scramble/v2/v2.h b/keyboards/nullbitsco/scramble/v2/v2.h
index d278c0a86a..c86282f658 100644
--- a/keyboards/nullbitsco/scramble/v2/v2.h
+++ b/keyboards/nullbitsco/scramble/v2/v2.h
@@ -3,7 +3,7 @@
#pragma once
-#include "scramble.h"
+#include "quantum.h"
#include <hal.h>
enum led_mode {
generated by cgit v1.2.3 (git 2.25.1) at 2025-02-23 09:29:46 +0000