Added FC980C Config (#2850)

6 files changed, 222 insertions, 108 deletions

diff --git a/keyboards/fc980c/fc980c.h b/keyboards/fc980c/fc980c.h
index c3992bbed..74c468061 100644
--- a/keyboards/fc980c/fc980c.h
+++ b/keyboards/fc980c/fc980c.h
@@ -37,33 +37,35 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 ----------------------------------------------------------------------------------------------------------------------
 */
 
-#define KEYMAP(                                                                           \
-    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   }  \
-}
+#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                                \
+        }                                                                                     \
+    }
 /*
-KEYMAP(
+LAYOUT(
     _______,        _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,                         _______,_______,_______,_______,
     _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,                         _______,_______,_______,_______,
     _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,                         _______,_______,_______,_______,
diff --git a/keyboards/fc980c/info.json b/keyboards/fc980c/info.json
new file mode 100644
index 000000000..f3007f2f8
--- /dev/null
+++ b/keyboards/fc980c/info.json
@@ -0,0 +1,111 @@
+{
+  "keyboard_name": "fc980c",
+  "url": "",
+  "maintainer": "qmk",
+  "width": 19.5,
+  "height": 6.75,
+  "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": "Pg Up", "x": 17.5, "y": 0 },
+        { "label": "Pg Dn", "x": 18.5, "y": 0 },
+        { "label": "~", "x": 0, "y": 1.5 },
+        { "label": "!", "x": 1, "y": 1.5 },
+        { "label": "@", "x": 2, "y": 1.5 },
+        { "label": "#", "x": 3, "y": 1.5 },
+        { "label": "$", "x": 4, "y": 1.5 },
+        { "label": "%", "x": 5, "y": 1.5 },
+        { "label": "^", "x": 6, "y": 1.5 },
+        { "label": "&", "x": 7, "y": 1.5 },
+        { "label": "*", "x": 8, "y": 1.5 },
+        { "label": "(", "x": 9, "y": 1.5 },
+        { "label": ")", "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": "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": "\u2191", "x": 14.25, "y": 4.75 },
+        { "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 },
+        { "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": "0", "x": 16.5, "y": 5.5 },
+        { "label": ".", "x": 17.5, "y": 5.5 },
+        { "label": "\u2190", "x": 13.25, "y": 5.75 },
+        { "label": "\u2193", "x": 14.25, "y": 5.75 },
+        { "label": "\u2192", "x": 15.25, "y": 5.75 }
+      ]
+    }
+  }
+}
diff --git a/keyboards/fc980c/keymaps/actuation-point-example/keymap.c b/keyboards/fc980c/keymaps/actuation-point-example/keymap.c
index dcecd86b9..ac993ae6b 100644
--- a/keyboards/fc980c/keymaps/actuation-point-example/keymap.c
+++ b/keyboards/fc980c/keymaps/actuation-point-example/keymap.c
@@ -14,10 +14,11 @@ 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/>.
 */
-#include "fc980c.h"
+#include QMK_KEYBOARD_H
 #include "actuation_point.h"
 
-enum custom_keycodes {
+enum custom_keycodes
+{
     AP_UP = SAFE_RANGE, // Higher actuation point, more sensitive
     AP_DN,              // Lower actuation point, less sensitive
     AP_READ_RDAC,       // Prints current RDAC value to console
@@ -25,53 +26,59 @@ enum custom_keycodes {
 };
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  [0] = KEYMAP(
-    KC_ESC,      KC_F1,KC_F2,KC_F3,KC_F4,KC_F5,KC_F6,KC_F7,KC_F8,  KC_F9,  KC_F10, KC_F11, KC_F12,                          KC_DEL, KC_INS, KC_PGUP,KC_PGDN,
-    KC_GRV, KC_1,KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9,   KC_0,   KC_MINS,KC_EQL, KC_BSPC,                         KC_NLCK,KC_PSLS,KC_PAST,KC_PMNS,
-    KC_TAB, KC_Q,KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O,   KC_P,   KC_LBRC,KC_RBRC,KC_BSLS,                         KC_P7,  KC_P8,  KC_P9,  KC_PPLS,
-    MO(1) , KC_A,KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L,   KC_SCLN,KC_QUOT,        KC_ENT,                          KC_P4,  KC_P5,  KC_P6,
-    KC_LSFT,     KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM,KC_DOT, KC_SLSH,        KC_RSFT,         KC_UP,          KC_P1,  KC_P2,  KC_P3,  KC_PENT,
-    KC_LCTL,KC_LGUI,KC_LALT,                     KC_SPC,                   KC_RALT,KC_RCTL,MO(1),   KC_LEFT,KC_DOWN,KC_RGHT,        KC_P0,  KC_PDOT
-    ),
-  [1] = KEYMAP(
-    _______,        _______,_______,_______,_______,_______,_______,      _______,      _______,AP_READ_RDAC,AP_READ_EEPROM,AP_DN,AP_UP,                        _______,_______,KC_HOME,KC_END,
-    _______,_______,_______,_______,_______,_______,_______,_______,      _______,      _______,_______,_______,_______,_______,                        _______,_______,_______,_______,
-    KC_CAPS,KC_MPRV,KC_VOLU,KC_MNXT,KC_PGUP,KC_INS,KC_HOME, LCTL(KC_LEFT),LCTL(KC_RGHT),KC_END, KC_PSCR,KC_SLCK,KC_PAUS,_______,                        _______,_______,_______,_______,
-    _______,KC_MUTE,KC_VOLD,KC_MPLY,KC_PGDN,KC_DEL,KC_LEFT, KC_DOWN,      KC_UP,        KC_RGHT,_______,_______,        _______,                        _______,_______,_______,
-    _______,        _______,_______,_______,_______,_______,LCTL(KC_BSPC),LCTL(KC_DEL), _______,_______,_______,        _______,         KC_PGUP,       _______,_______,_______,_______,
-    _______,_______,_______,                           _______,                                         _______,KC_APP, _______, KC_HOME,KC_PGDN,KC_END,        _______,_______     
-    ),
+    [0] = LAYOUT(
+        KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, KC_INS, KC_PGUP, KC_PGDN,
+        KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS,
+        KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_P7, KC_P8, KC_P9, KC_PPLS,
+        MO(1), KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_P4, KC_P5, KC_P6,
+        KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_P1, KC_P2, KC_P3, KC_PENT,
+        KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RCTL, MO(1), KC_LEFT, KC_DOWN, KC_RGHT, KC_P0, KC_PDOT),
+    [1] = LAYOUT(
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, AP_READ_RDAC, AP_READ_EEPROM, AP_DN, AP_UP, _______, _______, KC_HOME, KC_END,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        KC_CAPS, KC_MPRV, KC_VOLU, KC_MNXT, KC_PGUP, KC_INS, KC_HOME, LCTL(KC_LEFT), LCTL(KC_RGHT), KC_END, KC_PSCR, KC_SLCK, KC_PAUS, _______, _______, _______, _______, _______,
+        _______, KC_MUTE, KC_VOLD, KC_MPLY, KC_PGDN, KC_DEL, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, LCTL(KC_BSPC), LCTL(KC_DEL), _______, _______, _______, _______, KC_PGUP, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, KC_APP, _______, KC_HOME, KC_PGDN, KC_END, _______, _______),
 };
 
-void matrix_init_user(void) {
-};
+void matrix_init_user(void){};
 
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-    if (record->event.pressed) {
-        switch(keycode) {
-            case AP_UP: {
-                actuation_point_up();
-                return false;
-            }
-            case AP_DN: {
-                actuation_point_down();
-                return false;
-            }
-            case AP_READ_RDAC: {
-                xprintf("RDAC: %d", read_rdac());
-                return false;
-            }
-            case AP_READ_EEPROM: {
-                xprintf("EEPROM: %d", read_eeprom());
-                return false;
-            }
+bool process_record_user(uint16_t keycode, keyrecord_t *record)
+{
+    if (record->event.pressed)
+    {
+        switch (keycode)
+        {
+        case AP_UP:
+        {
+            actuation_point_up();
+            return false;
+        }
+        case AP_DN:
+        {
+            actuation_point_down();
+            return false;
+        }
+        case AP_READ_RDAC:
+        {
+            xprintf("RDAC: %d", read_rdac());
+            return false;
+        }
+        case AP_READ_EEPROM:
+        {
+            xprintf("EEPROM: %d", read_eeprom());
+            return false;
+        }
 
-            default: return true;
+        default:
+            return true;
         }
-    } else {
+    }
+    else
+    {
         return true;
     }
 };
 
-const uint16_t PROGMEM fn_actions[] = {
-};
+const uint16_t PROGMEM fn_actions[] = {};
diff --git a/keyboards/fc980c/keymaps/coloneljesus/keymap.c b/keyboards/fc980c/keymaps/coloneljesus/keymap.c
index d82a616eb..26d476ab6 100644
--- a/keyboards/fc980c/keymaps/coloneljesus/keymap.c
+++ b/keyboards/fc980c/keymaps/coloneljesus/keymap.c
@@ -14,26 +14,23 @@ 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/>.
 */
-#include "fc980c.h"
+#include QMK_KEYBOARD_H
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  [0] = KEYMAP(
-    KC_ESC,      KC_F1,KC_F2,KC_F3,KC_F4,KC_F5,KC_F6,KC_F7,KC_F8,  KC_F9,  KC_F10, KC_F11, KC_F12,                          KC_DEL, KC_INS, KC_PGUP,KC_PGDN,
-    KC_GRV, KC_1,KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9,   KC_0,   KC_MINS,KC_EQL, KC_BSPC,                         KC_NLCK,KC_PSLS,KC_PAST,KC_PMNS,
-    KC_TAB, KC_Q,KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O,   KC_P,   KC_LBRC,KC_RBRC,KC_BSLS,                         KC_P7,  KC_P8,  KC_P9,  KC_PPLS,
-    MO(1) , KC_A,KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L,   KC_SCLN,KC_QUOT,        KC_ENT,                          KC_P4,  KC_P5,  KC_P6,
-    KC_LSFT,     KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM,KC_DOT, KC_SLSH,        KC_RSFT,         KC_UP,          KC_P1,  KC_P2,  KC_P3,  KC_PENT,
-    KC_LCTL,KC_LGUI,KC_LALT,                     KC_SPC,                   KC_RALT,KC_RCTL,MO(1),   KC_LEFT,KC_DOWN,KC_RGHT,        KC_P0,  KC_PDOT
-    ),
-  [1] = KEYMAP(
-    _______,        _______,_______,_______,_______,_______,_______,      _______,      _______,_______,_______,_______,_______,                        _______,_______,KC_HOME,KC_END,
-    _______,_______,_______,_______,_______,_______,_______,_______,      _______,      _______,_______,_______,_______,_______,                        _______,_______,_______,_______,
-    KC_CAPS,KC_MPRV,KC_VOLU,KC_MNXT,KC_PGUP,KC_INS,KC_HOME, LCTL(KC_LEFT),LCTL(KC_RGHT),KC_END, KC_PSCR,KC_SLCK,KC_PAUS,_______,                        _______,_______,_______,_______,
-    _______,KC_MUTE,KC_VOLD,KC_MPLY,KC_PGDN,KC_DEL,KC_LEFT, KC_DOWN,      KC_UP,        KC_RGHT,_______,_______,        _______,                        _______,_______,_______,
-    _______,        _______,_______,_______,_______,_______,LCTL(KC_BSPC),LCTL(KC_DEL), _______,_______,_______,        _______,         KC_PGUP,       _______,_______,_______,_______,
-    _______,_______,_______,                           _______,                                         _______,KC_APP, _______, KC_HOME,KC_PGDN,KC_END,        _______,_______     
-    ),
+    [0] = LAYOUT(
+        KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, KC_INS, KC_PGUP, KC_PGDN,
+        KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS,
+        KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_P7, KC_P8, KC_P9, KC_PPLS,
+        MO(1), KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_P4, KC_P5, KC_P6,
+        KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_P1, KC_P2, KC_P3, KC_PENT,
+        KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RCTL, MO(1), KC_LEFT, KC_DOWN, KC_RGHT, KC_P0, KC_PDOT),
+    [1] = LAYOUT(
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_HOME, KC_END,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        KC_CAPS, KC_MPRV, KC_VOLU, KC_MNXT, KC_PGUP, KC_INS, KC_HOME, LCTL(KC_LEFT), LCTL(KC_RGHT), KC_END, KC_PSCR, KC_SLCK, KC_PAUS, _______, _______, _______, _______, _______,
+        _______, KC_MUTE, KC_VOLD, KC_MPLY, KC_PGDN, KC_DEL, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, LCTL(KC_BSPC), LCTL(KC_DEL), _______, _______, _______, _______, KC_PGUP, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, KC_APP, _______, KC_HOME, KC_PGDN, KC_END, _______, _______),
 };
 
-const uint16_t PROGMEM fn_actions[] = {
-};
+const uint16_t PROGMEM fn_actions[] = {};
diff --git a/keyboards/fc980c/keymaps/default/keymap.c b/keyboards/fc980c/keymaps/default/keymap.c
index 4a1872ad0..b3f7bb7b1 100644
--- a/keyboards/fc980c/keymaps/default/keymap.c
+++ b/keyboards/fc980c/keymaps/default/keymap.c
@@ -14,26 +14,23 @@ 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/>.
 */
-#include "fc980c.h"
+#include QMK_KEYBOARD_H
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  [0] = KEYMAP(
-    KC_ESC,      KC_F1,KC_F2,KC_F3,KC_F4,KC_F5,KC_F6,KC_F7,KC_F8,  KC_F9,  KC_F10, KC_F11, KC_F12,                          KC_DEL, KC_INS, KC_PGUP,KC_PGDN,
-    KC_GRV, KC_1,KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9,   KC_0,   KC_MINS,KC_EQL, KC_BSPC,                         KC_NLCK,KC_PSLS,KC_PAST,KC_PMNS,
-    KC_TAB, KC_Q,KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O,   KC_P,   KC_LBRC,KC_RBRC,KC_BSLS,                         KC_P7,  KC_P8,  KC_P9,  KC_PPLS,
-    KC_CAPS,KC_A,KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L,   KC_SCLN,KC_QUOT,        KC_ENT,                          KC_P4,  KC_P5,  KC_P6,
-    KC_LSFT,     KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM,KC_DOT, KC_SLSH,        KC_RSFT,         KC_UP,          KC_P1,  KC_P2,  KC_P3,  KC_PENT,
-    KC_LCTL,KC_LGUI,KC_LALT,                     KC_SPC,                   KC_RALT,KC_RCTL,MO(1),   KC_LEFT,KC_DOWN,KC_RGHT,        KC_P0,  KC_PDOT
-    ),
-  [1] = KEYMAP(
-    _______,        _______,_______,_______,_______,_______,_______,_______, _______, _______, _______,_______,_______,                        _______,_______,KC_HOME,KC_END,
-    _______,_______,_______,_______,_______,_______,_______,_______,_______, _______, _______, _______,_______,_______,                        _______,_______,_______,_______,
-    _______,_______,_______,_______,_______,_______,_______,_______,KC_PSCR, KC_SLCK, KC_PAUS, _______,_______,_______,                        _______,_______,_______,_______,
-    _______,_______,_______,_______,_______,_______,_______,_______,_______, _______, _______, _______,        _______,                        _______,_______,_______,
-    _______,        _______,_______,_______,_______,_______,_______,_______, _______, _______, _______,        _______,         KC_PGUP,       _______,_______,_______,_______,
-    _______,_______,_______,                           _______,                                _______,KC_APP, _______, KC_HOME,KC_PGDN,KC_END,        _______,_______     
-    ),
+    [0] = LAYOUT(
+        KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, KC_INS, KC_PGUP, KC_PGDN,
+        KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS,
+        KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_P7, KC_P8, KC_P9, KC_PPLS,
+        KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_P4, KC_P5, KC_P6,
+        KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_P1, KC_P2, KC_P3, KC_PENT,
+        KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RCTL, MO(1), KC_LEFT, KC_DOWN, KC_RGHT, KC_P0, KC_PDOT),
+    [1] = LAYOUT(
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_HOME, KC_END,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, KC_PSCR, KC_SLCK, KC_PAUS, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_PGUP, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, KC_APP, _______, KC_HOME, KC_PGDN, KC_END, _______, _______),
 };
 
-const uint16_t PROGMEM fn_actions[] = {
-};
+const uint16_t PROGMEM fn_actions[] = {};
diff --git a/keyboards/fc980c/matrix.c b/keyboards/fc980c/matrix.c
index bde0f3c13..1126f3047 100644
--- a/keyboards/fc980c/matrix.c
+++ b/keyboards/fc980c/matrix.c
@@ -28,7 +28,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include "timer.h"
 #include "matrix.h"
 #include "led.h"
-// #include "fc980c.h"
+// #include QMK_KEYBOARD_H
 
 
 // Timer resolution check