Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware
This commit is contained in:
		
						commit
						75c24499f3
					
				
					 8 changed files with 1848 additions and 108 deletions
				
			
		| 
						 | 
				
			
			@ -43,6 +43,9 @@ KEYBOARD_LAYOUTS = {
 | 
			
		|||
    ]
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
ROW_INDENTS = {
 | 
			
		||||
    'ergodox_ez': [0, 0, 0, 0, 0, 1, 0, 0, 0, 2, 5, 0, 6, 0, 4, 0]
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
BLANK_LAYOUTS = [
 | 
			
		||||
# Compact Layout
 | 
			
		||||
| 
						 | 
				
			
			@ -591,16 +594,43 @@ def unicode_macro_cases(config):
 | 
			
		|||
        )
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
def iter_keymap_lines(keymap):
 | 
			
		||||
def iter_keymap_lines(keymap, row_indents=None):
 | 
			
		||||
    col_widths = {}
 | 
			
		||||
    col = 0
 | 
			
		||||
    # first pass, figure out the column widths
 | 
			
		||||
    prev_row_index = None
 | 
			
		||||
    for code, row_index in keymap.values():
 | 
			
		||||
        if row_index != prev_row_index:
 | 
			
		||||
            col = 0
 | 
			
		||||
            if row_indents:
 | 
			
		||||
                col = row_indents[row_index]
 | 
			
		||||
        col_widths[col] = max(len(code), col_widths.get(col, 0))
 | 
			
		||||
        prev_row_index = row_index
 | 
			
		||||
        col += 1
 | 
			
		||||
 | 
			
		||||
    # second pass, yield the cell values
 | 
			
		||||
    col = 0
 | 
			
		||||
    prev_row_index = None
 | 
			
		||||
    for key_index in sorted(keymap):
 | 
			
		||||
        code, row_index = keymap[key_index]
 | 
			
		||||
        if row_index != prev_row_index:
 | 
			
		||||
            col = 0
 | 
			
		||||
            yield "\n"
 | 
			
		||||
            if row_indents:
 | 
			
		||||
                for indent_col in range(row_indents[row_index]):
 | 
			
		||||
                    pad = " " * (col_widths[indent_col] - 4)
 | 
			
		||||
                    yield (" /*-*/" + pad)
 | 
			
		||||
                col = row_indents[row_index]
 | 
			
		||||
        else:
 | 
			
		||||
            yield pad
 | 
			
		||||
        yield " {}".format(code)
 | 
			
		||||
        if key_index < len(keymap) - 1:
 | 
			
		||||
            yield ","
 | 
			
		||||
            # This will be yielded on the next iteration when
 | 
			
		||||
            # we know that we're not at the end of a line.
 | 
			
		||||
            pad = " " * (col_widths[col] - len(code))
 | 
			
		||||
        prev_row_index = row_index
 | 
			
		||||
        col += 1
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
def iter_keymap_parts(config, keymaps):
 | 
			
		||||
| 
						 | 
				
			
			@ -628,11 +658,12 @@ def iter_keymap_parts(config, keymaps):
 | 
			
		|||
        # comment
 | 
			
		||||
        layer_lines = config['layer_lines'][layer_name]
 | 
			
		||||
        prefixed_lines = " * " + " * ".join(layer_lines)
 | 
			
		||||
        yield "/*\n{}*/\n".format(prefixed_lines)
 | 
			
		||||
        yield "/*\n{} */\n".format(prefixed_lines)
 | 
			
		||||
 | 
			
		||||
        # keymap codes
 | 
			
		||||
        keymap = keymaps[layer_name]
 | 
			
		||||
        keymap_lines = "".join(iter_keymap_lines(keymap))
 | 
			
		||||
        row_indents = ROW_INDENTS.get(config['layout'])
 | 
			
		||||
        keymap_lines = "".join(iter_keymap_lines(keymap, row_indents))
 | 
			
		||||
        yield "[L{0}] = KEYMAP({1}\n),\n".format(i, keymap_lines)
 | 
			
		||||
 | 
			
		||||
    yield "};\n\n"
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -127,22 +127,22 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 | 
			
		|||
 *                   !     !     !-----! !-----!     !     !
 | 
			
		||||
 *                   |BSPC |LSFT | ESC | ! PGDN|ENTER|SPACE|
 | 
			
		||||
 *                   '-----------------' '-----------------'
 | 
			
		||||
*/
 | 
			
		||||
 */
 | 
			
		||||
[L0] = KEYMAP(
 | 
			
		||||
 MO(5), DE_1, DE_2, DE_3, DE_4, DE_5, DE_ACUT,
 | 
			
		||||
 MO(4), DE_X, DE_P, DE_F, DE_W, DE_G, KC_HOME,
 | 
			
		||||
 MO(1), DE_U, DE_I, DE_A, DE_E, DE_O,
 | 
			
		||||
 MO(3), DE_UE, DE_OE, DE_AE, DE_C, DE_V, KC_END,
 | 
			
		||||
 KC_TRNS, KC_TRNS, KC_LGUI, KC_LALT, KC_LCTL,
 | 
			
		||||
 KC_INS, TG(2),
 | 
			
		||||
 KC_APP,
 | 
			
		||||
 KC_BSPC, KC_LSFT, KC_ESC,
 | 
			
		||||
 DE_GRV, DE_6, DE_7, DE_8, DE_9, DE_0, DE_CIRC,
 | 
			
		||||
 TG(2), DE_H, DE_J, DE_K, DE_L, DE_Q, DE_Z,
 | 
			
		||||
 DE_S, DE_N, DE_R, DE_T, DE_D, DE_SS,
 | 
			
		||||
 KC_TAB, DE_B, DE_M, DE_COMM, DE_DOT, KC_UP, DE_Y,
 | 
			
		||||
 KC_RCTL, KC_RALT, KC_LEFT, KC_DOWN, KC_RGHT,
 | 
			
		||||
 M(UM), KC_DELT,
 | 
			
		||||
 MO(5),   DE_1,     DE_2,     DE_3,    DE_4,    DE_5,    DE_ACUT,
 | 
			
		||||
 MO(4),   DE_X,     DE_P,     DE_F,    DE_W,    DE_G,    KC_HOME,
 | 
			
		||||
 MO(1),   DE_U,     DE_I,     DE_A,    DE_E,    DE_O,
 | 
			
		||||
 MO(3),   DE_UE,    DE_OE,    DE_AE,   DE_C,    DE_V,    KC_END,
 | 
			
		||||
 KC_TRNS, KC_TRNS,  KC_LGUI,  KC_LALT, KC_LCTL,
 | 
			
		||||
 /*-*/    /*-*/     /*-*/     /*-*/    /*-*/    KC_INS,  TG(2),
 | 
			
		||||
 /*-*/    /*-*/     /*-*/     /*-*/    /*-*/    /*-*/    KC_APP,
 | 
			
		||||
 /*-*/    /*-*/     /*-*/     /*-*/    KC_BSPC, KC_LSFT, KC_ESC,
 | 
			
		||||
 DE_GRV,  DE_6,     DE_7,     DE_8,    DE_9,    DE_0,    DE_CIRC,
 | 
			
		||||
 TG(2),   DE_H,     DE_J,     DE_K,    DE_L,    DE_Q,    DE_Z,
 | 
			
		||||
 /*-*/    DE_S,     DE_N,     DE_R,    DE_T,    DE_D,    DE_SS,
 | 
			
		||||
 KC_TAB,  DE_B,     DE_M,     DE_COMM, DE_DOT,  KC_UP,   DE_Y,
 | 
			
		||||
 /*-*/    /*-*/     KC_RCTL,  KC_RALT, KC_LEFT, KC_DOWN, KC_RGHT,
 | 
			
		||||
 M(UM),   KC_DELT,
 | 
			
		||||
 KC_PGUP,
 | 
			
		||||
 KC_PGDN, KC_ENTER, KC_SPACE
 | 
			
		||||
),
 | 
			
		||||
| 
						 | 
				
			
			@ -165,21 +165,21 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 | 
			
		|||
 *                   !     !     !-----! !-----!     !     !
 | 
			
		||||
 *                   |     |     |     | !     |     |     |
 | 
			
		||||
 *                   '-----------------' '-----------------'
 | 
			
		||||
*/
 | 
			
		||||
 */
 | 
			
		||||
[L1] = KEYMAP(
 | 
			
		||||
 KC_TRNS, DE_EXLM, DE_DQOT, DE_PARA, KC_TRNS, KC_TRNS, KC_TRNS,
 | 
			
		||||
 KC_TRNS, DE_ASTR, DE_PIPE, DE_SLSH, DE_LCBR, DE_RCBR, KC_TRNS,
 | 
			
		||||
 KC_TRNS, DE_UNDS, DE_MINS, DE_AMPR, DE_LBRC, DE_RBRC,
 | 
			
		||||
 KC_TRNS, KC_TRNS, DE_PLUS, DE_EQL, KC_TRNS, KC_TRNS, KC_TRNS,
 | 
			
		||||
 KC_TRNS, DE_EXLM, DE_DQOT, DE_PARA, KC_TRNS,               KC_TRNS,               KC_TRNS,
 | 
			
		||||
 KC_TRNS, DE_ASTR, DE_PIPE, DE_SLSH, DE_LCBR,               DE_RCBR,               KC_TRNS,
 | 
			
		||||
 KC_TRNS, DE_UNDS, DE_MINS, DE_AMPR, DE_LBRC,               DE_RBRC,
 | 
			
		||||
 KC_TRNS, KC_TRNS, DE_PLUS, DE_EQL,  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, KC_TRNS, DE_RING, KC_TRNS,
 | 
			
		||||
 KC_TRNS, DE_HASH, DE_LESS, DE_MORE, KC_TRNS, DE_DQOT, KC_TRNS,
 | 
			
		||||
 DE_DLR, DE_LPRN, DE_RPRN, DE_TILD, DE_QUOT, DE_QST,
 | 
			
		||||
 KC_TRNS, DE_BSLS, DE_PERC, DE_SCLN, DE_COLN, M(UC_UPWARDS_ARROW), KC_TRNS,
 | 
			
		||||
 KC_TRNS, KC_TRNS, M(UC_LEFTWARDS_ARROW), M(UC_DOWNWARDS_ARROW), M(UC_RIGHTWARDS_ARROW),
 | 
			
		||||
 /*-*/    /*-*/    /*-*/    /*-*/    /*-*/                  KC_TRNS,               KC_TRNS,
 | 
			
		||||
 /*-*/    /*-*/    /*-*/    /*-*/    /*-*/                  /*-*/                  KC_TRNS,
 | 
			
		||||
 /*-*/    /*-*/    /*-*/    /*-*/    KC_TRNS,               KC_TRNS,               KC_TRNS,
 | 
			
		||||
 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,               DE_RING,               KC_TRNS,
 | 
			
		||||
 KC_TRNS, DE_HASH, DE_LESS, DE_MORE, KC_TRNS,               DE_DQOT,               KC_TRNS,
 | 
			
		||||
 /*-*/    DE_DLR,  DE_LPRN, DE_RPRN, DE_TILD,               DE_QUOT,               DE_QST,
 | 
			
		||||
 KC_TRNS, DE_BSLS, DE_PERC, DE_SCLN, DE_COLN,               M(UC_UPWARDS_ARROW),   KC_TRNS,
 | 
			
		||||
 /*-*/    /*-*/    KC_TRNS, KC_TRNS, M(UC_LEFTWARDS_ARROW), M(UC_DOWNWARDS_ARROW), M(UC_RIGHTWARDS_ARROW),
 | 
			
		||||
 KC_TRNS, KC_TRNS,
 | 
			
		||||
 KC_TRNS,
 | 
			
		||||
 KC_TRNS, KC_TRNS, KC_TRNS
 | 
			
		||||
| 
						 | 
				
			
			@ -203,21 +203,21 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 | 
			
		|||
 *                   !     !     !-----! !-----!     !     !
 | 
			
		||||
 *                   |     |     |     | !     |     |     |
 | 
			
		||||
 *                   '-----------------' '-----------------'
 | 
			
		||||
*/
 | 
			
		||||
 */
 | 
			
		||||
[L2] = KEYMAP(
 | 
			
		||||
 KC_TRNS, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F11,
 | 
			
		||||
 KC_TRNS, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F11,
 | 
			
		||||
 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, 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_F12, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_PEQL,
 | 
			
		||||
 KC_TRNS, KC_TRNS, KC_P7, KC_P8, KC_P9, KC_PAST, KC_PSLS,
 | 
			
		||||
 KC_TRNS, KC_P4, KC_P5, KC_P6, KC_PMNS, KC_PMNS,
 | 
			
		||||
 KC_NLCK, KC_TRNS, KC_P1, KC_P2, KC_P3, KC_PPLS, KC_PPLS,
 | 
			
		||||
 KC_P0, KC_PCMM, KC_PDOT, KC_PENT, KC_PENT,
 | 
			
		||||
 /*-*/    /*-*/    /*-*/    /*-*/    /*-*/    KC_TRNS, KC_TRNS,
 | 
			
		||||
 /*-*/    /*-*/    /*-*/    /*-*/    /*-*/    /*-*/    KC_TRNS,
 | 
			
		||||
 /*-*/    /*-*/    /*-*/    /*-*/    KC_TRNS, KC_TRNS, KC_TRNS,
 | 
			
		||||
 KC_F12,  KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_PEQL,
 | 
			
		||||
 KC_TRNS, KC_TRNS, KC_P7,   KC_P8,   KC_P9,   KC_PAST, KC_PSLS,
 | 
			
		||||
 /*-*/    KC_TRNS, KC_P4,   KC_P5,   KC_P6,   KC_PMNS, KC_PMNS,
 | 
			
		||||
 KC_NLCK, KC_TRNS, KC_P1,   KC_P2,   KC_P3,   KC_PPLS, KC_PPLS,
 | 
			
		||||
 /*-*/    /*-*/    KC_P0,   KC_PCMM, KC_PDOT, KC_PENT, KC_PENT,
 | 
			
		||||
 KC_TRNS, KC_TRNS,
 | 
			
		||||
 KC_TRNS,
 | 
			
		||||
 KC_TRNS, KC_TRNS, KC_TRNS
 | 
			
		||||
| 
						 | 
				
			
			@ -241,24 +241,24 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 | 
			
		|||
 *                   !     !     !-----! !-----!     !     !
 | 
			
		||||
 *                   |     |     |     | !     |     |     |
 | 
			
		||||
 *                   '-----------------' '-----------------'
 | 
			
		||||
*/
 | 
			
		||||
 */
 | 
			
		||||
[L3] = KEYMAP(
 | 
			
		||||
 KC_TRNS, M(UC_SUPERSCRIPT_ONE), M(UC_SUPERSCRIPT_TWO), M(UC_SUPERSCRIPT_THREE), M(UC_SUPERSCRIPT_FOUR), M(UC_SUPERSCRIPT_FIVE), M(UC_FOR_ALL),
 | 
			
		||||
 KC_TRNS, M(UC_MULTIPLICATION_SIGN), M(UC_VULGAR_FRACTION_ONE_HALF), M(UC_DIVISION_SIGN), M(UC_VULGAR_FRACTION_ONE_QUARTER), M(UC_VULGAR_FRACTION_ONE_FIFTH), KC_TRNS,
 | 
			
		||||
 KC_TRNS, KC_TRNS, M(UC_PLUS_MINUS_SIGN), DE_AT, DE_EURO, M(UC_EMPTY_SET),
 | 
			
		||||
 KC_TRNS, M(UC_VULGAR_FRACTION_ONE_THIRD), M(UC_NOT_EQUAL_TO), M(UC_VULGAR_FRACTION_TWO_THIRDS), M(UC_VULGAR_FRACTION_THREE_QUARTERS), M(UC_ASYMPTOTICALLY_EQUAL_TO), KC_TRNS,
 | 
			
		||||
 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
 | 
			
		||||
 KC_TRNS, M(UC_SUPERSCRIPT_ONE),           M(UC_SUPERSCRIPT_TWO),                  M(UC_SUPERSCRIPT_THREE),          M(UC_SUPERSCRIPT_FOUR),               M(UC_SUPERSCRIPT_FIVE),          M(UC_FOR_ALL),
 | 
			
		||||
 KC_TRNS, M(UC_MULTIPLICATION_SIGN),       M(UC_VULGAR_FRACTION_ONE_HALF),         M(UC_DIVISION_SIGN),              M(UC_VULGAR_FRACTION_ONE_QUARTER),    M(UC_VULGAR_FRACTION_ONE_FIFTH), KC_TRNS,
 | 
			
		||||
 KC_TRNS, KC_TRNS,                         M(UC_PLUS_MINUS_SIGN),                  DE_AT,                            DE_EURO,                              M(UC_EMPTY_SET),
 | 
			
		||||
 KC_TRNS, M(UC_VULGAR_FRACTION_ONE_THIRD), M(UC_NOT_EQUAL_TO),                     M(UC_VULGAR_FRACTION_TWO_THIRDS), M(UC_VULGAR_FRACTION_THREE_QUARTERS), M(UC_ASYMPTOTICALLY_EQUAL_TO),   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, M(UC_SUPERSCRIPT_SIX),           M(UC_SUPERSCRIPT_SEVEN),                M(UC_SUPERSCRIPT_EIGHT),          M(UC_SUPERSCRIPT_NINE),               M(UC_SUPERSCRIPT_ZERO),          KC_TRNS,
 | 
			
		||||
 KC_TRNS, M(UC_VULGAR_FRACTION_ONE_SIXTH), KC_TRNS,                                M(UC_VULGAR_FRACTION_ONE_EIGHTH), KC_TRNS,                              KC_TRNS,                         KC_TRNS,
 | 
			
		||||
 /*-*/    M(UC_INFINITY),                  M(UC_SUPERSCRIPT_LATIN_SMALL_LETTER_N), M(UC_THERE_EXISTS),               M(UC_ELEMENT_OF),                     KC_TRNS,                         KC_TRNS,
 | 
			
		||||
 KC_TRNS, DE_EXLM,                         KC_TRNS,                                M(UC_THERE_DOES_NOT_EXIST),       M(UC_NOT_AN_ELEMENT_OF),              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, M(UC_SUPERSCRIPT_SIX), M(UC_SUPERSCRIPT_SEVEN), M(UC_SUPERSCRIPT_EIGHT), M(UC_SUPERSCRIPT_NINE), M(UC_SUPERSCRIPT_ZERO), KC_TRNS,
 | 
			
		||||
 KC_TRNS, M(UC_VULGAR_FRACTION_ONE_SIXTH), KC_TRNS, M(UC_VULGAR_FRACTION_ONE_EIGHTH), KC_TRNS, KC_TRNS, KC_TRNS,
 | 
			
		||||
 M(UC_INFINITY), M(UC_SUPERSCRIPT_LATIN_SMALL_LETTER_N), M(UC_THERE_EXISTS), M(UC_ELEMENT_OF), KC_TRNS, KC_TRNS,
 | 
			
		||||
 KC_TRNS, DE_EXLM, KC_TRNS, M(UC_THERE_DOES_NOT_EXIST), M(UC_NOT_AN_ELEMENT_OF), 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
 | 
			
		||||
),
 | 
			
		||||
/*
 | 
			
		||||
 * .------------------------------------.------------------------------------.
 | 
			
		||||
| 
						 | 
				
			
			@ -279,24 +279,24 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 | 
			
		|||
 *                   !     !     !-----! !-----!     !     !
 | 
			
		||||
 *                   |     |     |     | !     |     |     |
 | 
			
		||||
 *                   '-----------------' '-----------------'
 | 
			
		||||
*/
 | 
			
		||||
 */
 | 
			
		||||
[L4] = KEYMAP(
 | 
			
		||||
 KC_TRNS, M(UC_SUBSCRIPT_ONE), M(UC_SUBSCRIPT_TWO), M(UC_SUBSCRIPT_THREE), M(UC_SUBSCRIPT_FOUR), M(UC_SUBSCRIPT_FIVE), KC_TRNS,
 | 
			
		||||
 KC_TRNS, M(UC_GREEK_SMALL_LETTER_CHI), M(UC_GREEK_SMALL_LETTER_PI), M(UC_GREEK_SMALL_LETTER_PHI), M(UC_GREEK_SMALL_LETTER_OMEGA), M(UC_GREEK_SMALL_LETTER_GAMMA), KC_TRNS,
 | 
			
		||||
 KC_TRNS, M(UC_GREEK_SMALL_LETTER_UPSILON), M(UC_GREEK_SMALL_LETTER_IOTA), M(UC_GREEK_SMALL_LETTER_ALPHA), M(UC_GREEK_SMALL_LETTER_EPSILON), M(UC_GREEK_SMALL_LETTER_OMICRON),
 | 
			
		||||
 KC_TRNS, KC_TRNS, M(UC_GREEK_SMALL_LETTER_THETA), KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
 | 
			
		||||
 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
 | 
			
		||||
 KC_TRNS, M(UC_SUBSCRIPT_ONE),              M(UC_SUBSCRIPT_TWO),            M(UC_SUBSCRIPT_THREE),          M(UC_SUBSCRIPT_FOUR),             M(UC_SUBSCRIPT_FIVE),             KC_TRNS,
 | 
			
		||||
 KC_TRNS, M(UC_GREEK_SMALL_LETTER_CHI),     M(UC_GREEK_SMALL_LETTER_PI),    M(UC_GREEK_SMALL_LETTER_PHI),   M(UC_GREEK_SMALL_LETTER_OMEGA),   M(UC_GREEK_SMALL_LETTER_GAMMA),   KC_TRNS,
 | 
			
		||||
 KC_TRNS, M(UC_GREEK_SMALL_LETTER_UPSILON), M(UC_GREEK_SMALL_LETTER_IOTA),  M(UC_GREEK_SMALL_LETTER_ALPHA), M(UC_GREEK_SMALL_LETTER_EPSILON), M(UC_GREEK_SMALL_LETTER_OMICRON),
 | 
			
		||||
 KC_TRNS, KC_TRNS,                          M(UC_GREEK_SMALL_LETTER_THETA), 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, M(UC_SUBSCRIPT_SIX),              M(UC_SUBSCRIPT_SEVEN),          M(UC_SUBSCRIPT_EIGHT),          M(UC_SUBSCRIPT_NINE),             M(UC_SUBSCRIPT_ZERO),             KC_TRNS,
 | 
			
		||||
 KC_TRNS, M(UC_GREEK_SMALL_LETTER_ETA),     M(UC_GREEK_SMALL_LETTER_XI),    M(UC_GREEK_SMALL_LETTER_KAPPA), M(UC_GREEK_SMALL_LETTER_LAMDA),   KC_TRNS,                          M(UC_GREEK_SMALL_LETTER_ZETA),
 | 
			
		||||
 /*-*/    M(UC_GREEK_SMALL_LETTER_SIGMA),   M(UC_GREEK_SMALL_LETTER_NU),    M(UC_GREEK_SMALL_LETTER_RHO),   M(UC_GREEK_SMALL_LETTER_TAU),     M(UC_GREEK_SMALL_LETTER_DELTA),   M(UC_GREEK_SMALL_LETTER_FINAL_SIGMA),
 | 
			
		||||
 KC_TRNS, M(UC_GREEK_SMALL_LETTER_BETA),    M(UC_GREEK_SMALL_LETTER_MU),    KC_TRNS,                        KC_TRNS,                          KC_TRNS,                          M(UC_GREEK_SMALL_LETTER_PSI),
 | 
			
		||||
 /*-*/    /*-*/                             KC_TRNS,                        KC_TRNS,                        KC_TRNS,                          KC_TRNS,                          KC_TRNS,
 | 
			
		||||
 KC_TRNS, KC_TRNS,
 | 
			
		||||
 KC_TRNS,
 | 
			
		||||
 KC_TRNS, KC_TRNS, KC_TRNS,
 | 
			
		||||
 KC_TRNS, M(UC_SUBSCRIPT_SIX), M(UC_SUBSCRIPT_SEVEN), M(UC_SUBSCRIPT_EIGHT), M(UC_SUBSCRIPT_NINE), M(UC_SUBSCRIPT_ZERO), KC_TRNS,
 | 
			
		||||
 KC_TRNS, M(UC_GREEK_SMALL_LETTER_ETA), M(UC_GREEK_SMALL_LETTER_XI), M(UC_GREEK_SMALL_LETTER_KAPPA), M(UC_GREEK_SMALL_LETTER_LAMDA), KC_TRNS, M(UC_GREEK_SMALL_LETTER_ZETA),
 | 
			
		||||
 M(UC_GREEK_SMALL_LETTER_SIGMA), M(UC_GREEK_SMALL_LETTER_NU), M(UC_GREEK_SMALL_LETTER_RHO), M(UC_GREEK_SMALL_LETTER_TAU), M(UC_GREEK_SMALL_LETTER_DELTA), M(UC_GREEK_SMALL_LETTER_FINAL_SIGMA),
 | 
			
		||||
 KC_TRNS, M(UC_GREEK_SMALL_LETTER_BETA), M(UC_GREEK_SMALL_LETTER_MU), KC_TRNS, KC_TRNS, KC_TRNS, M(UC_GREEK_SMALL_LETTER_PSI),
 | 
			
		||||
 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
 | 
			
		||||
),
 | 
			
		||||
/*
 | 
			
		||||
 * .------------------------------------.------------------------------------.
 | 
			
		||||
| 
						 | 
				
			
			@ -317,24 +317,24 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 | 
			
		|||
 *                   !     !     !-----! !-----!     !     !
 | 
			
		||||
 *                   |     |     |     | !     |     |     |
 | 
			
		||||
 *                   '-----------------' '-----------------'
 | 
			
		||||
*/
 | 
			
		||||
 */
 | 
			
		||||
[L5] = KEYMAP(
 | 
			
		||||
 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
 | 
			
		||||
 KC_TRNS, M(UC_GREEK_CAPITAL_LETTER_CHI), M(UC_GREEK_CAPITAL_LETTER_PI), M(UC_GREEK_CAPITAL_LETTER_PHI), M(UC_GREEK_CAPITAL_LETTER_OMEGA), M(UC_GREEK_CAPITAL_LETTER_GAMMA), KC_TRNS,
 | 
			
		||||
 KC_TRNS, M(UC_GREEK_CAPITAL_LETTER_UPSILON), M(UC_GREEK_CAPITAL_LETTER_IOTA), M(UC_GREEK_CAPITAL_LETTER_ALPHA), M(UC_GREEK_CAPITAL_LETTER_EPSILON), M(UC_GREEK_CAPITAL_LETTER_OMICRON),
 | 
			
		||||
 KC_TRNS, KC_TRNS, M(UC_GREEK_CAPITAL_LETTER_THETA), 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, M(UC_GREEK_CAPITAL_LETTER_CHI),     M(UC_GREEK_CAPITAL_LETTER_PI),    M(UC_GREEK_CAPITAL_LETTER_PHI),   M(UC_GREEK_CAPITAL_LETTER_OMEGA),   M(UC_GREEK_CAPITAL_LETTER_GAMMA),   KC_TRNS,
 | 
			
		||||
 KC_TRNS, M(UC_GREEK_CAPITAL_LETTER_UPSILON), M(UC_GREEK_CAPITAL_LETTER_IOTA),  M(UC_GREEK_CAPITAL_LETTER_ALPHA), M(UC_GREEK_CAPITAL_LETTER_EPSILON), M(UC_GREEK_CAPITAL_LETTER_OMICRON),
 | 
			
		||||
 KC_TRNS, KC_TRNS,                            M(UC_GREEK_CAPITAL_LETTER_THETA), 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,                          KC_TRNS,                          KC_TRNS,                            KC_TRNS,                            KC_TRNS,
 | 
			
		||||
 KC_TRNS, M(UC_GREEK_CAPITAL_LETTER_ETA),     M(UC_GREEK_CAPITAL_LETTER_XI),    M(UC_GREEK_CAPITAL_LETTER_KAPPA), M(UC_GREEK_CAPITAL_LETTER_LAMDA),   KC_TRNS,                            M(UC_GREEK_CAPITAL_LETTER_ZETA),
 | 
			
		||||
 /*-*/    M(UC_GREEK_CAPITAL_LETTER_SIGMA),   M(UC_GREEK_CAPITAL_LETTER_NU),    M(UC_GREEK_CAPITAL_LETTER_RHO),   M(UC_GREEK_CAPITAL_LETTER_TAU),     M(UC_GREEK_CAPITAL_LETTER_DELTA),   KC_TRNS,
 | 
			
		||||
 KC_TRNS, M(UC_GREEK_CAPITAL_LETTER_BETA),    M(UC_GREEK_CAPITAL_LETTER_MU),    KC_TRNS,                          KC_TRNS,                            KC_TRNS,                            M(UC_GREEK_CAPITAL_LETTER_PSI),
 | 
			
		||||
 /*-*/    /*-*/                               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,
 | 
			
		||||
 KC_TRNS, M(UC_GREEK_CAPITAL_LETTER_ETA), M(UC_GREEK_CAPITAL_LETTER_XI), M(UC_GREEK_CAPITAL_LETTER_KAPPA), M(UC_GREEK_CAPITAL_LETTER_LAMDA), KC_TRNS, M(UC_GREEK_CAPITAL_LETTER_ZETA),
 | 
			
		||||
 M(UC_GREEK_CAPITAL_LETTER_SIGMA), M(UC_GREEK_CAPITAL_LETTER_NU), M(UC_GREEK_CAPITAL_LETTER_RHO), M(UC_GREEK_CAPITAL_LETTER_TAU), M(UC_GREEK_CAPITAL_LETTER_DELTA), KC_TRNS,
 | 
			
		||||
 KC_TRNS, M(UC_GREEK_CAPITAL_LETTER_BETA), M(UC_GREEK_CAPITAL_LETTER_MU), KC_TRNS, KC_TRNS, KC_TRNS, M(UC_GREEK_CAPITAL_LETTER_PSI),
 | 
			
		||||
 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
 | 
			
		||||
),
 | 
			
		||||
/*
 | 
			
		||||
 * .------------------------------------.------------------------------------.
 | 
			
		||||
| 
						 | 
				
			
			@ -355,21 +355,21 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 | 
			
		|||
 *                   !     !     !-----! !-----!     !     !
 | 
			
		||||
 *                   |     |     |     | !     |     |     |
 | 
			
		||||
 *                   '-----------------' '-----------------'
 | 
			
		||||
*/
 | 
			
		||||
 */
 | 
			
		||||
[L6] = KEYMAP(
 | 
			
		||||
 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, 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, 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, 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, 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,
 | 
			
		||||
 KC_TRNS, KC_TRNS, KC_TRNS
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -139,8 +139,8 @@ COMMAND_ENABLE = yes    # Commands for debug and configuration
 | 
			
		|||
# SLEEP_LED_ENABLE = yes  # Breathing sleep LED during USB suspend
 | 
			
		||||
# NKRO_ENABLE = yes		# USB Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
 | 
			
		||||
BACKLIGHT_ENABLE = yes  # Enable keyboard backlight functionality
 | 
			
		||||
# MIDI_ENABLE = YES 		# MIDI controls
 | 
			
		||||
# AUDIO_ENABLE = YES 		# Audio output on port C6
 | 
			
		||||
MIDI_ENABLE = YES 		# MIDI controls
 | 
			
		||||
AUDIO_ENABLE = YES 		# Audio output on port C6
 | 
			
		||||
# UNICODE_ENABLE = YES 		# Unicode
 | 
			
		||||
# BLUETOOTH_ENABLE = yes # Enable Bluetooth with the Adafruit EZ-Key HID
 | 
			
		||||
# RGBLIGHT_ENABLE = yes # Enable WS2812 RGB underlight.  Do not enable this with MIDI at the same time.
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -88,7 +88,7 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
 | 
			
		|||
    return MACRO_NONE;
 | 
			
		||||
};
 | 
			
		||||
 | 
			
		||||
void * matrix_init_user(void) {
 | 
			
		||||
void matrix_init_user(void) {
 | 
			
		||||
#ifdef AUDIO_ENABLE
 | 
			
		||||
    init_notes();
 | 
			
		||||
    play_notes(&start_up, 9, false);
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -99,7 +99,7 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
 | 
			
		|||
    return MACRO_NONE;
 | 
			
		||||
};
 | 
			
		||||
 | 
			
		||||
void * matrix_init_user(void) {
 | 
			
		||||
void matrix_init_user(void) {
 | 
			
		||||
    init_notes();
 | 
			
		||||
    play_notes(&start_up, 9, false);
 | 
			
		||||
}
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -1,16 +1,16 @@
 | 
			
		|||
#include "preonic.h"
 | 
			
		||||
 | 
			
		||||
__attribute__ ((weak))
 | 
			
		||||
void * matrix_init_user(void) {
 | 
			
		||||
void matrix_init_user(void) {
 | 
			
		||||
 | 
			
		||||
};
 | 
			
		||||
 | 
			
		||||
__attribute__ ((weak))
 | 
			
		||||
void * matrix_scan_user(void) {
 | 
			
		||||
void matrix_scan_user(void) {
 | 
			
		||||
 | 
			
		||||
};
 | 
			
		||||
 | 
			
		||||
void * matrix_init_kb(void) {
 | 
			
		||||
void matrix_init_kb(void) {
 | 
			
		||||
	#ifdef BACKLIGHT_ENABLE
 | 
			
		||||
    	backlight_init_ports();
 | 
			
		||||
	#endif
 | 
			
		||||
| 
						 | 
				
			
			@ -24,13 +24,9 @@ void * matrix_init_kb(void) {
 | 
			
		|||
    DDRE |= (1<<6);
 | 
			
		||||
    PORTE |= (1<<6);
 | 
			
		||||
 | 
			
		||||
	if (matrix_init_user) {
 | 
			
		||||
		(*matrix_init_user)();
 | 
			
		||||
	}
 | 
			
		||||
	matrix_init_user();
 | 
			
		||||
};
 | 
			
		||||
 | 
			
		||||
void * matrix_scan_kb(void) {
 | 
			
		||||
	if (matrix_scan_user) {
 | 
			
		||||
		(*matrix_scan_user)();
 | 
			
		||||
	}
 | 
			
		||||
void matrix_scan_kb(void) {
 | 
			
		||||
	matrix_scan_user();
 | 
			
		||||
};
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -44,7 +44,7 @@
 | 
			
		|||
	{ k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4a, k4b } \
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
void * matrix_init_user(void);
 | 
			
		||||
void * matrix_scan_user(void);
 | 
			
		||||
void matrix_init_user(void);
 | 
			
		||||
void matrix_scan_user(void);
 | 
			
		||||
 | 
			
		||||
#endif
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
							
								
								
									
										1713
									
								
								keyboard/preonic/preonic_music.hex
									
										
									
									
									
										Normal file
									
								
							
							
						
						
									
										1713
									
								
								keyboard/preonic/preonic_music.hex
									
										
									
									
									
										Normal file
									
								
							
										
											
												File diff suppressed because it is too large
												Load diff
											
										
									
								
							
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue