diff options
| author | noroadsleft <xxiinophobia@yahoo.com> | 2018-12-15 22:44:48 -0800 |
|---|---|---|
| committer | Drashna Jaelre <drashna@live.com> | 2018-12-18 09:15:28 -0800 |
| commit | 8181c8dc97ddd073a94430032c2505ec2e4d4a05 (patch) | |
| tree | b81a32efca79f7c10f968321729bde1e0a653076 /keyboards/fc980c | |
| parent | 06f19017839c25c4b41a16a9d9cf12b66ef8ade9 (diff) | |
| download | qmk_firmware-8181c8dc97ddd073a94430032c2505ec2e4d4a05.tar.gz qmk_firmware-8181c8dc97ddd073a94430032c2505ec2e4d4a05.zip | |
FC980C: refactor and Configurator update
- fc980c.h
- updated to #pragma once method
- layout macro visual alignment
- info.json
- fixed JSON ordering (keys were being assigned out-of-order)
- default keymap
- visual alignment
- deleted unused fn_actions block
Diffstat (limited to 'keyboards/fc980c')
| -rw-r--r-- | keyboards/fc980c/fc980c.h | 60 | ||||
| -rw-r--r-- | keyboards/fc980c/info.json | 197 |
2 files changed, 123 insertions, 134 deletions
diff --git a/keyboards/fc980c/fc980c.h b/keyboards/fc980c/fc980c.h index 74c468061..f20c102e5 100644 --- a/keyboards/fc980c/fc980c.h +++ b/keyboards/fc980c/fc980c.h | |||
| @@ -14,11 +14,9 @@ GNU General Public License for more details. | |||
| 14 | You should have received a copy of the GNU General Public License | 14 | You should have received a copy of the GNU General Public License |
| 15 | along with this program. If not, see <http://www.gnu.org/licenses/>. | 15 | along with this program. If not, see <http://www.gnu.org/licenses/>. |
| 16 | */ | 16 | */ |
| 17 | #ifndef FC980C_H | 17 | #pragma once |
| 18 | #define FC980C_H | ||
| 19 | 18 | ||
| 20 | #include "quantum.h" | 19 | #include "quantum.h" |
| 21 | // #include "quantum_keycodes.h" | ||
| 22 | 20 | ||
| 23 | /* | 21 | /* |
| 24 | ---------------------------------------------------------------------------------------------------------------------- | 22 | ---------------------------------------------------------------------------------------------------------------------- |
| @@ -37,41 +35,31 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. | |||
| 37 | ---------------------------------------------------------------------------------------------------------------------- | 35 | ---------------------------------------------------------------------------------------------------------------------- |
| 38 | */ | 36 | */ |
| 39 | 37 | ||
| 40 | #define LAYOUT( \ | 38 | #define LAYOUT( \ |
| 41 | K0D, K2D, K5D, K3D, K6D, K7D, K7F, K7E, K7C, K72, K71, K70, K73, K74, K76, K77, K75, \ | 39 | K0D, K2D, K5D, K3D, K6D, K7D, K7F, K7E, K7C, K72, K71, K70, K73, K74, K76, K77, K75, \ |
| 42 | K0A, K69, K59, K58, K5B, K6F, K5F, K5E, K6C, K5C, K52, K51, K50, K55, K54, K56, K57, K65, \ | 40 | K0A, K69, K59, K58, K5B, K6F, K5F, K5E, K6C, K5C, K52, K51, K50, K55, K54, K56, K57, K65, \ |
| 43 | K6A, K39, K68, K6B, K3B, K3F, K6E, K3E, K3C, K62, K61, K60, K33, K53, K64, K66, K67, K25, \ | 41 | K6A, K39, K68, K6B, K3B, K3F, K6E, K3E, K3C, K62, K61, K60, K33, K53, K64, K66, K67, K25, \ |
| 44 | K3A, K29, K38, K28, K2B, K2F, K2E, K2C, K1C, K32, K31, K20, K63, K24, K26, K27, \ | 42 | K3A, K29, K38, K28, K2B, K2F, K2E, K2C, K1C, K32, K31, K20, K63, K24, K26, K27, \ |
| 45 | K2A, K18, K08, K1B, K0B, K1F, K1E, K0E, K22, K11, K21, K30, K34, K14, K16, K17, K15, \ | 43 | K2A, K18, K08, K1B, K0B, K1F, K1E, K0E, K22, K11, K21, K30, K34, K14, K16, K17, K15, \ |
| 46 | K1A, K09, K19, K0F, K02, K01, K10, K00, K04, K06, K07, K05) \ | 44 | K1A, K09, K19, K0F, K02, K01, K10, K00, K04, K06, K07, K05 \ |
| 47 | { \ | 45 | ) { \ |
| 48 | {K00, K01, K02, KC_NO, K04, K05, K06, K07, \ | 46 | { K00, K01, K02, KC_NO, K04, K05, K06, K07, K08, K09, K0A, K0B, KC_NO, K0D, K0E, K0F }, \ |
| 49 | K08, K09, K0A, K0B, KC_NO, K0D, K0E, K0F}, \ | 47 | { K10, K11, KC_NO, KC_NO, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, KC_NO, K1E, K1F }, \ |
| 50 | {K10, K11, KC_NO, KC_NO, K14, K15, K16, K17, \ | 48 | { K20, K21, K22, KC_NO, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, K2F }, \ |
| 51 | K18, K19, K1A, K1B, K1C, KC_NO, K1E, K1F}, \ | 49 | { K30, K31, K32, K33, K34, KC_NO, KC_NO, KC_NO, K38, K39, K3A, K3B, K3C, K3D, K3E, K3F }, \ |
| 52 | {K20, K21, K22, KC_NO, K24, K25, K26, K27, \ | 50 | { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO }, \ |
| 53 | K28, K29, K2A, K2B, K2C, K2D, K2E, K2F}, \ | 51 | { K50, K51, K52, K53, K54, K55, K56, K57, K58, K59, KC_NO, K5B, K5C, K5D, K5E, K5F }, \ |
| 54 | {K30, K31, K32, K33, K34, KC_NO, KC_NO, KC_NO, \ | 52 | { K60, K61, K62, K63, K64, K65, K66, K67, K68, K69, K6A, K6B, K6C, K6D, K6E, K6F }, \ |
| 55 | K38, K39, K3A, K3B, K3C, K3D, K3E, K3F}, \ | 53 | { K70, K71, K72, K73, K74, K75, K76, K77, KC_NO, KC_NO, KC_NO, KC_NO, K7C, K7D, K7E, K7F } \ |
| 56 | {KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, \ | 54 | } |
| 57 | KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO}, \ | ||
| 58 | {K50, K51, K52, K53, K54, K55, K56, K57, \ | ||
| 59 | K58, K59, KC_NO, K5B, K5C, K5D, K5E, K5F}, \ | ||
| 60 | {K60, K61, K62, K63, K64, K65, K66, K67, \ | ||
| 61 | K68, K69, K6A, K6B, K6C, K6D, K6E, K6F}, \ | ||
| 62 | { \ | ||
| 63 | K70, K71, K72, K73, K74, K75, K76, K77, \ | ||
| 64 | KC_NO, KC_NO, KC_NO, KC_NO, K7C, K7D, K7E, K7F \ | ||
| 65 | } \ | ||
| 66 | } | ||
| 67 | /* | 55 | /* |
| 68 | LAYOUT( | 56 | LAYOUT( |
| 69 | _______, _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______, _______,_______,_______,_______, | 57 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ |
| 70 | _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______, _______,_______,_______,_______, | 58 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ |
| 71 | _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______, _______,_______,_______,_______, | 59 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ |
| 72 | _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______, _______, _______,_______,_______, | 60 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ |
| 73 | _______, _______,_______,_______,_______,_______,_______,_______,_______,_______,_______, _______, _______, _______,_______,_______,_______, | 61 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ |
| 74 | _______,_______,_______, _______, _______,_______,_______, _______,_______,_______, _______,_______ | 62 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ \ |
| 75 | ) | 63 | ) |
| 76 | */ | 64 | */ |
| 77 | 65 | ||
diff --git a/keyboards/fc980c/info.json b/keyboards/fc980c/info.json index f3007f2f8..a15ff216c 100644 --- a/keyboards/fc980c/info.json +++ b/keyboards/fc980c/info.json | |||
| @@ -6,105 +6,106 @@ | |||
| 6 | "height": 6.75, | 6 | "height": 6.75, |
| 7 | "layouts": { | 7 | "layouts": { |
| 8 | "LAYOUT": { | 8 | "LAYOUT": { |
| 9 | "key_count": 98, | ||
| 9 | "layout": [ | 10 | "layout": [ |
| 10 | { "label": "Esc", "x": 0, "y": 0 }, | 11 | {"label":"Esc", "x":0, "y":0}, |
| 11 | { "label": "F1", "x": 2, "y": 0 }, | 12 | {"label":"F1", "x":2, "y":0}, |
| 12 | { "label": "F2", "x": 3, "y": 0 }, | 13 | {"label":"F2", "x":3, "y":0}, |
| 13 | { "label": "F3", "x": 4, "y": 0 }, | 14 | {"label":"F3", "x":4, "y":0}, |
| 14 | { "label": "F4", "x": 5, "y": 0 }, | 15 | {"label":"F4", "x":5, "y":0}, |
| 15 | { "label": "F5", "x": 6.5, "y": 0 }, | 16 | {"label":"F5", "x":6.5, "y":0}, |
| 16 | { "label": "F6", "x": 7.5, "y": 0 }, | 17 | {"label":"F6", "x":7.5, "y":0}, |
| 17 | { "label": "F7", "x": 8.5, "y": 0 }, | 18 | {"label":"F7", "x":8.5, "y":0}, |
| 18 | { "label": "F8", "x": 9.5, "y": 0 }, | 19 | {"label":"F8", "x":9.5, "y":0}, |
| 19 | { "label": "F9", "x": 11, "y": 0 }, | 20 | {"label":"F9", "x":11, "y":0}, |
| 20 | { "label": "F10", "x": 12, "y": 0 }, | 21 | {"label":"F10", "x":12, "y":0}, |
| 21 | { "label": "F11", "x": 13, "y": 0 }, | 22 | {"label":"F11", "x":13, "y":0}, |
| 22 | { "label": "F12", "x": 14, "y": 0 }, | 23 | {"label":"F12", "x":14, "y":0}, |
| 23 | { "label": "Delete", "x": 15.5, "y": 0 }, | 24 | {"label":"Delete", "x":15.5, "y":0}, |
| 24 | { "label": "Insert", "x": 16.5, "y": 0 }, | 25 | {"label":"Insert", "x":16.5, "y":0}, |
| 25 | { "label": "Pg Up", "x": 17.5, "y": 0 }, | 26 | {"label":"Page Up", "x":17.5, "y":0}, |
| 26 | { "label": "Pg Dn", "x": 18.5, "y": 0 }, | 27 | {"label":"Page Down", "x":18.5, "y":0}, |
| 27 | { "label": "~", "x": 0, "y": 1.5 }, | 28 | {"label":"`", "x":0, "y":1.5}, |
| 28 | { "label": "!", "x": 1, "y": 1.5 }, | 29 | {"label":"1", "x":1, "y":1.5}, |
| 29 | { "label": "@", "x": 2, "y": 1.5 }, | 30 | {"label":"2", "x":2, "y":1.5}, |
| 30 | { "label": "#", "x": 3, "y": 1.5 }, | 31 | {"label":"3", "x":3, "y":1.5}, |
| 31 | { "label": "$", "x": 4, "y": 1.5 }, | 32 | {"label":"4", "x":4, "y":1.5}, |
| 32 | { "label": "%", "x": 5, "y": 1.5 }, | 33 | {"label":"5", "x":5, "y":1.5}, |
| 33 | { "label": "^", "x": 6, "y": 1.5 }, | 34 | {"label":"6", "x":6, "y":1.5}, |
| 34 | { "label": "&", "x": 7, "y": 1.5 }, | 35 | {"label":"7", "x":7, "y":1.5}, |
| 35 | { "label": "*", "x": 8, "y": 1.5 }, | 36 | {"label":"8", "x":8, "y":1.5}, |
| 36 | { "label": "(", "x": 9, "y": 1.5 }, | 37 | {"label":"9", "x":9, "y":1.5}, |
| 37 | { "label": ")", "x": 10, "y": 1.5 }, | 38 | {"label":"0", "x":10, "y":1.5}, |
| 38 | { "label": "_", "x": 11, "y": 1.5 }, | 39 | {"label":"-", "x":11, "y":1.5}, |
| 39 | { "label": "+", "x": 12, "y": 1.5 }, | 40 | {"label":"=", "x":12, "y":1.5}, |
| 40 | { "label": "Backspace", "x": 13, "y": 1.5, "w": 2 }, | 41 | {"label":"Backspace", "x":13, "y":1.5, "w":2}, |
| 41 | { "label": "Num Lock", "x": 15.5, "y": 1.5 }, | 42 | {"label":"Num Lock", "x":15.5, "y":1.5}, |
| 42 | { "label": "/", "x": 16.5, "y": 1.5 }, | 43 | {"label":"/", "x":16.5, "y":1.5}, |
| 43 | { "label": "*", "x": 17.5, "y": 1.5 }, | 44 | {"label":"*", "x":17.5, "y":1.5}, |
| 44 | { "label": "-", "x": 18.5, "y": 1.5 }, | 45 | {"label":"-", "x":18.5, "y":1.5}, |
| 45 | { "label": "Tab", "x": 0, "y": 2.5, "w": 1.5 }, | 46 | {"label":"Tab", "x":0, "y":2.5, "w":1.5}, |
| 46 | { "label": "Q", "x": 1.5, "y": 2.5 }, | 47 | {"label":"Q", "x":1.5, "y":2.5}, |
| 47 | { "label": "W", "x": 2.5, "y": 2.5 }, | 48 | {"label":"W", "x":2.5, "y":2.5}, |
| 48 | { "label": "E", "x": 3.5, "y": 2.5 }, | 49 | {"label":"E", "x":3.5, "y":2.5}, |
| 49 | { "label": "R", "x": 4.5, "y": 2.5 }, | 50 | {"label":"R", "x":4.5, "y":2.5}, |
| 50 | { "label": "T", "x": 5.5, "y": 2.5 }, | 51 | {"label":"T", "x":5.5, "y":2.5}, |
| 51 | { "label": "Y", "x": 6.5, "y": 2.5 }, | 52 | {"label":"Y", "x":6.5, "y":2.5}, |
| 52 | { "label": "U", "x": 7.5, "y": 2.5 }, | 53 | {"label":"U", "x":7.5, "y":2.5}, |
| 53 | { "label": "I", "x": 8.5, "y": 2.5 }, | 54 | {"label":"I", "x":8.5, "y":2.5}, |
| 54 | { "label": "O", "x": 9.5, "y": 2.5 }, | 55 | {"label":"O", "x":9.5, "y":2.5}, |
| 55 | { "label": "P", "x": 10.5, "y": 2.5 }, | 56 | {"label":"P", "x":10.5, "y":2.5}, |
| 56 | { "label": "{", "x": 11.5, "y": 2.5 }, | 57 | {"label":"[", "x":11.5, "y":2.5}, |
| 57 | { "label": "}", "x": 12.5, "y": 2.5 }, | 58 | {"label":"]", "x":12.5, "y":2.5}, |
| 58 | { "label": "|", "x": 13.5, "y": 2.5, "w": 1.5 }, | 59 | {"label":"\\", "x":13.5, "y":2.5, "w":1.5}, |
| 59 | { "label": "7", "x": 15.5, "y": 2.5 }, | 60 | {"label":"7", "x":15.5, "y":2.5}, |
| 60 | { "label": "8", "x": 16.5, "y": 2.5 }, | 61 | {"label":"8", "x":16.5, "y":2.5}, |
| 61 | { "label": "9", "x": 17.5, "y": 2.5 }, | 62 | {"label":"9", "x":17.5, "y":2.5}, |
| 62 | { "label": "+", "x": 18.5, "y": 2.5, "h": 2 }, | 63 | {"label":"+", "x":18.5, "y":2.5, "h":2}, |
| 63 | { "label": "Caps Lock", "x": 0, "y": 3.5, "w": 1.75 }, | 64 | {"label":"Caps Lock", "x":0, "y":3.5, "w":1.75}, |
| 64 | { "label": "A", "x": 1.75, "y": 3.5 }, | 65 | {"label":"A", "x":1.75, "y":3.5}, |
| 65 | { "label": "S", "x": 2.75, "y": 3.5 }, | 66 | {"label":"S", "x":2.75, "y":3.5}, |
| 66 | { "label": "D", "x": 3.75, "y": 3.5 }, | 67 | {"label":"D", "x":3.75, "y":3.5}, |
| 67 | { "label": "F", "x": 4.75, "y": 3.5 }, | 68 | {"label":"F", "x":4.75, "y":3.5}, |
| 68 | { "label": "G", "x": 5.75, "y": 3.5 }, | 69 | {"label":"G", "x":5.75, "y":3.5}, |
| 69 | { "label": "H", "x": 6.75, "y": 3.5 }, | 70 | {"label":"H", "x":6.75, "y":3.5}, |
| 70 | { "label": "J", "x": 7.75, "y": 3.5 }, | 71 | {"label":"J", "x":7.75, "y":3.5}, |
| 71 | { "label": "K", "x": 8.75, "y": 3.5 }, | 72 | {"label":"K", "x":8.75, "y":3.5}, |
| 72 | { "label": "L", "x": 9.75, "y": 3.5 }, | 73 | {"label":"L", "x":9.75, "y":3.5}, |
| 73 | { "label": ":", "x": 10.75, "y": 3.5 }, | 74 | {"label":";", "x":10.75, "y":3.5}, |
| 74 | { "label": "\"", "x": 11.75, "y": 3.5 }, | 75 | {"label":"'", "x":11.75, "y":3.5}, |
| 75 | { "label": "Enter", "x": 12.75, "y": 3.5, "w": 2.25 }, | 76 | {"label":"Enter", "x":12.75, "y":3.5, "w":2.25}, |
| 76 | { "label": "4", "x": 15.5, "y": 3.5 }, | 77 | {"label":"4", "x":15.5, "y":3.5}, |
| 77 | { "label": "5", "x": 16.5, "y": 3.5 }, | 78 | {"label":"5", "x":16.5, "y":3.5}, |
| 78 | { "label": "6", "x": 17.5, "y": 3.5 }, | 79 | {"label":"6", "x":17.5, "y":3.5}, |
| 79 | { "label": "Shift", "x": 0, "y": 4.5, "w": 2.25 }, | 80 | {"label":"Shift", "x":0, "y":4.5, "w":2.25}, |
| 80 | { "label": "Z", "x": 2.25, "y": 4.5 }, | 81 | {"label":"Z", "x":2.25, "y":4.5}, |
| 81 | { "label": "X", "x": 3.25, "y": 4.5 }, | 82 | {"label":"X", "x":3.25, "y":4.5}, |
| 82 | { "label": "C", "x": 4.25, "y": 4.5 }, | 83 | {"label":"C", "x":4.25, "y":4.5}, |
| 83 | { "label": "V", "x": 5.25, "y": 4.5 }, | 84 | {"label":"V", "x":5.25, "y":4.5}, |
| 84 | { "label": "B", "x": 6.25, "y": 4.5 }, | 85 | {"label":"B", "x":6.25, "y":4.5}, |
| 85 | { "label": "N", "x": 7.25, "y": 4.5 }, | 86 | {"label":"N", "x":7.25, "y":4.5}, |
| 86 | { "label": "M", "x": 8.25, "y": 4.5 }, | 87 | {"label":"M", "x":8.25, "y":4.5}, |
| 87 | { "label": "<", "x": 9.25, "y": 4.5 }, | 88 | {"label":",", "x":9.25, "y":4.5}, |
| 88 | { "label": ">", "x": 10.25, "y": 4.5 }, | 89 | {"label":".", "x":10.25, "y":4.5}, |
| 89 | { "label": "?", "x": 11.25, "y": 4.5 }, | 90 | {"label":"/", "x":11.25, "y":4.5}, |
| 90 | { "label": "Shift", "x": 12.25, "y": 4.5, "w": 1.75 }, | 91 | {"label":"Shift", "x":12.25, "y":4.5, "w":1.75}, |
| 91 | { "label": "1", "x": 15.5, "y": 4.5 }, | 92 | {"label":"Up", "x":14.25, "y":4.75}, |
| 92 | { "label": "2", "x": 16.5, "y": 4.5 }, | 93 | {"label":"1", "x":15.5, "y":4.5}, |
| 93 | { "label": "3", "x": 17.5, "y": 4.5 }, | 94 | {"label":"2", "x":16.5, "y":4.5}, |
| 94 | { "label": "Enter", "x": 18.5, "y": 4.5, "h": 2 }, | 95 | {"label":"3", "x":17.5, "y":4.5}, |
| 95 | { "label": "\u2191", "x": 14.25, "y": 4.75 }, | 96 | {"label":"Enter", "x":18.5, "y":4.5, "h":2}, |
| 96 | { "label": "Ctrl", "x": 0, "y": 5.5, "w": 1.25 }, | 97 | {"label":"Ctrl", "x":0, "y":5.5, "w":1.25}, |
| 97 | { "label": "Win", "x": 1.25, "y": 5.5 }, | 98 | {"label":"Win", "x":1.25, "y":5.5}, |
| 98 | { "label": "Alt", "x": 2.25, "y": 5.5, "w": 1.25 }, | 99 | {"label":"Alt", "x":2.25, "y":5.5, "w":1.25}, |
| 99 | { "x": 3.5, "y": 5.5, "w": 6 }, | 100 | {"label":"Space", "x":3.5, "y":5.5, "w":6}, |
| 100 | { "label": "Alt", "x": 9.5, "y": 5.5, "w": 1.25 }, | 101 | {"label":"Alt", "x":9.5, "y":5.5, "w":1.25}, |
| 101 | { "label": "Ctrl", "x": 10.75, "y": 5.5 }, | 102 | {"label":"Ctrl", "x":10.75, "y":5.5}, |
| 102 | { "label": "Fn", "x": 11.75, "y": 5.5, "w": 1.25 }, | 103 | {"label":"Fn", "x":11.75, "y":5.5, "w":1.25}, |
| 103 | { "label": "0", "x": 16.5, "y": 5.5 }, | 104 | {"label":"Left", "x":13.25, "y":5.75}, |
| 104 | { "label": ".", "x": 17.5, "y": 5.5 }, | 105 | {"label":"Down", "x":14.25, "y":5.75}, |
| 105 | { "label": "\u2190", "x": 13.25, "y": 5.75 }, | 106 | {"label":"Right", "x":15.25, "y":5.75}, |
| 106 | { "label": "\u2193", "x": 14.25, "y": 5.75 }, | 107 | {"label":"0", "x":16.5, "y":5.5}, |
| 107 | { "label": "\u2192", "x": 15.25, "y": 5.75 } | 108 | {"label":".", "x":17.5, "y":5.5} |
| 108 | ] | 109 | ] |
| 109 | } | 110 | } |
| 110 | } | 111 | } |
