summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorcole smith <38364556+daysgobye@users.noreply.github.com>2020-06-13 12:08:54 -0700
committerGitHub <noreply@github.com>2020-06-13 12:08:54 -0700
commitba7f52aaeba878544973952ca3fcce27ab4bb92d (patch)
tree3fbb8a081bf58804a72061080922e64ad444b48b
parent307013a2f868593784446b55f5c29ef9b6072f5c (diff)
Boardsource 3x4 info json fix (#9266)
* added bordsource 3x4 macro pad * added bordsource 3x4 macro pad * Update keyboards/boardsource/3x4/3x4.h * Update keyboards/boardsource/3x4/3x4.c * Update keyboards/boardsource/3x4/config.h * Update keyboards/boardsource/3x4/config.h * Update keyboards/boardsource/3x4/config.h * Update keyboards/boardsource/3x4/config.h * added link to readme * Update keyboards/boardsource/3x4/keymaps/default/keymap.c * Apply suggestions from code review * changed the layout to refelect the keyboard * Update keyboards/boardsource/3x4/info.json Oh your right my bad. In the future is there an easier way for me to test the info.json and the confiscator before doing my pr? * Apply suggestions from code review * got 3x4 building again * Apply suggestions from code review * applied requested change on readme * Update keyboards/boardsource/3x4/readme.md * Apply suggestions from code review
-rw-r--r--keyboards/boardsource/3x4/info.json21
-rw-r--r--keyboards/boardsource/3x4/keymaps/default/keymap.c9
-rw-r--r--keyboards/boardsource/3x4/readme.md3
3 files changed, 18 insertions, 15 deletions
diff --git a/keyboards/boardsource/3x4/info.json b/keyboards/boardsource/3x4/info.json
index 4ef02873e3..ea7a981032 100644
--- a/keyboards/boardsource/3x4/info.json
+++ b/keyboards/boardsource/3x4/info.json
@@ -5,23 +5,24 @@
"width": 4,
"height": 3,
"layouts": {
+
"LAYOUT": {
+
"layout": [
{ "label": "K01", "x": 0, "y": 0 },
{ "label": "K02", "x": 1, "y": 0 },
{ "label": "K03", "x": 2, "y": 0 },
+ { "label": "K04", "x": 3, "y": 0 },
- { "label": "K04", "x": 0, "y": 1 },
- { "label": "K05", "x": 1, "y": 1 },
- { "label": "K06", "x": 2, "y": 1 },
-
- { "label": "K07", "x": 0, "y": 2 },
- { "label": "K08", "x": 1, "y": 2 },
- { "label": "K09", "x": 2, "y": 2 },
+ { "label": "K05", "x": 0, "y": 1 },
+ { "label": "K06", "x": 1, "y": 1 },
+ { "label": "K07", "x": 2, "y": 1 },
+ { "label": "K08", "x": 3, "y": 1 },
- { "label": "K10", "x": 0, "y": 3 },
- { "label": "K11", "x": 1, "y": 3 },
- { "label": "K12", "x": 2, "y": 3 }
+ { "label": "K09", "x": 0, "y": 2 },
+ { "label": "K10", "x": 1, "y": 2 },
+ { "label": "K11", "x": 2, "y": 2 },
+ { "label": "K12", "x": 3, "y": 2 }
]
}
}
diff --git a/keyboards/boardsource/3x4/keymaps/default/keymap.c b/keyboards/boardsource/3x4/keymaps/default/keymap.c
index 3add4f7fbf..67133735fa 100644
--- a/keyboards/boardsource/3x4/keymaps/default/keymap.c
+++ b/keyboards/boardsource/3x4/keymaps/default/keymap.c
@@ -1,9 +1,10 @@
-
#include QMK_KEYBOARD_H
-#define _MAIN 0
-#define _RAISE 1
-#define _LOWER 2
+enum layers {
+ _MAIN,
+ _RAISE,
+ _LOWER,
+};
// Readability keycodes
#define LOWER MO(_LOWER)
diff --git a/keyboards/boardsource/3x4/readme.md b/keyboards/boardsource/3x4/readme.md
index 67a22ed4c0..9d7ef895c6 100644
--- a/keyboards/boardsource/3x4/readme.md
+++ b/keyboards/boardsource/3x4/readme.md
@@ -1,5 +1,6 @@
# 3x4
-![Boardsource 3x4 macro](https://i.imgur.com/EiPF1hh.jpg)
+
+![Boardsource 3x4 macro](https://i.imgur.com/EiPF1hhl.jpg)
this macro pad / small 12 key was inspired by the plaid look