summaryrefslogtreecommitdiff
path: root/keyboards/obosob
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/obosob')
-rw-r--r--keyboards/obosob/arch_36/config.h14
-rw-r--r--keyboards/obosob/arch_36/info.json6
-rw-r--r--keyboards/obosob/arch_36/rules.mk8
-rw-r--r--keyboards/obosob/steal_this_keyboard/config.h38
-rw-r--r--keyboards/obosob/steal_this_keyboard/info.json91
-rw-r--r--keyboards/obosob/steal_this_keyboard/keymaps/default/config.h2
-rw-r--r--keyboards/obosob/steal_this_keyboard/rules.mk6
-rw-r--r--keyboards/obosob/steal_this_keyboard/steal_this_keyboard.c16
-rw-r--r--keyboards/obosob/steal_this_keyboard/steal_this_keyboard.h46
9 files changed, 64 insertions, 163 deletions
diff --git a/keyboards/obosob/arch_36/config.h b/keyboards/obosob/arch_36/config.h
index 9d38dde232..ae2913396b 100644
--- a/keyboards/obosob/arch_36/config.h
+++ b/keyboards/obosob/arch_36/config.h
@@ -16,12 +16,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#pragma once
-#include "config_common.h"
-
-/* key matrix size */
-/* Rows are doubled up */
-#define MATRIX_ROWS 8
-#define MATRIX_COLS 5
// wiring
#define MATRIX_ROW_PINS { D7, E6, B4, B5 }
@@ -30,14 +24,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
/* COL2ROW, ROW2COL*/
#define DIODE_DIRECTION COL2ROW
-/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
-#define DEBOUNCE 5
-
-/*
- * Split Keyboard specific options, make sure you have 'SPLIT_KEYBOARD = yes' in your rules.mk, and define SOFT_SERIAL_PIN.
- */
-#define SOFT_SERIAL_PIN D2
-
#ifdef RGBLIGHT_ENABLE
#define RGB_DI_PIN D3
#define RGBLED_SPLIT { 6, 6 }
diff --git a/keyboards/obosob/arch_36/info.json b/keyboards/obosob/arch_36/info.json
index c5d9077237..63736c9a21 100644
--- a/keyboards/obosob/arch_36/info.json
+++ b/keyboards/obosob/arch_36/info.json
@@ -8,6 +8,12 @@
"pid": "0x9CE3",
"device_version": "0.0.1"
},
+ "split": {
+ "soft_serial_pin": "D2"
+ },
+ "processor": "atmega32u4",
+ "bootloader": "caterina",
+ "community_layouts": ["split_3x5_3"],
"layouts": {
"LAYOUT_split_3x5_3": {
"layout": [
diff --git a/keyboards/obosob/arch_36/rules.mk b/keyboards/obosob/arch_36/rules.mk
index 9631a0323e..e2392b1293 100644
--- a/keyboards/obosob/arch_36/rules.mk
+++ b/keyboards/obosob/arch_36/rules.mk
@@ -1,9 +1,3 @@
-# MCU name
-MCU = atmega32u4
-
-# Bootloader selection
-BOOTLOADER = caterina
-
# Build Options
# change yes to no to disable
#
@@ -19,5 +13,3 @@ OLED_ENABLE = yes
OLED_DRIVER = SSD1306 # Enables the use of OLED displays
AUDIO_ENABLE = no # Audio output
SPLIT_KEYBOARD = yes # Split common
-
-LAYOUTS = split_3x5_3
diff --git a/keyboards/obosob/steal_this_keyboard/config.h b/keyboards/obosob/steal_this_keyboard/config.h
index 7060e2ae6a..546afc4c50 100644
--- a/keyboards/obosob/steal_this_keyboard/config.h
+++ b/keyboards/obosob/steal_this_keyboard/config.h
@@ -16,42 +16,4 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
-#include "config_common.h"
-
-/* key matrix size */
-#define MATRIX_ROWS 8
-#define MATRIX_COLS 5
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- * NO_DIODE = switches are directly connected to AVR pins
- *
-*/
-#define DIRECT_PINS { \
- { F4, F7, B2, D1, D7 }, \
- { F5, B1, B6, D0, E6 }, \
- { F6, B3, D3, D4, B4 }, \
- { C6, B5, NO_PIN, NO_PIN, NO_PIN } \
-}
-
-#define DIRECT_PINS_RIGHT { \
- { D7, D1, B2, F7, F4}, \
- { E6, D0, B6, B1, F5 }, \
- { B4, D4, D3, B3, F6 }, \
- { B5, C6, NO_PIN, NO_PIN, NO_PIN } \
-}
-
-
-/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
-#define DEBOUNCE 5
-
-/* serial.c configuration for split keyboard */
-#define SOFT_SERIAL_PIN D2
-
#define EE_HANDS
diff --git a/keyboards/obosob/steal_this_keyboard/info.json b/keyboards/obosob/steal_this_keyboard/info.json
index 9694396873..e598ec3392 100644
--- a/keyboards/obosob/steal_this_keyboard/info.json
+++ b/keyboards/obosob/steal_this_keyboard/info.json
@@ -8,53 +8,76 @@
"pid": "0x50AD",
"device_version": "0.0.1"
},
+ "processor": "atmega32u4",
+ "bootloader": "caterina",
+ "matrix_pins": {
+ "direct": [
+ ["F4", "F7", "B2", "D1", "D7"],
+ ["F5", "B1", "B6", "D0", "E6"],
+ ["F6", "B3", "D3", "D4", "B4"],
+ ["C6", "B5", null, null, null]
+ ]
+ },
+ "split": {
+ "soft_serial_pin": "D2",
+ "matrix_pins": {
+ "right": {
+ "direct": [
+ ["D7", "D1", "B2", "F7", "F4"],
+ ["E6", "D0", "B6", "B1", "F5"],
+ ["B4", "D4", "D3", "B3", "F6"],
+ ["B5", "C6", null, null, null]
+ ]
+ }
+ }
+ },
"community_layouts": [
"split_3x5_2"
],
"layouts": {
"LAYOUT_split_3x5_2": {
"layout": [
- {"x": 0, "y": 0.93},
- {"x": 1, "y": 0.31},
- {"x": 2, "y": 0},
- {"x": 3, "y": 0.28},
- {"x": 4, "y": 0.42},
+ {"x": 0, "y": 0.93, "matrix": [0, 0]},
+ {"x": 1, "y": 0.31, "matrix": [0, 1]},
+ {"x": 2, "y": 0, "matrix": [0, 2]},
+ {"x": 3, "y": 0.28, "matrix": [0, 3]},
+ {"x": 4, "y": 0.42, "matrix": [0, 4]},
- {"x": 7, "y": 0.42},
- {"x": 8, "y": 0.28},
- {"x": 9, "y": 0},
- {"x": 10, "y": 0.31},
- {"x": 11, "y": 0.93},
+ {"x": 7, "y": 0.42, "matrix": [4, 0]},
+ {"x": 8, "y": 0.28, "matrix": [4, 1]},
+ {"x": 9, "y": 0, "matrix": [4, 2]},
+ {"x": 10, "y": 0.31, "matrix": [4, 3]},
+ {"x": 11, "y": 0.93, "matrix": [4, 4]},
- {"x": 0, "y": 1.93},
- {"x": 1, "y": 1.31},
- {"x": 2, "y": 1},
- {"x": 3, "y": 1.28},
- {"x": 4, "y": 1.42},
+ {"x": 0, "y": 1.93, "matrix": [1, 0]},
+ {"x": 1, "y": 1.31, "matrix": [1, 1]},
+ {"x": 2, "y": 1, "matrix": [1, 2]},
+ {"x": 3, "y": 1.28, "matrix": [1, 3]},
+ {"x": 4, "y": 1.42, "matrix": [1, 4]},
- {"x": 7, "y": 1.42},
- {"x": 8, "y": 1.28},
- {"x": 9, "y": 1},
- {"x": 10, "y": 1.31},
- {"x": 11, "y": 1.93},
+ {"x": 7, "y": 1.42, "matrix": [5, 0]},
+ {"x": 8, "y": 1.28, "matrix": [5, 1]},
+ {"x": 9, "y": 1, "matrix": [5, 2]},
+ {"x": 10, "y": 1.31, "matrix": [5, 3]},
+ {"x": 11, "y": 1.93, "matrix": [5, 4]},
- {"x": 0, "y": 2.93},
- {"x": 1, "y": 2.31},
- {"x": 2, "y": 2},
- {"x": 3, "y": 2.28},
- {"x": 4, "y": 2.42},
+ {"x": 0, "y": 2.93, "matrix": [2, 0]},
+ {"x": 1, "y": 2.31, "matrix": [2, 1]},
+ {"x": 2, "y": 2, "matrix": [2, 2]},
+ {"x": 3, "y": 2.28, "matrix": [2, 3]},
+ {"x": 4, "y": 2.42, "matrix": [2, 4]},
- {"x": 7, "y": 2.42},
- {"x": 8, "y": 2.28},
- {"x": 9, "y": 2},
- {"x": 10, "y": 2.31},
- {"x": 11, "y": 2.93},
+ {"x": 7, "y": 2.42, "matrix": [6, 0]},
+ {"x": 8, "y": 2.28, "matrix": [6, 1]},
+ {"x": 9, "y": 2, "matrix": [6, 2]},
+ {"x": 10, "y": 2.31, "matrix": [6, 3]},
+ {"x": 11, "y": 2.93, "matrix": [6, 4]},
- {"x": 3.5, "y": 3.75},
- {"x": 4.5, "y": 4},
+ {"x": 3.5, "y": 3.75, "matrix": [3, 0]},
+ {"x": 4.5, "y": 4, "matrix": [3, 1]},
- {"x": 6.5, "y": 4},
- {"x": 7.5, "y": 3.75}
+ {"x": 6.5, "y": 4, "matrix": [7, 0]},
+ {"x": 7.5, "y": 3.75, "matrix": [7, 1]}
]
}
}
diff --git a/keyboards/obosob/steal_this_keyboard/keymaps/default/config.h b/keyboards/obosob/steal_this_keyboard/keymaps/default/config.h
index 14ec0792b1..3e3ba7a401 100644
--- a/keyboards/obosob/steal_this_keyboard/keymaps/default/config.h
+++ b/keyboards/obosob/steal_this_keyboard/keymaps/default/config.h
@@ -36,4 +36,4 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define TAPPING_TERM 200
#define PERMISSIVE_HOLD
#define IGNORE_MOD_TAP_INTERRUPT
-#define TAPPING_FORCE_HOLD
+#define QUICK_TAP_TERM 0
diff --git a/keyboards/obosob/steal_this_keyboard/rules.mk b/keyboards/obosob/steal_this_keyboard/rules.mk
index 03ff795574..0ce5439c7b 100644
--- a/keyboards/obosob/steal_this_keyboard/rules.mk
+++ b/keyboards/obosob/steal_this_keyboard/rules.mk
@@ -1,9 +1,3 @@
-# MCU name
-MCU = atmega32u4
-
-# Bootloader selection
-BOOTLOADER = caterina
-
# Build Options
# change yes to no to disable
#
diff --git a/keyboards/obosob/steal_this_keyboard/steal_this_keyboard.c b/keyboards/obosob/steal_this_keyboard/steal_this_keyboard.c
deleted file mode 100644
index cd5ef5cdda..0000000000
--- a/keyboards/obosob/steal_this_keyboard/steal_this_keyboard.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2021 Obosob <obosob@riseup.net>
- *
- * 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 "steal_this_keyboard.h"
diff --git a/keyboards/obosob/steal_this_keyboard/steal_this_keyboard.h b/keyboards/obosob/steal_this_keyboard/steal_this_keyboard.h
deleted file mode 100644
index af7204f540..0000000000
--- a/keyboards/obosob/steal_this_keyboard/steal_this_keyboard.h
+++ /dev/null
@@ -1,46 +0,0 @@
-/* Copyright 2021 Obosob <obosob@riseup.net>
- *
- * 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 "quantum.h"
-
-/* This a shortcut to help you visually see your layout.
- *
- * The first section contains all of the arguments representing the physical
- * layout of the board and position of the keys.
- *
- * The second converts the arguments into a two-dimensional array which
- * represents the switch matrix.
- */
-
-// readability
-#define ___ KC_NO
-
-#define LAYOUT_split_3x5_2( \
- L01, L02, L03, L04, L05, R01, R02, R03, R04, R05, \
- L06, L07, L08, L09, L10, R06, R07, R08, R09, R10, \
- L11, L12, L13, L14, L15, R11, R12, R13, R14, R15, \
- L16, L17, R16, R17 \
- ) \
- { \
- { L01, L02, L03, L04, L05 }, \
- { L06, L07, L08, L09, L10 }, \
- { L11, L12, L13, L14, L15 }, \
- { L16, L17, ___, ___ , ___}, \
- { R01, R02, R03, R04, R05 }, \
- { R06, R07, R08, R09, R10 }, \
- { R11, R12, R13, R14, R15 }, \
- { R16, R17, ___, ___, ___ } \
- }
generated by cgit v1.2.3 (git 2.25.1) at 2024-09-12 05:14:32 +0000