diff options
Diffstat (limited to 'keyboards/fc980c')
| -rw-r--r-- | keyboards/fc980c/config.h | 5 | ||||
| -rw-r--r-- | keyboards/fc980c/fc980c.c | 2 | ||||
| -rw-r--r-- | keyboards/fc980c/fc980c.h | 65 | ||||
| -rw-r--r-- | keyboards/fc980c/info.json | 212 | ||||
| -rw-r--r-- | keyboards/fc980c/matrix.c | 2 |
5 files changed, 115 insertions, 171 deletions
diff --git a/keyboards/fc980c/config.h b/keyboards/fc980c/config.h index 6356dd64ee..7c0c3b31a6 100644 --- a/keyboards/fc980c/config.h +++ b/keyboards/fc980c/config.h @@ -25,11 +25,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #define MATRIX_ROWS 8 #define MATRIX_COLS 16 -// #define MATRIX_ROW_PINS { B0, B2, B4, B5, B6 } -// #define MATRIX_COL_PINS { F5, B1, F0, F1, F4, B3, D7, D6, D4, D5, D3, D2, D1, D0 } - -//#define DIODE_DIRECTION - /* * Feature disable options * These options are also useful to firmware size reduction. diff --git a/keyboards/fc980c/fc980c.c b/keyboards/fc980c/fc980c.c index 744a3614a5..fc3696f244 100644 --- a/keyboards/fc980c/fc980c.c +++ b/keyboards/fc980c/fc980c.c @@ -15,7 +15,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 "fc980c.h" +#include "quantum.h" #ifdef ACTUATION_DEPTH_ADJUSTMENT #include "actuation_point.h" diff --git a/keyboards/fc980c/fc980c.h b/keyboards/fc980c/fc980c.h deleted file mode 100644 index ffb02e2579..0000000000 --- a/keyboards/fc980c/fc980c.h +++ /dev/null @@ -1,65 +0,0 @@ -/* -Copyright 2017 Balz Guenat - -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" - -/* ----------------------------------------------------------------------------------------------------------------------- -| K0D | | K2D | K5D | K3D | K6D | | K7D | K7F | K7E | K7C | | K72 | K71 | K70 | K73 | | K74 | K76 | K77 | K75 | ----------------------------------------------------------------------------------------------------------------------- ----------------------------------------------------------------------------------------------------------------------- -| K0A | K69 | K59 | K58 | K5B | K6F | K5F | K5E | K6C | K5C | K52 | K51 | K50 | K55 | | K54 | K56 | K57 | K65 | ----------------------------------------------------------------------------------------------------------------------- -| K6A | K39 | K68 | K6B | K3B | K3F | K6E | K3E | K3C | K62 | K61 | K60 | K33 | K53 | | K64 | K66 | K67 | | ----------------------------------------------------------------------------------------------------------------| K25 | -| K3A | K29 | K38 | K28 | K2B | K2F | K2E | K2C | K1C | K32 | K31 | K20 | K63 | | K24 | K26 | K27 | | ----------------------------------------------------------------------------------------------------------------------- -| K2A | K18 | K08 | K1B | K0B | K1F | K1E | K0E | K22 | K11 | K21 | K30 || K34 || K14 | K16 | K17 | | ----------------------------------------------------------------------------------------------------------------| K15 | -| K1A | K09 | K19 | K0F | K02 | K01 | K10 || K00 | K04 | K06 || K07 | K05 | | ----------------------------------------------------------------------------------------------------------------------- -*/ - -#define LAYOUT( \ - K0D, K2D, K5D, K3D, K6D, K7D, K7F, K7E, K7C, K72, K71, K70, K73, K74, K76, K77, K75, \ - K0A, K69, K59, K58, K5B, K6F, K5F, K5E, K6C, K5C, K52, K51, K50, K55, K54, K56, K57, K65, \ - K6A, K39, K68, K6B, K3B, K3F, K6E, K3E, K3C, K62, K61, K60, K33, K53, K64, K66, K67, K25, \ - K3A, K29, K38, K28, K2B, K2F, K2E, K2C, K1C, K32, K31, K20, K63, K24, K26, K27, \ - K2A, K18, K08, K1B, K0B, K1F, K1E, K0E, K22, K11, K21, K30, K34, K14, K16, K17, K15, \ - K1A, K09, K19, K0F, K02, K01, K10, K00, K04, K06, K07, K05 \ -) { \ - { K00, K01, K02, KC_NO, K04, K05, K06, K07, K08, K09, K0A, K0B, KC_NO, K0D, K0E, K0F }, \ - { K10, K11, KC_NO, KC_NO, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, KC_NO, K1E, K1F }, \ - { K20, K21, K22, KC_NO, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, K2F }, \ - { K30, K31, K32, K33, K34, KC_NO, KC_NO, KC_NO, K38, K39, K3A, K3B, K3C, K3D, K3E, K3F }, \ - { 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 }, \ - { K50, K51, K52, K53, K54, K55, K56, K57, K58, K59, KC_NO, K5B, K5C, K5D, K5E, K5F }, \ - { K60, K61, K62, K63, K64, K65, K66, K67, K68, K69, K6A, K6B, K6C, K6D, K6E, K6F }, \ - { K70, K71, K72, K73, K74, K75, K76, K77, KC_NO, KC_NO, KC_NO, KC_NO, K7C, K7D, K7E, K7F } \ -} -/* -LAYOUT( - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ \ -) -*/ - diff --git a/keyboards/fc980c/info.json b/keyboards/fc980c/info.json index 50cd3b9b27..27a10b6f51 100644 --- a/keyboards/fc980c/info.json +++ b/keyboards/fc980c/info.json @@ -19,104 +19,120 @@ "layouts": { "LAYOUT": { "layout": [ - {"label":"Esc", "x":0, "y":0}, - {"label":"F1", "x":2, "y":0}, - {"label":"F2", "x":3, "y":0}, - {"label":"F3", "x":4, "y":0}, - {"label":"F4", "x":5, "y":0}, - {"label":"F5", "x":6.5, "y":0}, - {"label":"F6", "x":7.5, "y":0}, - {"label":"F7", "x":8.5, "y":0}, - {"label":"F8", "x":9.5, "y":0}, - {"label":"F9", "x":11, "y":0}, - {"label":"F10", "x":12, "y":0}, - {"label":"F11", "x":13, "y":0}, - {"label":"F12", "x":14, "y":0}, - {"label":"Delete", "x":15.5, "y":0}, - {"label":"Insert", "x":16.5, "y":0}, - {"label":"Page Up", "x":17.5, "y":0}, - {"label":"Page Down", "x":18.5, "y":0}, - {"label":"`", "x":0, "y":1.5}, - {"label":"1", "x":1, "y":1.5}, - {"label":"2", "x":2, "y":1.5}, - {"label":"3", "x":3, "y":1.5}, - {"label":"4", "x":4, "y":1.5}, - {"label":"5", "x":5, "y":1.5}, - {"label":"6", "x":6, "y":1.5}, - {"label":"7", "x":7, "y":1.5}, - {"label":"8", "x":8, "y":1.5}, - {"label":"9", "x":9, "y":1.5}, - {"label":"0", "x":10, "y":1.5}, - {"label":"-", "x":11, "y":1.5}, - {"label":"=", "x":12, "y":1.5}, - {"label":"Backspace", "x":13, "y":1.5, "w":2}, - {"label":"Num Lock", "x":15.5, "y":1.5}, - {"label":"/", "x":16.5, "y":1.5}, - {"label":"*", "x":17.5, "y":1.5}, - {"label":"-", "x":18.5, "y":1.5}, - {"label":"Tab", "x":0, "y":2.5, "w":1.5}, - {"label":"Q", "x":1.5, "y":2.5}, - {"label":"W", "x":2.5, "y":2.5}, - {"label":"E", "x":3.5, "y":2.5}, - {"label":"R", "x":4.5, "y":2.5}, - {"label":"T", "x":5.5, "y":2.5}, - {"label":"Y", "x":6.5, "y":2.5}, - {"label":"U", "x":7.5, "y":2.5}, - {"label":"I", "x":8.5, "y":2.5}, - {"label":"O", "x":9.5, "y":2.5}, - {"label":"P", "x":10.5, "y":2.5}, - {"label":"[", "x":11.5, "y":2.5}, - {"label":"]", "x":12.5, "y":2.5}, - {"label":"\\", "x":13.5, "y":2.5, "w":1.5}, - {"label":"7", "x":15.5, "y":2.5}, - {"label":"8", "x":16.5, "y":2.5}, - {"label":"9", "x":17.5, "y":2.5}, - {"label":"+", "x":18.5, "y":2.5, "h":2}, - {"label":"Caps Lock", "x":0, "y":3.5, "w":1.75}, - {"label":"A", "x":1.75, "y":3.5}, - {"label":"S", "x":2.75, "y":3.5}, - {"label":"D", "x":3.75, "y":3.5}, - {"label":"F", "x":4.75, "y":3.5}, - {"label":"G", "x":5.75, "y":3.5}, - {"label":"H", "x":6.75, "y":3.5}, - {"label":"J", "x":7.75, "y":3.5}, - {"label":"K", "x":8.75, "y":3.5}, - {"label":"L", "x":9.75, "y":3.5}, - {"label":";", "x":10.75, "y":3.5}, - {"label":"'", "x":11.75, "y":3.5}, - {"label":"Enter", "x":12.75, "y":3.5, "w":2.25}, - {"label":"4", "x":15.5, "y":3.5}, - {"label":"5", "x":16.5, "y":3.5}, - {"label":"6", "x":17.5, "y":3.5}, - {"label":"Shift", "x":0, "y":4.5, "w":2.25}, - {"label":"Z", "x":2.25, "y":4.5}, - {"label":"X", "x":3.25, "y":4.5}, - {"label":"C", "x":4.25, "y":4.5}, - {"label":"V", "x":5.25, "y":4.5}, - {"label":"B", "x":6.25, "y":4.5}, - {"label":"N", "x":7.25, "y":4.5}, - {"label":"M", "x":8.25, "y":4.5}, - {"label":",", "x":9.25, "y":4.5}, - {"label":".", "x":10.25, "y":4.5}, - {"label":"/", "x":11.25, "y":4.5}, - {"label":"Shift", "x":12.25, "y":4.5, "w":1.75}, - {"label":"Up", "x":14.25, "y":4.75}, - {"label":"1", "x":15.5, "y":4.5}, - {"label":"2", "x":16.5, "y":4.5}, - {"label":"3", "x":17.5, "y":4.5}, - {"label":"Enter", "x":18.5, "y":4.5, "h":2}, - {"label":"Ctrl", "x":0, "y":5.5, "w":1.25}, - {"label":"Win", "x":1.25, "y":5.5}, - {"label":"Alt", "x":2.25, "y":5.5, "w":1.25}, - {"label":"Space", "x":3.5, "y":5.5, "w":6}, - {"label":"Alt", "x":9.5, "y":5.5, "w":1.25}, - {"label":"Ctrl", "x":10.75, "y":5.5}, - {"label":"Fn", "x":11.75, "y":5.5, "w":1.25}, - {"label":"Left", "x":13.25, "y":5.75}, - {"label":"Down", "x":14.25, "y":5.75}, - {"label":"Right", "x":15.25, "y":5.75}, - {"label":"0", "x":16.5, "y":5.5}, - {"label":".", "x":17.5, "y":5.5} + {"matrix": [0, 13], "x": 0, "y": 0}, + + {"matrix": [2, 13], "x": 2, "y": 0}, + {"matrix": [5, 13], "x": 3, "y": 0}, + {"matrix": [3, 13], "x": 4, "y": 0}, + {"matrix": [6, 13], "x": 5, "y": 0}, + + {"matrix": [7, 13], "x": 6.5, "y": 0}, + {"matrix": [7, 15], "x": 7.5, "y": 0}, + {"matrix": [7, 14], "x": 8.5, "y": 0}, + {"matrix": [7, 12], "x": 9.5, "y": 0}, + + {"matrix": [7, 2], "x": 11, "y": 0}, + {"matrix": [7, 1], "x": 12, "y": 0}, + {"matrix": [7, 0], "x": 13, "y": 0}, + {"matrix": [7, 3], "x": 14, "y": 0}, + + {"matrix": [7, 4], "x": 15.5, "y": 0}, + {"matrix": [7, 6], "x": 16.5, "y": 0}, + {"matrix": [7, 7], "x": 17.5, "y": 0}, + {"matrix": [7, 5], "x": 18.5, "y": 0}, + + {"matrix": [0, 10], "x": 0, "y": 1.5}, + {"matrix": [6, 9], "x": 1, "y": 1.5}, + {"matrix": [5, 9], "x": 2, "y": 1.5}, + {"matrix": [5, 8], "x": 3, "y": 1.5}, + {"matrix": [5, 11], "x": 4, "y": 1.5}, + {"matrix": [6, 15], "x": 5, "y": 1.5}, + {"matrix": [5, 15], "x": 6, "y": 1.5}, + {"matrix": [5, 14], "x": 7, "y": 1.5}, + {"matrix": [6, 12], "x": 8, "y": 1.5}, + {"matrix": [5, 12], "x": 9, "y": 1.5}, + {"matrix": [5, 2], "x": 10, "y": 1.5}, + {"matrix": [5, 1], "x": 11, "y": 1.5}, + {"matrix": [5, 0], "x": 12, "y": 1.5}, + {"matrix": [5, 5], "x": 13, "y": 1.5, "w": 2}, + + {"matrix": [5, 4], "x": 15.5, "y": 1.5}, + {"matrix": [5, 6], "x": 16.5, "y": 1.5}, + {"matrix": [5, 7], "x": 17.5, "y": 1.5}, + {"matrix": [6, 5], "x": 18.5, "y": 1.5}, + + {"matrix": [6, 10], "x": 0, "y": 2.5, "w": 1.5}, + {"matrix": [3, 9], "x": 1.5, "y": 2.5}, + {"matrix": [6, 8], "x": 2.5, "y": 2.5}, + {"matrix": [6, 11], "x": 3.5, "y": 2.5}, + {"matrix": [3, 11], "x": 4.5, "y": 2.5}, + {"matrix": [3, 15], "x": 5.5, "y": 2.5}, + {"matrix": [6, 14], "x": 6.5, "y": 2.5}, + {"matrix": [3, 14], "x": 7.5, "y": 2.5}, + {"matrix": [3, 12], "x": 8.5, "y": 2.5}, + {"matrix": [6, 2], "x": 9.5, "y": 2.5}, + {"matrix": [6, 1], "x": 10.5, "y": 2.5}, + {"matrix": [6, 0], "x": 11.5, "y": 2.5}, + {"matrix": [3, 3], "x": 12.5, "y": 2.5}, + {"matrix": [5, 3], "x": 13.5, "y": 2.5, "w": 1.5}, + + {"matrix": [6, 4], "x": 15.5, "y": 2.5}, + {"matrix": [6, 6], "x": 16.5, "y": 2.5}, + {"matrix": [6, 7], "x": 17.5, "y": 2.5}, + {"matrix": [2, 5], "x": 18.5, "y": 2.5, "h": 2}, + + {"matrix": [3, 10], "x": 0, "y": 3.5, "w": 1.75}, + {"matrix": [2, 9], "x": 1.75, "y": 3.5}, + {"matrix": [3, 8], "x": 2.75, "y": 3.5}, + {"matrix": [2, 8], "x": 3.75, "y": 3.5}, + {"matrix": [2, 11], "x": 4.75, "y": 3.5}, + {"matrix": [2, 15], "x": 5.75, "y": 3.5}, + {"matrix": [2, 14], "x": 6.75, "y": 3.5}, + {"matrix": [2, 12], "x": 7.75, "y": 3.5}, + {"matrix": [1, 12], "x": 8.75, "y": 3.5}, + {"matrix": [3, 2], "x": 9.75, "y": 3.5}, + {"matrix": [3, 1], "x": 10.75, "y": 3.5}, + {"matrix": [2, 0], "x": 11.75, "y": 3.5}, + {"matrix": [6, 3], "x": 12.75, "y": 3.5, "w": 2.25}, + + {"matrix": [2, 4], "x": 15.5, "y": 3.5}, + {"matrix": [2, 6], "x": 16.5, "y": 3.5}, + {"matrix": [2, 7], "x": 17.5, "y": 3.5}, + + {"matrix": [2, 10], "x": 0, "y": 4.5, "w": 2.25}, + {"matrix": [1, 8], "x": 2.25, "y": 4.5}, + {"matrix": [0, 8], "x": 3.25, "y": 4.5}, + {"matrix": [1, 11], "x": 4.25, "y": 4.5}, + {"matrix": [0, 11], "x": 5.25, "y": 4.5}, + {"matrix": [1, 15], "x": 6.25, "y": 4.5}, + {"matrix": [1, 14], "x": 7.25, "y": 4.5}, + {"matrix": [0, 14], "x": 8.25, "y": 4.5}, + {"matrix": [2, 2], "x": 9.25, "y": 4.5}, + {"matrix": [1, 1], "x": 10.25, "y": 4.5}, + {"matrix": [2, 1], "x": 11.25, "y": 4.5}, + {"matrix": [3, 0], "x": 12.25, "y": 4.5, "w": 1.75}, + + {"matrix": [3, 4], "x": 14.25, "y": 4.75}, + + {"matrix": [1, 4], "x": 15.5, "y": 4.5}, + {"matrix": [1, 6], "x": 16.5, "y": 4.5}, + {"matrix": [1, 7], "x": 17.5, "y": 4.5}, + {"matrix": [1, 5], "x": 18.5, "y": 4.5, "h": 2}, + + {"matrix": [1, 10], "x": 0, "y": 5.5, "w": 1.25}, + {"matrix": [0, 9], "x": 1.25, "y": 5.5}, + {"matrix": [1, 9], "x": 2.25, "y": 5.5, "w": 1.25}, + {"matrix": [0, 15], "x": 3.5, "y": 5.5, "w": 6}, + {"matrix": [0, 2], "x": 9.5, "y": 5.5, "w": 1.25}, + {"matrix": [0, 1], "x": 10.75, "y": 5.5}, + {"matrix": [1, 0], "x": 11.75, "y": 5.5, "w": 1.25}, + + {"matrix": [0, 0], "x": 13.25, "y": 5.75}, + {"matrix": [0, 4], "x": 14.25, "y": 5.75}, + {"matrix": [0, 6], "x": 15.25, "y": 5.75}, + + {"matrix": [0, 7], "x": 16.5, "y": 5.5}, + {"matrix": [0, 5], "x": 17.5, "y": 5.5} ] } } diff --git a/keyboards/fc980c/matrix.c b/keyboards/fc980c/matrix.c index f5c3ec08c7..6ea605600d 100644 --- a/keyboards/fc980c/matrix.c +++ b/keyboards/fc980c/matrix.c @@ -29,8 +29,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #include "matrix.h" #include "led.h" #include "avr/timer_avr.h" -// #include QMK_KEYBOARD_H - // Timer resolution check #if (1000000/TIMER_RAW_FREQ > 20) |