summaryrefslogtreecommitdiff
path: root/keyboards/pierce
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/pierce')
-rw-r--r--keyboards/pierce/info.json75
-rw-r--r--keyboards/pierce/keymaps/durken1/config.h3
-rw-r--r--keyboards/pierce/pierce.c17
-rw-r--r--keyboards/pierce/pierce.h31
4 files changed, 39 insertions, 87 deletions
diff --git a/keyboards/pierce/info.json b/keyboards/pierce/info.json
index b2dd54c57e..971b9939cf 100644
--- a/keyboards/pierce/info.json
+++ b/keyboards/pierce/info.json
@@ -14,46 +14,49 @@
"layouts": {
"LAYOUT_split_3x5_3": {
"layout": [
- {"x":0, "y":0.5},
- {"x":1, "y":0.13},
- {"x":2, "y":0.0},
- {"x":3, "y":0.13},
- {"x":4, "y":0.25},
- {"x":7, "y":0.25},
- {"x":8, "y":0.13},
- {"x":9, "y":0.0},
- {"x":10, "y":0.13},
- {"x":11, "y":0.5},
+ {"matrix": [0, 0], "x": 0, "y": 0.5},
+ {"matrix": [0, 1], "x": 1, "y": 0.13},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0.13},
+ {"matrix": [0, 4], "x": 4, "y": 0.25},
- {"x":0, "y":1.5},
- {"x":1, "y":1.13},
- {"x":2, "y":1.0},
- {"x":3, "y":1.13},
- {"x":4, "y":1.25},
- {"x":7, "y":1.25},
- {"x":8, "y":1.13},
- {"x":9, "y":1.0},
- {"x":10, "y":1.13},
- {"x":11, "y":1.5},
+ {"matrix": [0, 5], "x": 7, "y": 0.25},
+ {"matrix": [0, 6], "x": 8, "y": 0.13},
+ {"matrix": [0, 7], "x": 9, "y": 0},
+ {"matrix": [0, 8], "x": 10, "y": 0.13},
+ {"matrix": [0, 9], "x": 11, "y": 0.5},
- {"x":0, "y":2.5},
- {"x":1, "y":2.13},
- {"x":2, "y":2.0},
- {"x":3, "y":2.13},
- {"x":4, "y":2.25},
- {"x":7, "y":2.25},
- {"x":8, "y":2.13},
- {"x":9, "y":2.0},
- {"x":10, "y":2.13},
- {"x":11, "y":2.5},
+ {"matrix": [1, 0], "x": 0, "y": 1.5},
+ {"matrix": [1, 1], "x": 1, "y": 1.13},
+ {"matrix": [1, 2], "x": 2, "y": 1},
+ {"matrix": [1, 3], "x": 3, "y": 1.13},
+ {"matrix": [1, 4], "x": 4, "y": 1.25},
- {"x":2.5, "y":3.16},
- {"x":3.5, "y":3.5},
- {"x":4.5, "y":3.75},
+ {"matrix": [1, 5], "x": 7, "y": 1.25},
+ {"matrix": [1, 6], "x": 8, "y": 1.13},
+ {"matrix": [1, 7], "x": 9, "y": 1},
+ {"matrix": [1, 8], "x": 10, "y": 1.13},
+ {"matrix": [1, 9], "x": 11, "y": 1.5},
- {"x":6.5, "y":3.75},
- {"x":7.5, "y":3.5},
- {"x":8.5, "y":3.16}
+ {"matrix": [2, 0], "x": 0, "y": 2.5},
+ {"matrix": [2, 1], "x": 1, "y": 2.13},
+ {"matrix": [2, 2], "x": 2, "y": 2},
+ {"matrix": [2, 3], "x": 3, "y": 2.13},
+ {"matrix": [2, 4], "x": 4, "y": 2.25},
+
+ {"matrix": [2, 5], "x": 7, "y": 2.25},
+ {"matrix": [2, 6], "x": 8, "y": 2.13},
+ {"matrix": [2, 7], "x": 9, "y": 2},
+ {"matrix": [2, 8], "x": 10, "y": 2.13},
+ {"matrix": [2, 9], "x": 11, "y": 2.5},
+
+ {"matrix": [3, 2], "x": 2.5, "y": 3.16},
+ {"matrix": [3, 3], "x": 3.5, "y": 3.5},
+ {"matrix": [3, 4], "x": 4.5, "y": 3.75},
+
+ {"matrix": [3, 5], "x": 6.5, "y": 3.75},
+ {"matrix": [3, 6], "x": 7.5, "y": 3.5},
+ {"matrix": [3, 7], "x": 8.5, "y": 3.16}
]
}
}
diff --git a/keyboards/pierce/keymaps/durken1/config.h b/keyboards/pierce/keymaps/durken1/config.h
index 7049a692ed..8ff2df3709 100644
--- a/keyboards/pierce/keymaps/durken1/config.h
+++ b/keyboards/pierce/keymaps/durken1/config.h
@@ -19,9 +19,6 @@
// default but important
#define TAPPING_TERM 220
-// Prevent normal rollover on alphas from accidentally triggering mods.
-#define IGNORE_MOD_TAP_INTERRUPT
-
// Enable rapid switch from tap to hold, disables double tap hold auto-repeat.
#define QUICK_TAP_TERM 0
diff --git a/keyboards/pierce/pierce.c b/keyboards/pierce/pierce.c
deleted file mode 100644
index 085ca9cdec..0000000000
--- a/keyboards/pierce/pierce.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2022 durken (https://github.com/durken1/)
- *
- * 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 "pierce.h"
diff --git a/keyboards/pierce/pierce.h b/keyboards/pierce/pierce.h
deleted file mode 100644
index edb4151740..0000000000
--- a/keyboards/pierce/pierce.h
+++ /dev/null
@@ -1,31 +0,0 @@
-/* Copyright 2022 durken (https://github.com/durken1/)
- *
- * 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 LAYOUT_split_3x5_3( \
- K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, \
- K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, \
- K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, \
- K32, K33, K34, K35, K36, K37 \
-) { \
- { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09 }, \
- { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19 }, \
- { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29 }, \
- { KC_NO, KC_NO, K32, K33, K34, K35, K36, K37, KC_NO, KC_NO } \
-}