summaryrefslogtreecommitdiff
path: root/keyboards/synapse
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/synapse')
-rw-r--r--keyboards/synapse/config.h10
-rw-r--r--keyboards/synapse/info.json199
-rw-r--r--keyboards/synapse/keymaps/7u_space/config.h4
-rw-r--r--keyboards/synapse/keymaps/7u_space/keymap.c4
-rw-r--r--keyboards/synapse/keymaps/default/config.h4
-rw-r--r--keyboards/synapse/keymaps/default/keymap.c4
-rw-r--r--keyboards/synapse/synapse.c3
-rw-r--r--keyboards/synapse/synapse.h48
8 files changed, 113 insertions, 163 deletions
diff --git a/keyboards/synapse/config.h b/keyboards/synapse/config.h
index f9b40cedee..9f86bdabd7 100644
--- a/keyboards/synapse/config.h
+++ b/keyboards/synapse/config.h
@@ -16,14 +16,4 @@
#pragma once
-
-#define MATRIX_ROW_PINS \
- { E6, B0, F4, F1 }
-#define MATRIX_COL_PINS \
- { F0, D4, F5, B1, B2, B3, B7, D0, D1, D2, D3, B6 }
-
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
#define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/synapse/info.json b/keyboards/synapse/info.json
index ff629b48c5..85659dc8a5 100644
--- a/keyboards/synapse/info.json
+++ b/keyboards/synapse/info.json
@@ -4,107 +4,118 @@
"url": "",
"maintainer": "qpockets",
"usb": {
- "vid": "0x7170",
- "pid": "0x5359",
- "device_version": "0.0.1"
+ "vid": "0x7170",
+ "pid": "0x5359",
+ "device_version": "0.0.1"
},
+ "matrix_pins": {
+ "cols": ["F0", "D4", "F5", "B1", "B2", "B3", "B7", "D0", "D1", "D2", "D3", "B6"],
+ "rows": ["E6", "B0", "F4", "F1"]
+ },
+ "diode_direction": "COL2ROW",
"encoder": {
- "rotary": [
- {"pin_a": "D7", "pin_b": "D6"},
- {"pin_a": "C7", "pin_b": "C6"}
- ]
+ "rotary": [
+ {"pin_a": "D7", "pin_b": "D6"},
+ {"pin_a": "C7", "pin_b": "C6"}
+ ]
},
"processor": "atmega32u4",
"bootloader": "atmel-dfu",
"layouts": {
+ "LAYOUT_7u_space": {
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1, "y": 0},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+ {"matrix": [0, 4], "x": 4, "y": 0},
+ {"matrix": [0, 5], "x": 5, "y": 0},
+ {"matrix": [0, 6], "x": 6, "y": 0},
+ {"matrix": [0, 7], "x": 7, "y": 0},
+ {"matrix": [0, 8], "x": 8, "y": 0},
+ {"matrix": [0, 9], "x": 9, "y": 0},
+ {"matrix": [0, 10], "x": 10, "y": 0},
+ {"matrix": [0, 11], "x": 11, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.25},
+ {"matrix": [1, 1], "x": 1.25, "y": 1},
+ {"matrix": [1, 2], "x": 2.25, "y": 1},
+ {"matrix": [1, 3], "x": 3.25, "y": 1},
+ {"matrix": [1, 4], "x": 4.25, "y": 1},
+ {"matrix": [1, 5], "x": 5.25, "y": 1},
+ {"matrix": [1, 6], "x": 6.25, "y": 1},
+ {"matrix": [1, 7], "x": 7.25, "y": 1},
+ {"matrix": [1, 8], "x": 8.25, "y": 1},
+ {"matrix": [1, 9], "x": 9.25, "y": 1},
+ {"matrix": [1, 10], "x": 10.25, "y": 1, "w": 1.75},
+
+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+ {"matrix": [2, 1], "x": 1.75, "y": 2},
+ {"matrix": [2, 2], "x": 2.75, "y": 2},
+ {"matrix": [2, 3], "x": 3.75, "y": 2},
+ {"matrix": [2, 4], "x": 4.75, "y": 2},
+ {"matrix": [2, 5], "x": 5.75, "y": 2},
+ {"matrix": [2, 6], "x": 6.75, "y": 2},
+ {"matrix": [2, 7], "x": 7.75, "y": 2},
+ {"matrix": [2, 8], "x": 8.75, "y": 2},
+ {"matrix": [2, 9], "x": 9.75, "y": 2},
+ {"matrix": [2, 10], "x": 10.75, "y": 2, "w": 1.25},
+
+ {"matrix": [3, 0], "x": 0, "y": 3},
+ {"matrix": [3, 1], "x": 1, "y": 3, "w": 1.5},
+ {"matrix": [3, 3], "x": 2.5, "y": 3, "w": 7},
+ {"matrix": [3, 9], "x": 9.5, "y": 3, "w": 1.5},
+ {"matrix": [3, 10], "x": 11, "y": 3}
+ ]
+ },
"LAYOUT_default": {
- "layout": [
- {"x":0, "y":0},
- {"x":1, "y":0},
- {"x":2, "y":0},
- {"x":3, "y":0},
- {"x":4, "y":0},
- {"x":5, "y":0},
- {"x":6, "y":0},
- {"x":7, "y":0},
- {"x":8, "y":0},
- {"x":9, "y":0},
- {"x":10, "y":0},
- {"x":11, "y":0},
- {"x":0, "y":1, "w":1.25},
- {"x":1.25, "y":1},
- {"x":2.25, "y":1},
- {"x":3.25, "y":1},
- {"x":4.25, "y":1},
- {"x":5.25, "y":1},
- {"x":6.25, "y":1},
- {"x":7.25, "y":1},
- {"x":8.25, "y":1},
- {"x":9.25, "y":1},
- {"x":10.25, "y":1, "w":1.75},
- {"x":0, "y":2, "w":1.75},
- {"x":1.75, "y":2},
- {"x":2.75, "y":2},
- {"x":3.75, "y":2},
- {"x":4.75, "y":2},
- {"x":5.75, "y":2},
- {"x":6.75, "y":2},
- {"x":7.75, "y":2},
- {"x":8.75, "y":2},
- {"x":9.75, "y":2},
- {"x":10.75, "y":2, "w":1.25},
- {"x":0, "y":3},
- {"x":1, "y":3},
- {"x":2, "y":3},
- {"x":3, "y":3, "w":3},
- {"x":6, "y":3, "w":3},
- {"x":9, "y":3},
- {"x":10, "y":3},
- {"x":11, "y":3}
- ]
- },
- "LAYOUT_7u_space": {
"layout": [
- {"x":0, "y":0},
- {"x":1, "y":0},
- {"x":2, "y":0},
- {"x":3, "y":0},
- {"x":4, "y":0},
- {"x":5, "y":0},
- {"x":6, "y":0},
- {"x":7, "y":0},
- {"x":8, "y":0},
- {"x":9, "y":0},
- {"x":10, "y":0},
- {"x":11, "y":0},
- {"x":0, "y":1, "w":1.25},
- {"x":1.25, "y":1},
- {"x":2.25, "y":1},
- {"x":3.25, "y":1},
- {"x":4.25, "y":1},
- {"x":5.25, "y":1},
- {"x":6.25, "y":1},
- {"x":7.25, "y":1},
- {"x":8.25, "y":1},
- {"x":9.25, "y":1},
- {"x":10.25, "y":1, "w":1.75},
- {"x":0, "y":2, "w":1.75},
- {"x":1.75, "y":2},
- {"x":2.75, "y":2},
- {"x":3.75, "y":2},
- {"x":4.75, "y":2},
- {"x":5.75, "y":2},
- {"x":6.75, "y":2},
- {"x":7.75, "y":2},
- {"x":8.75, "y":2},
- {"x":9.75, "y":2},
- {"x":10.75, "y":2, "w":1.25},
- {"x":0, "y":3},
- {"x":1, "y":3, "w":1.5},
- {"x":2.5, "y":3, "w":7},
- {"x":9.5, "y":3, "w":1.5},
- {"x":11, "y":3}
- ]
- }
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1, "y": 0},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+ {"matrix": [0, 4], "x": 4, "y": 0},
+ {"matrix": [0, 5], "x": 5, "y": 0},
+ {"matrix": [0, 6], "x": 6, "y": 0},
+ {"matrix": [0, 7], "x": 7, "y": 0},
+ {"matrix": [0, 8], "x": 8, "y": 0},
+ {"matrix": [0, 9], "x": 9, "y": 0},
+ {"matrix": [0, 10], "x": 10, "y": 0},
+ {"matrix": [0, 11], "x": 11, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.25},
+ {"matrix": [1, 1], "x": 1.25, "y": 1},
+ {"matrix": [1, 2], "x": 2.25, "y": 1},
+ {"matrix": [1, 3], "x": 3.25, "y": 1},
+ {"matrix": [1, 4], "x": 4.25, "y": 1},
+ {"matrix": [1, 5], "x": 5.25, "y": 1},
+ {"matrix": [1, 6], "x": 6.25, "y": 1},
+ {"matrix": [1, 7], "x": 7.25, "y": 1},
+ {"matrix": [1, 8], "x": 8.25, "y": 1},
+ {"matrix": [1, 9], "x": 9.25, "y": 1},
+ {"matrix": [1, 10], "x": 10.25, "y": 1, "w": 1.75},
+
+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+ {"matrix": [2, 1], "x": 1.75, "y": 2},
+ {"matrix": [2, 2], "x": 2.75, "y": 2},
+ {"matrix": [2, 3], "x": 3.75, "y": 2},
+ {"matrix": [2, 4], "x": 4.75, "y": 2},
+ {"matrix": [2, 5], "x": 5.75, "y": 2},
+ {"matrix": [2, 6], "x": 6.75, "y": 2},
+ {"matrix": [2, 7], "x": 7.75, "y": 2},
+ {"matrix": [2, 8], "x": 8.75, "y": 2},
+ {"matrix": [2, 9], "x": 9.75, "y": 2},
+ {"matrix": [2, 10], "x": 10.75, "y": 2, "w": 1.25},
+
+ {"matrix": [3, 0], "x": 0, "y": 3},
+ {"matrix": [3, 1], "x": 1, "y": 3},
+ {"matrix": [3, 2], "x": 2, "y": 3},
+ {"matrix": [3, 3], "x": 3, "y": 3, "w": 3},
+ {"matrix": [3, 6], "x": 6, "y": 3, "w": 3},
+ {"matrix": [3, 8], "x": 9, "y": 3},
+ {"matrix": [3, 9], "x": 10, "y": 3},
+ {"matrix": [3, 10], "x": 11, "y": 3}
+ ]
}
+ }
}
diff --git a/keyboards/synapse/keymaps/7u_space/config.h b/keyboards/synapse/keymaps/7u_space/config.h
index 0b0e89fa1f..e398cb5b2d 100644
--- a/keyboards/synapse/keymaps/7u_space/config.h
+++ b/keyboards/synapse/keymaps/7u_space/config.h
@@ -18,10 +18,8 @@
/*Modtaps*/
#define TAPPING_TERM 165
-#define IGNORE_MOD_TAP_INTERRUPT
/*Combos*/
#ifdef COMBO_ENABLE
-# define COMBO_COUNT 5
# define COMBO_TERM 50
-#endif \ No newline at end of file
+#endif
diff --git a/keyboards/synapse/keymaps/7u_space/keymap.c b/keyboards/synapse/keymaps/7u_space/keymap.c
index 1791db3abe..b530e91c78 100644
--- a/keyboards/synapse/keymaps/7u_space/keymap.c
+++ b/keyboards/synapse/keymaps/7u_space/keymap.c
@@ -13,7 +13,7 @@
* 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
enum layers{
@@ -67,7 +67,7 @@ const uint16_t PROGMEM combo_tab[] = {KC_S, KC_D, COMBO_END};
const uint16_t PROGMEM combo_esc[] = {KC_T, KC_Y, COMBO_END};
const uint16_t PROGMEM combo_del[] = {KC_Q, KC_W, COMBO_END};
-combo_t key_combos[COMBO_COUNT] = {
+combo_t key_combos[] = {
[COMBO_BSPC] = COMBO(combo_bspc,KC_BSPC),
[COMBO_ENT] = COMBO(combo_ent,KC_ENT),
[COMBO_TAB] = COMBO(combo_tab,KC_TAB),
diff --git a/keyboards/synapse/keymaps/default/config.h b/keyboards/synapse/keymaps/default/config.h
index 0b0e89fa1f..e398cb5b2d 100644
--- a/keyboards/synapse/keymaps/default/config.h
+++ b/keyboards/synapse/keymaps/default/config.h
@@ -18,10 +18,8 @@
/*Modtaps*/
#define TAPPING_TERM 165
-#define IGNORE_MOD_TAP_INTERRUPT
/*Combos*/
#ifdef COMBO_ENABLE
-# define COMBO_COUNT 5
# define COMBO_TERM 50
-#endif \ No newline at end of file
+#endif
diff --git a/keyboards/synapse/keymaps/default/keymap.c b/keyboards/synapse/keymaps/default/keymap.c
index adaa51bddb..3428272ee9 100644
--- a/keyboards/synapse/keymaps/default/keymap.c
+++ b/keyboards/synapse/keymaps/default/keymap.c
@@ -13,7 +13,7 @@
* 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
enum layers{
@@ -67,7 +67,7 @@ const uint16_t PROGMEM combo_tab[] = {KC_S, KC_D, COMBO_END};
const uint16_t PROGMEM combo_esc[] = {KC_T, KC_Y, COMBO_END};
const uint16_t PROGMEM combo_del[] = {KC_Q, KC_W, COMBO_END};
-combo_t key_combos[COMBO_COUNT] = {
+combo_t key_combos[] = {
[COMBO_BSPC] = COMBO(combo_bspc,KC_BSPC),
[COMBO_ENT] = COMBO(combo_ent,KC_ENT),
[COMBO_TAB] = COMBO(combo_tab,KC_TAB),
diff --git a/keyboards/synapse/synapse.c b/keyboards/synapse/synapse.c
index ac9c50ceb1..0b532eaab6 100644
--- a/keyboards/synapse/synapse.c
+++ b/keyboards/synapse/synapse.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 "synapse.h"
+
+#include "quantum.h"
bool encoder_update_kb(uint8_t index, bool clockwise) {
if (!encoder_update_user(index, clockwise)) { return false; }
diff --git a/keyboards/synapse/synapse.h b/keyboards/synapse/synapse.h
deleted file mode 100644
index a126e450ec..0000000000
--- a/keyboards/synapse/synapse.h
+++ /dev/null
@@ -1,48 +0,0 @@
-/* Copyright 2021 qpockets
- *
- * 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"
-
-#define XXX KC_NO
-
-#define LAYOUT_default( \
- K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K50, K60, \
- K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K51, \
- K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K52, \
- K30, K31, K32, K33, K36, K38, K39, K53 \
-) \
-{ \
- {K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K50, K60}, \
- {K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K51, XXX}, \
- {K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K52, XXX}, \
- {K30, K31, K32, K33, XXX, XXX, K36, XXX, K38, K39, K53, XXX} \
-} \
-
-#define LAYOUT_7u_space( \
- K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K50, K60, \
- K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K51, \
- K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K52, \
- K30, K31, K33, K39, K53 \
-) \
-{ \
- {K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K50, K60}, \
- {K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K51, XXX}, \
- {K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K52, XXX}, \
- {K30, K31, XXX, K33, XXX, XXX, XXX, XXX, XXX, K39, K53, XXX} \
-}
-
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-12 10:43:47 +0000