summaryrefslogtreecommitdiffstats
path: root/keyboards/keyhive
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/keyhive')
-rwxr-xr-xkeyboards/keyhive/honeycomb/honeycomb.h13
-rw-r--r--keyboards/keyhive/honeycomb/info.json32
-rw-r--r--keyboards/keyhive/navi10/info.json5
-rw-r--r--keyboards/keyhive/navi10/rev0/info.json21
-rw-r--r--keyboards/keyhive/navi10/rev0/rev0.c2
-rw-r--r--keyboards/keyhive/navi10/rev0/rev0.h34
-rw-r--r--keyboards/keyhive/navi10/rev2/info.json21
-rw-r--r--keyboards/keyhive/navi10/rev2/rev2.c2
-rw-r--r--keyboards/keyhive/navi10/rev2/rev2.h34
-rw-r--r--keyboards/keyhive/navi10/rev3/info.json21
-rw-r--r--keyboards/keyhive/navi10/rev3/rev3.c2
-rw-r--r--keyboards/keyhive/navi10/rev3/rev3.h34
12 files changed, 79 insertions, 142 deletions
diff --git a/keyboards/keyhive/honeycomb/honeycomb.h b/keyboards/keyhive/honeycomb/honeycomb.h
index ec54b59f20..0418dee767 100755
--- a/keyboards/keyhive/honeycomb/honeycomb.h
+++ b/keyboards/keyhive/honeycomb/honeycomb.h
@@ -17,16 +17,3 @@
#define SET_LED_MAGENTA (RED_LED_ON(); GRN_LED_OFF(); BLU_LED_ON(); )
#define SET_LED_CYAN (RED_LED_OFF(); GRN_LED_ON(); BLU_LED_ON(); )
#define SET_LED_WHITE (RED_LED_ON(); GRN_LED_ON(); BLU_LED_ON(); )
-
-// This a shortcut to help you visually see your layout.
-// The first section contains all of the arguements
-// The second converts the arguments into a two-dimensional array
-#define LAYOUT( \
- k13, k14, k15, k16, \
- k09, k10, k11, k12, \
- k05, k06, k07, k08, \
- k01, k02, k03, k04 \
-) \
-{ \
- { k01, k02, k03, k04, k05, k06, k07, k08, k09, k10, k11, k12, k13, k14, k15, k16 } \
-}
diff --git a/keyboards/keyhive/honeycomb/info.json b/keyboards/keyhive/honeycomb/info.json
index 693b836ede..639edee28d 100644
--- a/keyboards/keyhive/honeycomb/info.json
+++ b/keyboards/keyhive/honeycomb/info.json
@@ -13,25 +13,25 @@
"layouts": {
"LAYOUT": {
"layout": [
- {"x":0, "y":0},
- {"x":1, "y":0},
- {"x":2, "y":0},
- {"x":3, "y":0},
+ {"matrix": [0, 12], "x": 0, "y": 0},
+ {"matrix": [0, 13], "x": 1, "y": 0},
+ {"matrix": [0, 14], "x": 2, "y": 0},
+ {"matrix": [0, 15], "x": 3, "y": 0},
- {"x":0, "y":1},
- {"x":1, "y":1},
- {"x":2, "y":1},
- {"x":3, "y":1},
+ {"matrix": [0, 8], "x": 0, "y": 1},
+ {"matrix": [0, 9], "x": 1, "y": 1},
+ {"matrix": [0, 10], "x": 2, "y": 1},
+ {"matrix": [0, 11], "x": 3, "y": 1},
- {"x":0, "y":2},
- {"x":1, "y":2},
- {"x":2, "y":2},
- {"x":3, "y":2},
+ {"matrix": [0, 4], "x": 0, "y": 2},
+ {"matrix": [0, 5], "x": 1, "y": 2},
+ {"matrix": [0, 6], "x": 2, "y": 2},
+ {"matrix": [0, 7], "x": 3, "y": 2},
- {"x":0, "y":3},
- {"x":1, "y":3},
- {"x":2, "y":3},
- {"x":3, "y":3}
+ {"matrix": [0, 0], "x": 0, "y": 3},
+ {"matrix": [0, 1], "x": 1, "y": 3},
+ {"matrix": [0, 2], "x": 2, "y": 3},
+ {"matrix": [0, 3], "x": 3, "y": 3}
]
}
}
diff --git a/keyboards/keyhive/navi10/info.json b/keyboards/keyhive/navi10/info.json
index ecafbeb089..d370601b62 100644
--- a/keyboards/keyhive/navi10/info.json
+++ b/keyboards/keyhive/navi10/info.json
@@ -6,10 +6,5 @@
"usb": {
"vid": "0xFEED",
"pid": "0x0000"
- },
- "layouts": {
- "LAYOUT": {
- "layout": [{"label":"Fn", "x":0, "y":0}, {"label":"Home", "x":1, "y":0}, {"label":"PgUp", "x":2, "y":0}, {"label":"Del", "x":0, "y":1}, {"label":"End", "x":1, "y":1}, {"label":"PgDn", "x":2, "y":1}, {"label":"Up", "x":1, "y":3}, {"label":"Left", "x":0, "y":4}, {"label":"Down", "x":1, "y":4}, {"label":"Right", "x":2, "y":4}]
- }
}
}
diff --git a/keyboards/keyhive/navi10/rev0/info.json b/keyboards/keyhive/navi10/rev0/info.json
index c721a3f390..548d917667 100644
--- a/keyboards/keyhive/navi10/rev0/info.json
+++ b/keyboards/keyhive/navi10/rev0/info.json
@@ -8,5 +8,24 @@
},
"diode_direction": "COL2ROW",
"processor": "atmega32u4",
- "bootloader": "caterina"
+ "bootloader": "caterina",
+ "layouts": {
+ "LAYOUT": {
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1, "y": 0},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1},
+ {"matrix": [1, 1], "x": 1, "y": 1},
+ {"matrix": [1, 2], "x": 2, "y": 1},
+
+ {"matrix": [2, 1], "x": 1, "y": 3},
+
+ {"matrix": [3, 0], "x": 0, "y": 4},
+ {"matrix": [3, 1], "x": 1, "y": 4},
+ {"matrix": [3, 2], "x": 2, "y": 4}
+ ]
+ }
+ }
}
diff --git a/keyboards/keyhive/navi10/rev0/rev0.c b/keyboards/keyhive/navi10/rev0/rev0.c
index f6c1f362ca..1eefa5cd91 100644
--- a/keyboards/keyhive/navi10/rev0/rev0.c
+++ b/keyboards/keyhive/navi10/rev0/rev0.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 "rev0.h"
+#include "quantum.h"
void matrix_init_kb(void) {
// put your keyboard start-up code here
diff --git a/keyboards/keyhive/navi10/rev0/rev0.h b/keyboards/keyhive/navi10/rev0/rev0.h
deleted file mode 100644
index b162d14425..0000000000
--- a/keyboards/keyhive/navi10/rev0/rev0.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/* Copyright 2019 Ethan Durrant (emdarcher)
- *
- * 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( \
- k0, k1, k2, \
- k3, k4, k5, \
- \
- k6, \
- k7, k8, k9 \
-) \
-{ \
- {k0, k1, k2}, \
- {k3, k4, k5}, \
- {KC_NO, k6, KC_NO}, \
- {k7, k8, k9}, \
-}
-
-
diff --git a/keyboards/keyhive/navi10/rev2/info.json b/keyboards/keyhive/navi10/rev2/info.json
index a0e51a3fb8..8db97e67b7 100644
--- a/keyboards/keyhive/navi10/rev2/info.json
+++ b/keyboards/keyhive/navi10/rev2/info.json
@@ -8,5 +8,24 @@
},
"diode_direction": "COL2ROW",
"processor": "atmega32u4",
- "bootloader": "caterina"
+ "bootloader": "caterina",
+ "layouts": {
+ "LAYOUT": {
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1, "y": 0},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1},
+ {"matrix": [1, 1], "x": 1, "y": 1},
+ {"matrix": [1, 2], "x": 2, "y": 1},
+
+ {"matrix": [2, 1], "x": 1, "y": 3},
+
+ {"matrix": [3, 0], "x": 0, "y": 4},
+ {"matrix": [3, 1], "x": 1, "y": 4},
+ {"matrix": [3, 2], "x": 2, "y": 4}
+ ]
+ }
+ }
}
diff --git a/keyboards/keyhive/navi10/rev2/rev2.c b/keyboards/keyhive/navi10/rev2/rev2.c
index fed0e03897..1eefa5cd91 100644
--- a/keyboards/keyhive/navi10/rev2/rev2.c
+++ b/keyboards/keyhive/navi10/rev2/rev2.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 "rev2.h"
+#include "quantum.h"
void matrix_init_kb(void) {
// put your keyboard start-up code here
diff --git a/keyboards/keyhive/navi10/rev2/rev2.h b/keyboards/keyhive/navi10/rev2/rev2.h
deleted file mode 100644
index b162d14425..0000000000
--- a/keyboards/keyhive/navi10/rev2/rev2.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/* Copyright 2019 Ethan Durrant (emdarcher)
- *
- * 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( \
- k0, k1, k2, \
- k3, k4, k5, \
- \
- k6, \
- k7, k8, k9 \
-) \
-{ \
- {k0, k1, k2}, \
- {k3, k4, k5}, \
- {KC_NO, k6, KC_NO}, \
- {k7, k8, k9}, \
-}
-
-
diff --git a/keyboards/keyhive/navi10/rev3/info.json b/keyboards/keyhive/navi10/rev3/info.json
index 704ca05e91..82df44e866 100644
--- a/keyboards/keyhive/navi10/rev3/info.json
+++ b/keyboards/keyhive/navi10/rev3/info.json
@@ -8,5 +8,24 @@
},
"diode_direction": "COL2ROW",
"processor": "atmega32u4",
- "bootloader": "caterina"
+ "bootloader": "caterina",
+ "layouts": {
+ "LAYOUT": {
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1, "y": 0},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1},
+ {"matrix": [1, 1], "x": 1, "y": 1},
+ {"matrix": [1, 2], "x": 2, "y": 1},
+
+ {"matrix": [2, 1], "x": 1, "y": 3},
+
+ {"matrix": [3, 0], "x": 0, "y": 4},
+ {"matrix": [3, 1], "x": 1, "y": 4},
+ {"matrix": [3, 2], "x": 2, "y": 4}
+ ]
+ }
+ }
}
diff --git a/keyboards/keyhive/navi10/rev3/rev3.c b/keyboards/keyhive/navi10/rev3/rev3.c
index 2b0355aa36..1eefa5cd91 100644
--- a/keyboards/keyhive/navi10/rev3/rev3.c
+++ b/keyboards/keyhive/navi10/rev3/rev3.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 "rev3.h"
+#include "quantum.h"
void matrix_init_kb(void) {
// put your keyboard start-up code here
diff --git a/keyboards/keyhive/navi10/rev3/rev3.h b/keyboards/keyhive/navi10/rev3/rev3.h
deleted file mode 100644
index b162d14425..0000000000
--- a/keyboards/keyhive/navi10/rev3/rev3.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/* Copyright 2019 Ethan Durrant (emdarcher)
- *
- * 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( \
- k0, k1, k2, \
- k3, k4, k5, \
- \
- k6, \
- k7, k8, k9 \
-) \
-{ \
- {k0, k1, k2}, \
- {k3, k4, k5}, \
- {KC_NO, k6, KC_NO}, \
- {k7, k8, k9}, \
-}
-
-
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-11 02:09:41 +0000