aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornoroadsleft <18669334+noroadsleft@users.noreply.github.com>2019-01-05 15:34:38 -0800
committerDrashna Jaelre <drashna@live.com>2019-01-05 15:34:38 -0800
commit90046af17fb3ffe1dfe57d87b83a894ce925f3c1 (patch)
treeb5d95defdd32897c10375f31f5122aa91bb10ab8
parent27b512d9f550dd1a42466733c0c3066742aeb300 (diff)
downloadqmk_firmware-90046af17fb3ffe1dfe57d87b83a894ce925f3c1.tar.gz
qmk_firmware-90046af17fb3ffe1dfe57d87b83a894ce925f3c1.zip
Keyboard: Numbrero: Configurator fix and code tidy (#4787)
* Numbrero: fix Configurator mismatch Key object order in info.json didn't match the layout macro, leading to keys being assigned out-of-sequence. * Numbrero: tidy - white space changes in numbrero.h (alignment/readability/QMK conventions) - minor changes to readme.md (grammar, mostly)
Diffstat
-rw-r--r--keyboards/handwired/numbrero/info.json57
-rw-r--r--keyboards/handwired/numbrero/numbrero.h38
-rw-r--r--keyboards/handwired/numbrero/readme.md6
3 files changed, 73 insertions, 28 deletions
diff --git a/keyboards/handwired/numbrero/info.json b/keyboards/handwired/numbrero/info.json
index 85c4b4827..d2f7ebd03 100644
--- a/keyboards/handwired/numbrero/info.json
+++ b/keyboards/handwired/numbrero/info.json
@@ -5,11 +5,58 @@
5 "width": 5, 5 "width": 5,
6 "height": 5, 6 "height": 5,
7 "layouts": { 7 "layouts": {
8 "LAYOUT_numbrero_numpad": { 8 "LAYOUT_numbrero_numpad": {
9 "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":0, "y":1, "h":1.5}, {"x":1, "y":1}, {"x":2, "y":1}, {"x":3, "y":1}, {"x":4, "y":1, "h":2}, {"x":1, "y":2}, {"x":2, "y":2}, {"x":3, "y":2}, {"x":0, "y":2.5}, {"x":1, "y":3}, {"x":2, "y":3}, {"x":3, "y":3}, {"x":4, "y":3, "h":2}, {"x":0, "y":3.5, "h":1.5}, {"x":1, "y":4, "w":2}, {"x":3, "y":4}] 9 "layout": [
10 }, 10 {"label":"K00", "x":0, "y":0},
11 "LAYOUT_numbrero_ortho": { 11 {"label":"K01", "x":1, "y":0},
12 "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":0, "y":1, "h":1.5}, {"x":1, "y":1}, {"x":2, "y":1}, {"x":3, "y":1}, {"x":4, "y":1}, {"x":1, "y":2}, {"x":2, "y":2}, {"x":3, "y":2}, {"x":4, "y":2}, {"x":0, "y":2.5}, {"x":1, "y":3}, {"x":2, "y":3}, {"x":3, "y":3}, {"x":4, "y":3}, {"x":0, "y":3.5, "h":1.5}, {"x":1, "y":4}, {"x":2, "y":4}, {"x":3, "y":4}, {"x":4, "y":4}] 12 {"label":"K02", "x":2, "y":0},
13 {"label":"K03", "x":3, "y":0},
14 {"label":"K04", "x":4, "y":0},
15 {"label":"K10", "x":0, "y":1, "h":1.5},
16 {"label":"K11", "x":1, "y":1},
17 {"label":"K12", "x":2, "y":1},
18 {"label":"K13", "x":3, "y":1},
19 {"label":"K20", "x":0, "y":2.5},
20 {"label":"K21", "x":1, "y":2},
21 {"label":"K22", "x":2, "y":2},
22 {"label":"K23", "x":3, "y":2},
23 {"label":"K14", "x":4, "y":1, "h":2},
24 {"label":"K30", "x":0, "y":3.5, "h":1.5},
25 {"label":"K31", "x":1, "y":3},
26 {"label":"K32", "x":2, "y":3},
27 {"label":"K33", "x":3, "y":3},
28 {"label":"K41", "x":1, "y":4, "w":2},
29 {"label":"K43", "x":3, "y":4},
30 {"label":"K34", "x":4, "y":3, "h":2}
31 ]
32 },
33 "LAYOUT_numbrero_ortho": {
34 "layout": [
35 {"label":"K00", "x":0, "y":0},
36 {"label":"K01", "x":1, "y":0},
37 {"label":"K02", "x":2, "y":0},
38 {"label":"K03", "x":3, "y":0},
39 {"label":"K04", "x":4, "y":0},
40 {"label":"K10", "x":0, "y":1, "h":1.5},
41 {"label":"K11", "x":1, "y":1},
42 {"label":"K12", "x":2, "y":1},
43 {"label":"K13", "x":3, "y":1},
44 {"label":"K14", "x":4, "y":1},
45 {"label":"K20", "x":0, "y":2.5},
46 {"label":"K21", "x":1, "y":2},
47 {"label":"K22", "x":2, "y":2},
48 {"label":"K23", "x":3, "y":2},
49 {"label":"K24", "x":4, "y":2},
50 {"label":"K30", "x":0, "y":3.5, "h":1.5},
51 {"label":"K31", "x":1, "y":3},
52 {"label":"K32", "x":2, "y":3},
53 {"label":"K33", "x":3, "y":3},
54 {"label":"K34", "x":4, "y":3},
55 {"label":"K41", "x":1, "y":4},
56 {"label":"K42", "x":2, "y":4},
57 {"label":"K43", "x":3, "y":4},
58 {"label":"K44", "x":4, "y":4}
59 ]
13 } 60 }
14 } 61 }
15} 62}
diff --git a/keyboards/handwired/numbrero/numbrero.h b/keyboards/handwired/numbrero/numbrero.h
index d4aff8b88..c72e65407 100644
--- a/keyboards/handwired/numbrero/numbrero.h
+++ b/keyboards/handwired/numbrero/numbrero.h
@@ -3,28 +3,28 @@
3#include "quantum.h" 3#include "quantum.h"
4 4
5#define LAYOUT_numbrero_numpad( \ 5#define LAYOUT_numbrero_numpad( \
6 K00, K01, K02, K03, K04, \ 6 K00, K01, K02, K03, K04, \
7 K10, K11, K12, K13, \ 7 K10, K11, K12, K13, \
8 K20, K21, K22, K23, K14, \ 8 K20, K21, K22, K23, K14, \
9 K30, K31, K32, K33, \ 9 K30, K31, K32, K33, \
10 K41, K43, K34 \ 10 K41, K43, K34 \
11) { \ 11) { \
12 { K00, K01, K02, K03, K04 }, \ 12 { K00, K01, K02, K03, K04 }, \
13 { K10, K11, K12, K13, K14 }, \ 13 { K10, K11, K12, K13, K14 }, \
14 { K20, K21, K22, K23, KC_NO }, \ 14 { K20, K21, K22, K23, KC_NO }, \
15 { K30, K31, K32, K33, K34 }, \ 15 { K30, K31, K32, K33, K34 }, \
16 { KC_NO, K41, KC_NO, K43, KC_NO } \ 16 { KC_NO, K41, KC_NO, K43, KC_NO } \
17} 17}
18#define LAYOUT_numbrero_ortho(\ 18#define LAYOUT_numbrero_ortho(\
19 K00, K01, K02, K03, K04, \ 19 K00, K01, K02, K03, K04, \
20 K10, K11, K12, K13, K14, \ 20 K10, K11, K12, K13, K14, \
21 K20, K21, K22, K23, K24, \ 21 K20, K21, K22, K23, K24, \
22 K30, K31, K32, K33, K34, \ 22 K30, K31, K32, K33, K34, \
23 K41, K42, K43, K44 \ 23 K41, K42, K43, K44 \
24){ \ 24){ \
25 { K00, K01, K02, K03, K04 }, \ 25 { K00, K01, K02, K03, K04 }, \
26 { K10, K11, K12, K13, K14 }, \ 26 { K10, K11, K12, K13, K14 }, \
27 { K20, K21, K22, K23, K24 }, \ 27 { K20, K21, K22, K23, K24 }, \
28 { K30, K31, K32, K33, K34 }, \ 28 { K30, K31, K32, K33, K34 }, \
29 { KC_NO, K41, K42, K43, K44 } \ 29 { KC_NO, K41, K42, K43, K44 } \
30} 30}
diff --git a/keyboards/handwired/numbrero/readme.md b/keyboards/handwired/numbrero/readme.md
index a69eeefd4..42f005dbe 100644
--- a/keyboards/handwired/numbrero/readme.md
+++ b/keyboards/handwired/numbrero/readme.md
@@ -1,11 +1,9 @@
1# Numbrero 1# Numbrero
2 2
3No picture currently available. 3A reversible numpad (left/right-handed) with extra macro keys.
4
5A Reversible Numpad (Left/Right handed) with extra macro keys.
6 4
7Keyboard Maintainer: [Flehrad](https://github.com/flehrad) 5Keyboard Maintainer: [Flehrad](https://github.com/flehrad)
8Hardware Supported: Numbrero PCB. 6Hardware Supported: Numbrero PCB, Pro Micro
9Hardware Availability: The Board Podcast Slack 7Hardware Availability: The Board Podcast Slack
10 8
11Make example for this keyboard (after setting up your build environment): 9Make example for this keyboard (after setting up your build environment):
generated by cgit v1.2.3 (git 2.25.1) at 2025-12-03 21:33:25 +0000