~ruther/qmk_firmware

d417b0cc7d2ec231950f596e7604ba27879ee411 — fauxpark 6 years ago b12b269
Tidy up ALF X1.1 (#6367)

* Tidy up ALF X1.1

* Correct x positions

* 4 spaces

* Remove a stray TRNS key
M keyboards/alf/x11/info.json => keyboards/alf/x11/info.json +109 -100
@@ 1,103 1,112 @@
{
    "keyboard_name": "QMK80",
    "url": "",
    "maintainer": "qmk",
    "width": 18.25,
    "height": 6.5,
    "layouts": {
      "LAYOUT": {
        "key_count": 88,
        "layout": [
          {"label":"K00", "x":0, "y":0},
          {"label":"K01", "x":2, "y":0},
          {"label":"K02", "x":3, "y":0},
          {"label":"K03", "x":4, "y":0},
          {"label":"K04", "x":5, "y":0},
          {"label":"K05", "x":6.5, "y":0},
          {"label":"K06", "x":7.5, "y":0},
          {"label":"K07", "x":8.5, "y":0},
          {"label":"K08", "x":9.5, "y":0},
          {"label":"K09", "x":11, "y":0},
          {"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":"K61", "x":16.25, "y":0},
          {"label":"K62", "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},
          {"label":"K13", "x":3, "y":1.5},
          {"label":"K14", "x":4, "y":1.5},
          {"label":"K15", "x":5, "y":1.5},
          {"label":"K16", "x":6, "y":1.5},
          {"label":"K17", "x":7, "y":1.5},
          {"label":"K18", "x":8, "y":1.5},
          {"label":"K19", "x":9, "y":1.5},
          {"label":"K1A", "x":10, "y":1.5},
          {"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},
          {"label":"K23", "x":3.5, "y":2.5},
          {"label":"K24", "x":4.5, "y":2.5},
          {"label":"K25", "x":5.5, "y":2.5},
          {"label":"K26", "x":6.5, "y":2.5},
          {"label":"K27", "x":7.5, "y":2.5},
          {"label":"K28", "x":8.5, "y":2.5},
          {"label":"K29", "x":9.5, "y":2.5},
          {"label":"K2A", "x":10.5, "y":2.5},
          {"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},
          {"label":"K33", "x":3.75, "y":3.5},
          {"label":"K34", "x":4.75, "y":3.5},
          {"label":"K35", "x":5.75, "y":3.5},
          {"label":"K36", "x":6.75, "y":3.5},
          {"label":"K37", "x":7.75, "y":3.5},
          {"label":"K38", "x":8.75, "y":3.5},
          {"label":"K39", "x":9.75, "y":3.5},
          {"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},
          {"label":"K43", "x":4.25, "y":4.5},
          {"label":"K44", "x":5.25, "y":4.5},
          {"label":"K45", "x":6.25, "y":4.5},
          {"label":"K46", "x":7.25, "y":4.5},
          {"label":"K47", "x":8.25, "y":4.5},
          {"label":"K48", "x":9.25, "y":4.5},
          {"label":"K49", "x":10.25, "y":4.5},
          {"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},
          {"label":"K53", "x":3.75, "y":5.5, "w":6.25},
          {"label":"K54", "x":10, "y":5.5, "w":1.25},
          {"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}
        ]
      }
  "keyboard_name": "x11",
  "url": "",
  "maintainer": "qmk",
  "width": 18.25,
  "height": 6.5,
  "layouts": {
    "LAYOUT": {
      "key_count": 88,
      "layout": [
        {"label":"K00", "x":0, "y":0},
        {"label":"K01", "x":2, "y":0},
        {"label":"K02", "x":3, "y":0},
        {"label":"K03", "x":4, "y":0},
        {"label":"K04", "x":5, "y":0},
        {"label":"K05", "x":6.5, "y":0},
        {"label":"K06", "x":7.5, "y":0},
        {"label":"K07", "x":8.5, "y":0},
        {"label":"K08", "x":9.5, "y":0},
        {"label":"K09", "x":11, "y":0},
        {"label":"K0A", "x":12, "y":0},
        {"label":"K0B", "x":13, "y":0},
        {"label":"K0C", "x":14, "y":0},

        {"label":"K62", "x":15.25, "y":0},
        {"label":"K61", "x":16.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},
        {"label":"K13", "x":3, "y":1.5},
        {"label":"K14", "x":4, "y":1.5},
        {"label":"K15", "x":5, "y":1.5},
        {"label":"K16", "x":6, "y":1.5},
        {"label":"K17", "x":7, "y":1.5},
        {"label":"K18", "x":8, "y":1.5},
        {"label":"K19", "x":9, "y":1.5},
        {"label":"K1A", "x":10, "y":1.5},
        {"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},
        {"label":"K23", "x":3.5, "y":2.5},
        {"label":"K24", "x":4.5, "y":2.5},
        {"label":"K25", "x":5.5, "y":2.5},
        {"label":"K26", "x":6.5, "y":2.5},
        {"label":"K27", "x":7.5, "y":2.5},
        {"label":"K28", "x":8.5, "y":2.5},
        {"label":"K29", "x":9.5, "y":2.5},
        {"label":"K2A", "x":10.5, "y":2.5},
        {"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},
        {"label":"K33", "x":3.75, "y":3.5},
        {"label":"K34", "x":4.75, "y":3.5},
        {"label":"K35", "x":5.75, "y":3.5},
        {"label":"K36", "x":6.75, "y":3.5},
        {"label":"K37", "x":7.75, "y":3.5},
        {"label":"K38", "x":8.75, "y":3.5},
        {"label":"K39", "x":9.75, "y":3.5},
        {"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},
        {"label":"K43", "x":4.25, "y":4.5},
        {"label":"K44", "x":5.25, "y":4.5},
        {"label":"K45", "x":6.25, "y":4.5},
        {"label":"K46", "x":7.25, "y":4.5},
        {"label":"K47", "x":8.25, "y":4.5},
        {"label":"K48", "x":9.25, "y":4.5},
        {"label":"K49", "x":10.25, "y":4.5},
        {"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},
        {"label":"K53", "x":3.75, "y":5.5, "w":6.25},
        {"label":"K54", "x":10, "y":5.5, "w":1.25},
        {"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}
      ]
    }
  }
  
\ No newline at end of file
}

M keyboards/alf/x11/keymaps/default/keymap.c => keyboards/alf/x11/keymaps/default/keymap.c +18 -59
@@ 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( \
    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_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_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_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_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_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  \
  ),

    [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_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_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_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_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_LGUI, KC_LALT,                            KC_SPC,                             KC_RALT, MO(1),   KC_RGUI, KC_RCTL,     KC_LEFT, KC_DOWN, KC_RGHT
    ),
    [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) {

}

M keyboards/alf/x11/x11.c => keyboards/alf/x11/x11.c +34 -33
@@ 16,48 16,49 @@
#include "x11.h"

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);
	matrix_init_user();
    // put your keyboard start-up code here
    // runs once when the firmware starts up

    setPinOutput(C6);
    setPinOutput(E6);
    setPinOutput(C7);
    matrix_init_user();
}

void matrix_scan_kb(void) {
	// put your looping keyboard code here
	// runs every cycle (a lot)
    // put your looping keyboard code here
    // runs every cycle (a lot)

	matrix_scan_user();
    matrix_scan_user();
}

bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
	// put your per-action keyboard code here
	// runs for every action, just before processing by the firmware
    // put your per-action keyboard code here
    // runs for every action, just before processing by the firmware

	return process_record_user(keycode, record);
    return process_record_user(keycode, record);
}

void led_set_kb(uint8_t usb_led) {
	// put your keyboard LED indicator (ex: Caps Lock LED) toggling code here

	if (IS_LED_ON(usb_led, USB_LED_CAPS_LOCK)) {
		writePinLow(C6);
	} else {
		writePinHigh(C6);
	}

	if (IS_LED_ON(usb_led, USB_LED_NUM_LOCK)) {
		writePinLow(E6);
	} else {
		writePinHigh(E6);
	}

	if (IS_LED_ON(usb_led, USB_LED_SCROLL_LOCK)) {
		writePinLow(C7);
	} else {
		writePinHigh(C7);
	}

	led_set_user(usb_led);
    // put your keyboard LED indicator (ex: Caps Lock LED) toggling code here

    if (IS_LED_ON(usb_led, USB_LED_CAPS_LOCK)) {
        writePinLow(C6);
    } else {
        writePinHigh(C6);
    }

    if (IS_LED_ON(usb_led, USB_LED_NUM_LOCK)) {
        writePinLow(E6);
    } else {
        writePinHigh(E6);
    }

    if (IS_LED_ON(usb_led, USB_LED_SCROLL_LOCK)) {
        writePinLow(C7);
    } else {
        writePinHigh(C7);
    }

    led_set_user(usb_led);
}

M keyboards/alf/x11/x11.h => keyboards/alf/x11/x11.h +13 -13
@@ 26,18 26,18 @@
 * represents the switch matrix.
 */
#define LAYOUT( \
  K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K62, K61, K60, \
  K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K5A, K63, K65, K67, \
  K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K4C, K64, K66, K68, \
  K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, \
  K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K69, K58, \
  K50, K51, K52, K53, K54, K55, K56, K57, K6A, K59, K6B  \
    K00,      K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C,      K62, K61, K60, \
    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K5A,      K63, K65, K67, \
    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K4C,      K64, K66, K68, \
    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B,      K3C, \
    K40,      K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K69,           K58, \
    K50, K51, K52,                K53,                K54, K55, K56, K57,      K6A, K59, K6B  \
) { \
  {   K00,   K01,   K02,   K03,   K04,   K05,   K06,   K07,   K08,   K09,   K0A,   K0B,   K0C   }, \
  {   K10,   K11,   K12,   K13,   K14,   K15,   K16,   K17,   K18,   K19,   K1A,   K1B,   K1C   }, \
  {   K20,   K21,   K22,   K23,   K24,   K25,   K26,   K27,   K28,   K29,   K2A,   K2B,   K2C   }, \
  {   K30,   K31,   K32,   K33,   K34,   K35,   K36,   K37,   K38,   K39,   K3A,   K3B,   K3C   }, \
  {   K40,   K41,   K42,   K43,   K44,   K45,   K46,   K47,   K48,   K49,   K4A,   K4B,   K4C   }, \
  {   K50,   K51,   K52,   K53,   K54,   K55,   K56,   K57,   K58,   K59,   K5A,   KC_NO, KC_NO }, \
  {   K60,   K61,   K62,   K63,   K64,   K65,   K66,   K67,   K68,   K69,   K6A,   K6B,   KC_NO }, \
    { K00,   K01,   K02,   K03,   K04,   K05,   K06,   K07,   K08,   K09,   K0A,   K0B,   K0C   }, \
    { K10,   K11,   K12,   K13,   K14,   K15,   K16,   K17,   K18,   K19,   K1A,   K1B,   K1C   }, \
    { K20,   K21,   K22,   K23,   K24,   K25,   K26,   K27,   K28,   K29,   K2A,   K2B,   K2C   }, \
    { K30,   K31,   K32,   K33,   K34,   K35,   K36,   K37,   K38,   K39,   K3A,   K3B,   K3C   }, \
    { K40,   K41,   K42,   K43,   K44,   K45,   K46,   K47,   K48,   K49,   K4A,   K4B,   K4C   }, \
    { K50,   K51,   K52,   K53,   K54,   K55,   K56,   K57,   K58,   K59,   K5A,   KC_NO, KC_NO }, \
    { K60,   K61,   K62,   K63,   K64,   K65,   K66,   K67,   K68,   K69,   K6A,   K6B,   KC_NO }, \
}