Tidy up ALF X1.1 (#6367)

* Tidy up ALF X1.1

* Correct x positions

* 4 spaces

* Remove a stray TRNS key

keyboards/alf/x11/info.json

@@ -1,5 +1,5 @@
 {
-    "keyboard_name": "QMK80",
+  "keyboard_name": "x11",
   "url": "",
   "maintainer": "qmk",
   "width": 18.25,
@@ -21,9 +21,11 @@
         {"label":"K0A", "x":12, "y":0},
         {"label":"K0B", "x":13, "y":0},
         {"label":"K0C", "x":14, "y":0},
-          {"label":"K60", "x":15.25, "y":0},
+
+        {"label":"K62", "x":15.25, "y":0},
         {"label":"K61", "x":16.25, "y":0},
-          {"label":"K62", "x":17.25, "y":0},
+        {"label":"K60", "x":17.25, "y":0},
+
         {"label":"K10", "x":0, "y":1.5},
         {"label":"K11", "x":1, "y":1.5},
         {"label":"K12", "x":2, "y":1.5},
@@ -38,9 +40,11 @@
         {"label":"K1B", "x":11, "y":1.5},
         {"label":"K1C", "x":12, "y":1.5},
         {"label":"K5A", "x":13, "y":1.5, "w":2},
+
         {"label":"K63", "x":15.25, "y":1.5},
         {"label":"K65", "x":16.25, "y":1.5},
         {"label":"K67", "x":17.25, "y":1.5},
+
         {"label":"K20", "x":0, "y":2.5, "w":1.5},
         {"label":"K21", "x":1.5, "y":2.5},
         {"label":"K22", "x":2.5, "y":2.5},
@@ -55,9 +59,11 @@
         {"label":"K2B", "x":11.5, "y":2.5},
         {"label":"K2C", "x":12.5, "y":2.5},
         {"label":"K4C", "x":13.5, "y":2.5, "w":1.5},
+
         {"label":"K64", "x":15.25, "y":2.5},
         {"label":"K66", "x":16.25, "y":2.5},
         {"label":"K68", "x":17.25, "y":2.5},
+
         {"label":"K30", "x":0, "y":3.5, "w":1.75},
         {"label":"K31", "x":1.75, "y":3.5},
         {"label":"K32", "x":2.75, "y":3.5},
@@ -71,6 +77,7 @@
         {"label":"K3A", "x":10.75, "y":3.5},
         {"label":"K3B", "x":11.75, "y":3.5},
         {"label":"K3C", "x":12.75, "y":3.5, "w":2.25},
+
         {"label":"K40", "x":0, "y":4.5, "w":2.25},
         {"label":"K41", "x":2.25, "y":4.5},
         {"label":"K42", "x":3.25, "y":4.5},
@@ -84,7 +91,9 @@
         {"label":"K4A", "x":11.25, "y":4.5},
         {"label":"K4B", "x":12.25, "y":4.5, "w":1.75},
         {"label":"K69", "x":14, "y":4.5},
+
         {"label":"K58", "x":16.25, "y":4.5},
+
         {"label":"K50", "x":0, "y":5.5, "w":1.25},
         {"label":"K51", "x":1.25, "y":5.5, "w":1.25},
         {"label":"K52", "x":2.5, "y":5.5, "w":1.25},
@@ -93,11 +102,11 @@
         {"label":"K55", "x":11.25, "y":5.5, "w":1.25},
         {"label":"K56", "x":12.5, "y":5.5, "w":1.25},
         {"label":"K57", "x":13.75, "y":5.5, "w":1.25},
+
         {"label":"K6A", "x":15.25, "y":5.5},
         {"label":"K59", "x":16.25, "y":5.5},
         {"label":"K6B", "x":17.25, "y":5.5}
       ]
     }
   }
-  }
+}
-  

keyboards/alf/x11/keymaps/default/keymap.c

@@ -15,64 +15,23 @@
  */
 #include QMK_KEYBOARD_H
 
-// Defines the keycodes used by our macros in process_record_user
-enum custom_keycodes {
-  QMKBEST = SAFE_RANGE,
-  QMKURL
-};
-
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  [0] = LAYOUT( \
+    [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_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_PSCR, KC_SLCK, KC_PAUS,
-    KC_PSCR, KC_SLCK, KC_PAUS, 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_INS,  KC_HOME, KC_PGUP, KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    \
+        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_INS,  KC_HOME, KC_PGUP,
-    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL,  KC_END,  KC_PGDN, KC_CAPS, KC_A,    \
+        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_DEL,  KC_END,  KC_PGDN,
-    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_ENT,  KC_LSFT, KC_Z,    \
+        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_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, MO(1),   KC_UP,   KC_LCTL, \
+        KC_LSFT,          KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, MO(1),                KC_UP,
-    KC_LGUI, KC_LALT, KC_SPC,  KC_RALT, MO(1),   KC_RGUI, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT  \
+        KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             KC_RALT, MO(1),   KC_RGUI, KC_RCTL,     KC_LEFT, KC_DOWN, KC_RGHT
-  ),
-  [1] = LAYOUT( \
-    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, \
-    KC_TRNS, KC_TRNS, RESET,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, \
-    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, BL_TOGG, BL_DEC,  BL_INC,  BL_STEP, KC_TRNS, KC_TRNS, \
-    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MUTE, KC_MPLY, KC_MSTP, RGB_TOG, RGB_MOD, \
-    RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, \
-    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_VAI, KC_TRNS, \
-    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_MOD, RGB_VAD, RGB_SAD  \
     ),
-
+    [1] = LAYOUT(
+        _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,     _______, _______, RESET,
+
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,     _______, _______, _______,
+        BL_TOGG, BL_DEC,  BL_INC,  BL_STEP, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,     KC_MUTE, KC_MPLY, KC_MSTP,
+        RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______, _______,          _______,
+        _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,              _______,
+        _______, _______, _______,                            _______,                            _______, _______, _______, _______,     _______, _______, _______
+    )
 };
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  switch (keycode) {
-    case QMKBEST:
-      if (record->event.pressed) {
-        // when keycode QMKBEST is pressed
-        SEND_STRING("QMK is the best thing ever!");
-      } else {
-        // when keycode QMKBEST is released
-      }
-      break;
-    case QMKURL:
-      if (record->event.pressed) {
-        // when keycode QMKURL is pressed
-        SEND_STRING("https://qmk.fm/" SS_TAP(X_ENTER));
-      } else {
-        // when keycode QMKURL is released
-      }
-      break;
-  }
-  return true;
-}
-
-void matrix_init_user(void) {
-
-}
-
-void matrix_scan_user(void) {
-
-}
-
-void led_set_user(uint8_t usb_led) {
-
-}

keyboards/alf/x11/x11.c

@@ -18,6 +18,7 @@
 void matrix_init_kb(void) {
     // put your keyboard start-up code here
     // runs once when the firmware starts up
+
     setPinOutput(C6);
     setPinOutput(E6);
     setPinOutput(C7);