aboutsummaryrefslogtreecommitdiff
path: root/keyboards
diff options
context:
space:
mode:
authorTurboMech <32869044+TurboMech@users.noreply.github.com>2018-01-05 11:37:22 -0500
committerJack Humbert <jack.humb@gmail.com>2018-01-05 11:37:22 -0500
commit6b584a23c032712b2219725e0cdd5a5ea576b31c (patch)
treef97bf8de3a61133a3db5060f22a67771dd1958a2 /keyboards
parent6bb3fbd4e0ff3123a1b3ea00d00c2ae7a2550120 (diff)
downloadqmk_firmware-6b584a23c032712b2219725e0cdd5a5ea576b31c.tar.gz
qmk_firmware-6b584a23c032712b2219725e0cdd5a5ea576b31c.zip
Updated ACR60, Mechmini, ALU84 readme information and config.h descripters (#2231)
* Updated ACR60, Mechmini, ALU84 readme information and config.h descripters Update MECHKEYS keyboards to be uniform in readmes and config.h's PID, MANUFACTORER, and DESCRIPTIONS. This allows the keyboards to be more uniform amongst the different types. * Rename keyboards/alu84/keymaps/TurboMech/config.h to keyboards/alu84/keymaps/turbomech * Rename keyboards/alu84/keymaps/turbomech to keyboards/alu84/keymaps/TurboMech/config.h * Fixed folder naming for alu84/keymaps/turbomech * fixed error from compile removed double `return MACRO_NONE;` and `switch (id) {`
Diffstat (limited to 'keyboards')
-rw-r--r--keyboards/acr60/config.h6
-rw-r--r--keyboards/acr60/readme.md11
-rwxr-xr-xkeyboards/alu84/config.h8
-rw-r--r--keyboards/alu84/keymaps/turbomech/config.h (renamed from keyboards/alu84/keymaps/TurboMech/config.h)0
-rw-r--r--keyboards/alu84/keymaps/turbomech/keymap.c (renamed from keyboards/alu84/keymaps/TurboMech/keymap.c)6
-rw-r--r--keyboards/alu84/keymaps/turbomech/readme.md (renamed from keyboards/alu84/keymaps/TurboMech/readme.md)0
-rw-r--r--keyboards/alu84/keymaps/turbomech/rules.mk (renamed from keyboards/alu84/keymaps/TurboMech/rules.mk)0
-rw-r--r--keyboards/alu84/readme.md8
-rw-r--r--keyboards/mechmini/readme.md6
-rw-r--r--keyboards/mechmini/v2/README.md4
10 files changed, 28 insertions, 21 deletions
diff --git a/keyboards/acr60/config.h b/keyboards/acr60/config.h
index 3d34dc975..c44ba737e 100644
--- a/keyboards/acr60/config.h
+++ b/keyboards/acr60/config.h
@@ -5,11 +5,11 @@
5 5
6/* USB Device descriptor parameter */ 6/* USB Device descriptor parameter */
7#define VENDOR_ID 0xFEED 7#define VENDOR_ID 0xFEED
8#define PRODUCT_ID 0x2260 8#define PRODUCT_ID 0xCA60
9#define DEVICE_VER 0x0001 9#define DEVICE_VER 0x0001
10#define MANUFACTURER MechKeysCa 10#define MANUFACTURER MECHKEYS
11#define PRODUCT ACR60 11#define PRODUCT ACR60
12#define DESCRIPTION ACR60 Keyboard 12#define DESCRIPTION 60% customizable keyboard
13 13
14/* key matrix size */ 14/* key matrix size */
15#define MATRIX_ROWS 5 15#define MATRIX_ROWS 5
diff --git a/keyboards/acr60/readme.md b/keyboards/acr60/readme.md
index 86e063ed5..a0ba2ecde 100644
--- a/keyboards/acr60/readme.md
+++ b/keyboards/acr60/readme.md
@@ -1,12 +1,15 @@
1# ACR60 1ACR60
2=====
2 3
3![acr60](https://cdn.shopify.com/s/files/1/1697/5323/products/20170522001035_1024x1024.jpg?v=1504725199) 4![acr60](https://cdn.shopify.com/s/files/1/1697/5323/products/20170522001035_1024x1024.jpg?v=1504725199)
4 5
5A customizable 60% keyboard based on the DZ60. 6A customizable 60% keyboard made and sold by mechkeys.ca [More info on MECHKEYS](https://mechkeys.ca)
7
8Keyboard Maintainer: [TurboMech](https://github.com/TurboMech)
6 9
7Keyboard Maintainer: QMK Community
8Hardware Supported: ACR60 10Hardware Supported: ACR60
9Hardware Availability: [mechkeysca](https://mechkeys.ca/products/acr60) 11
12Hardware Availability: [MECHKEYS](https://mechkeys.ca/products/acr60)
10 13
11Make example for this keyboard (after setting up your build environment): 14Make example for this keyboard (after setting up your build environment):
12 15
diff --git a/keyboards/alu84/config.h b/keyboards/alu84/config.h
index ab71f92ba..9e013dbcc 100755
--- a/keyboards/alu84/config.h
+++ b/keyboards/alu84/config.h
@@ -21,11 +21,11 @@
21 21
22/* USB Device descriptor parameter */ 22/* USB Device descriptor parameter */
23#define VENDOR_ID 0xFEED 23#define VENDOR_ID 0xFEED
24#define PRODUCT_ID 0x6060 24#define PRODUCT_ID 0xCA75
25#define DEVICE_VER 0x0001 25#define DEVICE_VER 0x0001
26#define MANUFACTURER mechkeys.ca 26#define MANUFACTURER MECHKEYS
27#define PRODUCT ALU84 27#define PRODUCT ALU84
28#define DESCRIPTION A 75% keyboard 28#define DESCRIPTION 75% keyboard
29 29
30/* key matrix size */ 30/* key matrix size */
31#define MATRIX_ROWS 6 31#define MATRIX_ROWS 6
@@ -73,4 +73,4 @@
73 73
74#endif 74#endif
75 75
76#endif \ No newline at end of file 76#endif
diff --git a/keyboards/alu84/keymaps/TurboMech/config.h b/keyboards/alu84/keymaps/turbomech/config.h
index 3013df9ba..3013df9ba 100644
--- a/keyboards/alu84/keymaps/TurboMech/config.h
+++ b/keyboards/alu84/keymaps/turbomech/config.h
diff --git a/keyboards/alu84/keymaps/TurboMech/keymap.c b/keyboards/alu84/keymaps/turbomech/keymap.c
index 00397e3f0..97b192a7b 100644
--- a/keyboards/alu84/keymaps/TurboMech/keymap.c
+++ b/keyboards/alu84/keymaps/turbomech/keymap.c
@@ -102,12 +102,6 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) {
102 return MACRO_NONE; 102 return MACRO_NONE;
103}; 103};
104 104
105 switch (id) {
106
107 }
108 return MACRO_NONE;
109}
110
111 105
112 106
113void matrix_scan_user(void) { 107void matrix_scan_user(void) {
diff --git a/keyboards/alu84/keymaps/TurboMech/readme.md b/keyboards/alu84/keymaps/turbomech/readme.md
index b78d7a5e7..b78d7a5e7 100644
--- a/keyboards/alu84/keymaps/TurboMech/readme.md
+++ b/keyboards/alu84/keymaps/turbomech/readme.md
diff --git a/keyboards/alu84/keymaps/TurboMech/rules.mk b/keyboards/alu84/keymaps/turbomech/rules.mk
index ff8b4b2e6..ff8b4b2e6 100644
--- a/keyboards/alu84/keymaps/TurboMech/rules.mk
+++ b/keyboards/alu84/keymaps/turbomech/rules.mk
diff --git a/keyboards/alu84/readme.md b/keyboards/alu84/readme.md
index 979a49d0f..9d23bff06 100644
--- a/keyboards/alu84/readme.md
+++ b/keyboards/alu84/readme.md
@@ -1,11 +1,15 @@
1ALU84 1ALU84
2=== 2===
3 3
4A 75% keyboard kit made and sold by mechkeys.ca [More info on mechkeys.ca](https://mechkeys.ca) 4![alu84](https://i.imgur.com/wBfazDc.jpg)
5
6A 75% keyboard made and sold by MECHKEYS [More info on MECHKEYS](https://mechkeys.ca).
5 7
6Keyboard Maintainer: [TurboMech](https://github.com/TurboMech) 8Keyboard Maintainer: [TurboMech](https://github.com/TurboMech)
9
7Hardware Supported: ALU84 10Hardware Supported: ALU84
8Hardware Availability: [mechkeys.ca](https://mechkeys.ca) 11
12Hardware Availability: [MECHKEYS](https://mechkeys.ca)
9 13
10Make example for this keyboard (after setting up your build environment): 14Make example for this keyboard (after setting up your build environment):
11 15
diff --git a/keyboards/mechmini/readme.md b/keyboards/mechmini/readme.md
index 56dd81a24..427cbbd03 100644
--- a/keyboards/mechmini/readme.md
+++ b/keyboards/mechmini/readme.md
@@ -1,6 +1,8 @@
1Mechmini 1Mechmini
2======== 2========
3 3
4![mechmini](https://cdn.shopify.com/s/files/1/1697/5323/products/20495451_468333093530388_1648547540_o_grande.jpg?v=1510792821)
5
4A 40% compact ortholinear/staggered keyboard. 6A 40% compact ortholinear/staggered keyboard.
5 7
6Version 1 was originally bootmapper (ps2avrGB) and can be ported to QMK following the v1 readme (../mechmini/v1/readme.md). This version is no longer in production. 8Version 1 was originally bootmapper (ps2avrGB) and can be ported to QMK following the v1 readme (../mechmini/v1/readme.md). This version is no longer in production.
@@ -8,8 +10,10 @@ Version 1 was originally bootmapper (ps2avrGB) and can be ported to QMK followin
8Version 2 (Mechmini 2.0) was shipped powered by QMK [More info on MECHKEYS](https://mechkeys.ca). 10Version 2 (Mechmini 2.0) was shipped powered by QMK [More info on MECHKEYS](https://mechkeys.ca).
9 11
10Keyboard Maintainer: QMK Community (version 1) & [TurboMech](https://github.com/TurboMech) (version 2 - aka Mechmini 2.0) 12Keyboard Maintainer: QMK Community (version 1) & [TurboMech](https://github.com/TurboMech) (version 2 - aka Mechmini 2.0)
13
11Hardware Supported: Mechmini keyboard 14Hardware Supported: Mechmini keyboard
12Hardware Availability: https://mechkeys.ca/collections/keyboards/products/mechmini-2-0 15
16Hardware Availability: [MECHKEYS](https://mechkeys.ca/collections/keyboards/products/mechmini-2-0)
13 17
14Make example for this keyboard (after setting up your build environment), this will make the Mechmini 2.0 default keymap (split space) - please see v1 readme for v1 make instructions: 18Make example for this keyboard (after setting up your build environment), this will make the Mechmini 2.0 default keymap (split space) - please see v1 readme for v1 make instructions:
15 19
diff --git a/keyboards/mechmini/v2/README.md b/keyboards/mechmini/v2/README.md
index e1efc9904..a43afc674 100644
--- a/keyboards/mechmini/v2/README.md
+++ b/keyboards/mechmini/v2/README.md
@@ -6,8 +6,10 @@ A 40% compact ortholinear/staggered keyboard.
6Version 2 (Mechmini 2.0) was shipped powered by QMK [More info on MECHKEYS](https://mechkeys.ca). 6Version 2 (Mechmini 2.0) was shipped powered by QMK [More info on MECHKEYS](https://mechkeys.ca).
7 7
8Keyboard Maintainer: [TurboMech](https://github.com/TurboMech) 8Keyboard Maintainer: [TurboMech](https://github.com/TurboMech)
9
9Hardware Supported: Mechmini 2.0 keyboard 10Hardware Supported: Mechmini 2.0 keyboard
10Hardware Availability: https://mechkeys.ca/collections/keyboards/products/mechmini-2-0 11
12Hardware Availability: [MECHKEYS Mechmini 2.0](https://mechkeys.ca/collections/keyboards/products/mechmini-2-0)
11 13
12Make example for this keyboard (after setting up your build environment), this will make the Mechmini 2.0 default keymap (split space): 14Make example for this keyboard (after setting up your build environment), this will make the Mechmini 2.0 default keymap (split space):
13 15