diff options
| -rw-r--r-- | keyboard/ergodox_ez/keymaps/osx_de/keymap.c | 699 | ||||
| -rw-r--r-- | keyboard/ergodox_ez/keymaps/osx_de/osx_de_highres.png | bin | 684862 -> 189394 bytes | |||
| -rw-r--r-- | keyboard/ergodox_ez/keymaps/osx_de_experimental/keymap.c | 346 | ||||
| -rw-r--r-- | keyboard/ergodox_ez/keymaps/osx_de_experimental/osx_de_experimental_highres.png | bin | 0 -> 187478 bytes | |||
| -rw-r--r-- | quantum/keymap_extras/keymap_german_osx.h | 4 | 
5 files changed, 659 insertions, 390 deletions
| diff --git a/keyboard/ergodox_ez/keymaps/osx_de/keymap.c b/keyboard/ergodox_ez/keymaps/osx_de/keymap.c index dffcb21da..174f26cbe 100644 --- a/keyboard/ergodox_ez/keymaps/osx_de/keymap.c +++ b/keyboard/ergodox_ez/keymaps/osx_de/keymap.c @@ -1,413 +1,329 @@  #include "ergodox_ez.h"  #include "debug.h"  #include "action_layer.h" +#include "keymap_extras/keymap_french.h" +#include "keymap_extras/keymap_neo2.h" +#include "keymap_extras/keymap_uk.h" +#include "keymap_extras/keymap_colemak.h" +#include "keymap_extras/keymap_french_osx.h" +#include "keymap_extras/keymap_nordic.h" +#include "keymap_extras/keymap_dvorak.h" +#include "keymap_extras/keymap_german.h" +#include "keymap_extras/keymap_norwegian.c" +#include "keymap_extras/keymap_fr_ch.h"  #include "keymap_extras/keymap_german_osx.h" +#include "keymap_extras/keymap_spanish.h" +#include "keymap_extras/keymap_bepo.h" -#define BASE 0 // default layer -#define SYMB 1 // symbols -#define MDIA 2 // media keys -#define SMLY 3 // media keys -#define NUMB 4 // number keys -#define EGOS 5 // Egoshooter layer - -#define M_CTRL_CMDV 1 -#define M_CTRL_CMDC 2 -#define M_MEH_SH_ACUT 3 -#define M_DE_OSX_PLUS_CTRLALT 12 -#define M_DE_OSX_CIRC_CTRLCMD 13 -#define M_TOGGLE_5 14 -#define M_CTL_SFT_HASH 15 -#define M_LGUI_SHFT 16 - -#define SM_SMILE 4 -#define SM_SMIRK 5 -#define SM_FROWN 6 -#define SM_CRY 7 -#define SM_KISS 8 -#define SM_HEART 9 -#define SM_LAUGH 10 -#define SM_SAD 11 +#define BASE 0 +#define SYMB 1 +#define MDIA 2 +#define SMLY 3 +#define NUMB 4 +#define EGOS 5 +#define M_CTRL_CMDV 0 +#define M_CTRL_CMDC 1 +#define M_MEH_SH_ACUT 2 +#define M_LGUI_SHFT 3 +#define M_CTL_SFT_HASH 4 +#define M_DE_OSX_CIRC_CTRLCMD 5 +#define M_DE_OSX_PLUS_CTRLALT 6 +#define SM_SMILE 7 +#define SM_SMIRK 8 +#define SM_CRY 9 +#define SM_SAD 10 +#define SM_HEART 11 +#define SM_LAUGH 12 +#define SM_KISS 13 +#define SM_FROWN 14 +#define M_TOGGLE_5 15 +//Layout keymap.c generated with ErgodoxLayoutGenerator V1.0BETA1  const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { -/* Keymap 0: Basic layer - * - * ,-----------------------------------------------------.           ,--------------------------------------------------. - * |  ESC   |   1  |   2  |   3  |   4  |   5  |CTL_SFT/#|           |CTL_SFT/#|   6  |   7  |   8  |   9  |   0  |   ß    | - * |--------+------+------+------+------+----------------|           |---------+------+------+------+------+------+--------| - * |  TAB   |   Q  |   W  |   E  |   R  |   T  | CMD     |           | CMD     |   Z  |   U  |   I  |   O  |   P  |   ü    | - * |--------+------+------+------+------+------|         |           |         |------+------+------+------+------+--------| - * |  LALT  |   A  |   S  |   D  |   F  |   G  |---------|           |---------|   H |   J  |   K  |   L  |   ö  |  ä/RALT| - * |--------+------+------+------+------+------| LALT    |           | RALT    |------+------+------+------+------+--------| - * | LShift |Y/Ctrl|   X  |   C  |   V  |   B  |         |           |         |   N  |   M  |   ,  |   .  |-/Ctrl| RShift | - * `--------+------+------+------+------+----------------'           `-------------+------+------+------+------+--------' - *   |</L1| ^°/CTRL_CMD | +/CTRL_ALT | UP | DOWN|                    |  Left  | Right | CMD-SHFT| ALT-SHIFT  | +/L1 | - *   `------------------------------------------'                    `---------------------------------------------' - *                                        ,-------------.       ,---------------. - *                                        |`/Meh | Media|       | NUM | ´/Hyper | - *                                 ,------|------|------|       |------+--------+------. - *                                 |      |      | Home |       | PgUp |        |      | - *                                 | Back-|  Del |------|       |------|  Enter | Space| - *                                 | Space|      | End  |       | PgDn |        |      | - *                                 `--------------------'       `----------------------' - */ -// If it accepts an argument (i.e, is a function), it doesn't need KC_. -// Otherwise, it needs KC_* -[BASE] = KEYMAP(  // layer 0 : default -        // left hand -        KC_ESC,                  DE_OSX_1,         DE_OSX_2,   DE_OSX_3,   DE_OSX_4,   DE_OSX_5,   M(M_CTL_SFT_HASH), -        KC_TAB,                  DE_OSX_Q,         DE_OSX_W,   DE_OSX_E,   DE_OSX_R,   DE_OSX_T,   KC_LGUI, -        KC_LALT,                 DE_OSX_A,         DE_OSX_S,   DE_OSX_D,   DE_OSX_F,   DE_OSX_G, -        KC_LSFT,                 CTL_T(DE_OSX_Y),  DE_OSX_X,   DE_OSX_C,   DE_OSX_V,   DE_OSX_B,   KC_LALT, -        LT(SYMB,DE_OSX_LESS),        M(M_DE_OSX_CIRC_CTRLCMD),      M(M_DE_OSX_PLUS_CTRLALT), KC_UP,  KC_DOWN, -                                               			  	M(M_MEH_SH_ACUT), 	TG(MDIA), -                                                              					KC_HOME, -                                               				KC_BSPC,KC_DEL,		LT(SMLY,KC_END), -        // right hand -             M(M_CTL_SFT_HASH),  DE_OSX_6,  DE_OSX_7,   DE_OSX_8,   DE_OSX_9,   DE_OSX_0,   DE_OSX_SS, -             KC_RGUI,     DE_OSX_Z,   DE_OSX_U,   DE_OSX_I,   DE_OSX_O,   DE_OSX_P,         	DE_OSX_UE, -                          DE_OSX_H,   DE_OSX_J,   DE_OSX_K,   DE_OSX_L,   DE_OSX_OE,		ALT_T(DE_OSX_AE), -             KC_RALT,	  DE_OSX_N,   DE_OSX_M,   DE_OSX_COMM,DE_OSX_DOT, CTL_T(DE_OSX_MINS),   	KC_RSFT, -                                  KC_LEFT,  KC_RIGHT,LGUI(KC_LSFT),LALT(KC_LSFT),        LT(SYMB,DE_OSX_PLUS), -             TG(NUMB),	  ALL_T(DE_OSX_ACUT), -             KC_PGUP, -             KC_PGDN,KC_ENT, KC_SPC -    ), -/* Keymap 1: Symbol Layer - * - * ,--------------------------------------------------.           ,--------------------------------------------------. - * |        |  F1  |  F2  |  F3  |  F4  |  F5  |      |           |  L5  |  F6  |  F7  |  F8  |  F9  |  F10 |   F11  | - * |--------+------+------+------+------+-------------|           |------+------+------+------+------+------+--------| - * |        |  <   |  >   |   !  |  ?   |      |      |           |      |   \  |   [  |   ]  |   <  |   >  |   !    | - * |--------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------| - * |        |   #  |   $  |   \  |   /  |   .  |------|           |------|   /  |   (  |   )  |   {  |   }  |   #    | - * |--------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------| - * |        |      |   ^  |   %  |   |  |   ~  |      |           |      |   |  |   ~  |  ^   |   UP |      |   $    | - * `--------+------+------+------+------+-------------'           `-------------+------+------+------+------+--------' - *   |      |      |      |      |      |                                       |   '  |  LEFT| DOWN  | RIGHT |    | - *   `----------------------------------'                                       `----------------------------------' - *                                        ,-------------.       ,-------------. - *                                        |      |      |       | F13  |  F12 | - *                                 ,------|------|------|       |------+------+------. - *                                 |      |      |      |       | F14  |      |      | - *                                 |      |      |------|       |------|      |      | - *                                 |      |      |      |       | F15  |      |      | - *                                 `--------------------'       `--------------------' - */ -// SYMBOLS -[SYMB] = KEYMAP( -       // left hand -       KC_TRNS,KC_F1,  KC_F2,  KC_F3,  KC_F4,  KC_F5,  KC_TRNS, -       KC_TRNS,DE_OSX_LESS,DE_OSX_MORE,DE_OSX_EXLM,DE_OSX_QST, KC_TRNS,KC_TRNS, -       KC_TRNS,DE_OSX_HASH,DE_OSX_DLR, DE_OSX_BSLS,DE_OSX_SLSH,KC_DOT, -       KC_TRNS,KC_TRNS,DE_OSX_LESS,DE_OSX_PERC,DE_OSX_PIPE,DE_OSX_TILD,KC_TRNS, -       KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS, -                                       KC_TRNS,KC_TRNS, -                                               KC_TRNS, -                               KC_TRNS,KC_DEL,KC_TRNS, -       // right hand -       M(M_TOGGLE_5), KC_F6, KC_F7,   KC_F8,  KC_F9,   KC_F10,   KC_F11, -       KC_TRNS, LALT(LSFT(KC_7)),   LALT(KC_5),   LALT(KC_6),    DE_OSX_LESS,    DE_OSX_MORE, DE_OSX_EXLM, -                DE_OSX_SLSH,              DE_OSX_LPRN,   DE_OSX_RPRN,    LALT(KC_8),    LALT(KC_9),  DE_OSX_HASH, -       KC_TRNS, DE_OSX_PIPE, DE_OSX_TILD,  DE_OSX_CIRC,    KC_UP, DE_OSX_MINS,  LSFT(KC_4), -                         DE_OSX_QUOT,   KC_LEFT,  KC_DOWN,    KC_RIGHT,  KC_TRNS, -       KC_F13, KC_F12, -       KC_F14, -       KC_F15, KC_TRNS, KC_TRNS -), -/* Keymap 2: Media and mouse keys - * - * ,--------------------------------------------------.           ,--------------------------------------------------. - * |        |      |      |      |      |      |      |           | Mute |      |      |      |      |      |  EGOS  | - * |--------+------+------+------+------+-------------|           |------+------+------+------+------+------+--------| - * |        |      | Lclk | MsUp | Rclk | WlUp |      |           |      |      |      |      |      |      |        | - * |--------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------| - * |        |      |MsLeft|MsDown|MsRght| WlDw |------|           |------|VolUp |      |      |      |      |        | - * |--------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------| - * |        |      |      |      |      | MClk |      |           |      |VolDn |      | Prev | Next | Up   |        | - * `--------+------+------+------+------+-------------'           `-------------+------+------+------+------+--------' - *   |      |      |      |      |      |                                       |      |      | Left | Down | Right | - *   `----------------------------------'                                       `----------------------------------' - *                                        ,-------------.       ,-------------. - *                                        |      |      |       |      |      | - *                                 ,------|------|------|       |------+------+------. - *                                 |      |      |      |       |      |      |Brwser| - *                                 |      |      |------|       |------|      |Back  | - *                                 |      |      |      |       |      |      |      | - *                                 `--------------------'       `--------------------' - */ -// MEDIA AND MOUSE -[MDIA] = KEYMAP( -       KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, -       KC_TRNS, KC_TRNS, KC_BTN1, KC_MS_U, KC_BTN2, KC_WH_U, KC_TRNS, -       KC_TRNS, KC_TRNS, KC_MS_L, KC_MS_D, KC_MS_R, KC_WH_D, -       KC_TRNS, KC_TRNS, KC_WH_L, KC_WH_D, KC_WH_R, KC_BTN3, KC_TRNS, -       KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, -                                           KC_TRNS, KC_TRNS, -                                                    KC_TRNS, -                                  KC_TRNS, KC_TRNS, KC_TRNS, -    // right hand -       KC_MUTE,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MPLY, -       KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, -                 KC_VOLU, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, -       KC_TRNS,  KC_VOLD, KC_TRNS, KC_MPRV, KC_MNXT, KC_UP,   KC_TRNS, -                          KC_TRNS, KC_TRNS, KC_LEFT, KC_DOWN, KC_RIGHT, -       KC_TRNS, KC_TRNS, -       KC_TRNS, -       KC_TRNS, KC_TRNS, KC_WBAK -), -/* Keymap 3: Smiley layer - * making it easier to type smileys... tipp: on osx you can easily replace those smileys with the UTF-8 character using - * keyboard short commands... - * - * ,--------------------------------------------------.           ,--------------------------------------------------. - * |        |      |      |      |      |      |      |           | :-)  | ;-)  | :-D  |      |      |      |        | - * |--------+------+------+------+------+-------------|           |------+------+------+------+------+------+--------| - * |        |      |      |      |      |      |      |           |      | :-{  | :-(  |      |      |      |        | - * |--------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------| - * |        |      |      |      |      |      |------|           |------|  <3  | :-*  |      |      |      |        | - * |--------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------| - * |        |      |      |      |      |      |      |           |      |      |      |      |      |      |        | - * `--------+------+------+------+------+-------------'           `-------------+------+------+------+------+--------' - *   |    |     |      |      |      |                                       |     |      |           |     |     r| - *   `----------------------------------'                                       `----------------------------------' - *                                        ,-------------.       ,-------------. - *                                        |      |      |       |      |      | - *                                 ,------|------|------|       |------+--------+------. - *                                 |      |      |      |       |      |        |      | - *                                 |      |      |------|       |------|        |      | - *                                 |      |      |      |       |      |        |      | - *                                 `--------------------'       `----------------------' - */ -[SMLY] = 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, -    // right hand -       M(SM_SMILE), M(SM_SMIRK), M(SM_LAUGH), KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, -       KC_TRNS,  M(SM_FROWN),    M(SM_SAD),    M(SM_CRY),    KC_TRNS,    KC_TRNS, KC_TRNS, -                 M(SM_HEART),    M(SM_KISS),    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 -), -//number pad -[NUMB] = KEYMAP( -       KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, -       KC_TRNS, KC_TRNS, KC_TRNS, KC_UP, KC_TRNS, KC_TRNS, KC_TRNS, -       KC_TRNS, KC_TRNS, KC_LEFT, KC_DOWN, KC_RGHT, 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, -       // right hand -       KC_TRNS, KC_F6,   KC_F7,  KC_F8,   KC_F9,   KC_F10,  KC_F11, -       KC_TRNS, KC_UP,   KC_7,   KC_8,    KC_9,    LSFT(KC_RBRC), KC_F12, -                KC_DOWN, KC_4,   KC_5,    KC_6,    KC_RBRC, DE_OSX_MINS, -       KC_TRNS, LSFT(KC_6), KC_1,   KC_2,    KC_3,    LSFT(KC_7), KC_TRNS, -                         KC_0,KC_DOT,  KC_COMM,    DE_OSX_EQL,  KC_TRNS, -       KC_TRNS, KC_TRNS, -       KC_TRNS, -       KC_TRNS, KC_TRNS, KC_TRNS -), - -/* Keymap 3: Egoshooter layer - * - * ,--------------------------------------------------.           ,--------------------------------------------------. - * |        |      |      |      |      |      |      |           |  L5  |      |      |      |      |      |        | - * |--------+------+------+------+------+-------------|           |------+------+------+------+------+------+--------| - * |        |      |      |      |      |      |      |           |      |      |      |      |      |      |        | - * |--------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------| - * |  SHIFT |      |      |      |      |      |------|           |------|      |      |      |      |      |        | - * |--------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------| - * |        |      |      |      |      |      |      |           |      |      |      |      |      |      |        | - * `--------+------+------+------+------+-------------'           `-------------+------+------+------+------+--------' - *   | CTRL |      |      |      |      |                                       |     |       |      |      |      | - *   `----------------------------------'                                       `----------------------------------' - *                                        ,-------------.       ,-------------. - *                                        |   F1 |  F2  |       |      |      | - *                                 ,------|------|------|       |------+--------+------. - *                                 |      |      |  F3  |       |      |        |      | - *                                 | SPACE|  CTRL|------|       |------|        |      | - *                                 |      |      |  F4  |       |      |        |      | - *                                 `--------------------'       `----------------------' - */ -[EGOS] = 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_LSFT, 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_LCTL, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, -                                           KC_F1, KC_F2, -                                                    KC_F3, -                                  KC_SPC, KC_LCTL, KC_F4, -       // right hand -       M(M_TOGGLE_5), 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 -), +[BASE]=KEYMAP( +//left half +    KC_ESC, DE_OSX_1, DE_OSX_2, DE_OSX_3, DE_OSX_4, DE_OSX_5, M(M_CTL_SFT_HASH),  +    KC_TAB, DE_OSX_Q, DE_OSX_W, DE_OSX_E, DE_OSX_R, DE_OSX_T, KC_LGUI,  +    KC_LALT, DE_OSX_A, DE_OSX_S, DE_OSX_D, DE_OSX_F, DE_OSX_G,  +    KC_LSFT, CTL_T(DE_OSX_Y), DE_OSX_X, DE_OSX_C, DE_OSX_V, DE_OSX_B, KC_LALT,  +                  LT(SYMB,DE_OSX_LESS), M(M_DE_OSX_CIRC_CTRLCMD), M(M_DE_OSX_PLUS_CTRLALT), KC_UP, KC_DOWN,  +                                              M(M_MEH_SH_ACUT), TG(MDIA),  +                                                     KC_HOME,  +                                       KC_BSPC, KC_DEL, LT(SMLY,KC_END),  +    //right half +    M(M_CTL_SFT_HASH), DE_OSX_6, DE_OSX_7, DE_OSX_8, DE_OSX_9, DE_OSX_0, DE_OSX_SS,  +    KC_RGUI, DE_OSX_Z, DE_OSX_U, DE_OSX_I, DE_OSX_O, DE_OSX_P, DE_OSX_UE,  +           DE_OSX_H, DE_OSX_J, DE_OSX_K, DE_OSX_L, DE_OSX_OE, ALT_T(DE_OSX_AE),  +    KC_RALT, DE_OSX_N, DE_OSX_M, DE_OSX_COMM, DE_OSX_DOT, CTL_T(DE_OSX_MINS), KC_RSFT,  +                         KC_LEFT, KC_RIGHT, LGUI(KC_LSFT), LALT(KC_LSFT), LT(SYMB,DE_OSX_PLUS),  +    TG(NUMB), ALL_T(DE_OSX_ACUT),  +    KC_PGUP,  +    KC_PGDN, KC_ENT, KC_SPC), +[SYMB]=KEYMAP( +//left half +    KC_TRNS, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_TRNS,  +    KC_TRNS, DE_OSX_LESS, DE_OSX_MORE, DE_OSX_EXLM, DE_OSX_QST, KC_TRNS, KC_TRNS,  +    KC_TRNS, DE_OSX_HASH, DE_OSX_DLR, DE_OSX_BSLS, DE_OSX_SLSH, KC_DOT,  +    KC_TRNS, KC_TRNS, DE_OSX_LESS, DE_OSX_PERC, DE_OSX_PIPE, DE_OSX_TILD, KC_TRNS,  +                  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  +                                              KC_TRNS, KC_TRNS,  +                                                     KC_TRNS,  +                                       KC_TRNS, KC_DEL, KC_TRNS,  +    //right half +    M(M_TOGGLE_5), KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11,  +    KC_TRNS, LALT(LSFT(KC_7)), LALT(KC_5), LALT(KC_6), DE_OSX_LESS, DE_OSX_MORE, DE_OSX_EXLM,  +           DE_OSX_SLSH, DE_OSX_LPRN, DE_OSX_RPRN, LALT(KC_8), LALT(KC_9), DE_OSX_HASH,  +    KC_TRNS, DE_OSX_PIPE, DE_OSX_TILD, DE_OSX_CIRC, KC_UP, DE_OSX_MINS, LSFT(KC_4),  +                         DE_OSX_QUOT, KC_LEFT, KC_DOWN, KC_RIGHT, KC_TRNS,  +    KC_F13, KC_F12,  +    KC_F14,  +    KC_F15, KC_TRNS, KC_TRNS), +[MDIA]=KEYMAP( +//left half +    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  +    KC_TRNS, KC_TRNS, KC_BTN1, KC_MS_U, KC_BTN2, KC_WH_U, KC_TRNS,  +    KC_TRNS, KC_TRNS, KC_MS_L, KC_MS_D, KC_MS_R, KC_WH_D,  +    KC_TRNS, KC_TRNS, KC_WH_L, KC_WH_D, KC_WH_R, KC_BTN3, KC_TRNS,  +                  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  +                                              KC_TRNS, KC_TRNS,  +                                                     KC_TRNS,  +                                       KC_TRNS, KC_TRNS, KC_TRNS,  +    //right half +    KC_MUTE, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MPLY,  +    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  +           KC_VOLU, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  +    KC_TRNS, KC_VOLD, KC_TRNS, KC_MPRV, KC_MNXT, KC_UP, KC_TRNS,  +                         KC_TRNS, KC_TRNS, KC_LEFT, KC_DOWN, KC_RIGHT,  +    KC_TRNS, KC_TRNS,  +    KC_TRNS,  +    KC_TRNS, KC_TRNS, KC_WBAK), +[SMLY]=KEYMAP( +//left half +    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,  +    //right half +    M(SM_SMILE), M(SM_SMIRK), M(SM_LAUGH), KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  +    KC_TRNS, M(SM_FROWN), M(SM_SAD), M(SM_CRY), KC_TRNS, KC_TRNS, KC_TRNS,  +           M(SM_HEART), M(SM_KISS), 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), +[NUMB]=KEYMAP( +//left half +    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  +    KC_TRNS, KC_TRNS, KC_TRNS, KC_UP, KC_TRNS, KC_TRNS, KC_TRNS,  +    KC_TRNS, KC_TRNS, KC_LEFT, KC_DOWN, KC_RGHT, 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,  +    //right half +    KC_TRNS, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11,  +    KC_TRNS, KC_UP, KC_7, KC_8, KC_9, LSFT(KC_RBRC), KC_F12,  +           KC_DOWN, KC_4, KC_5, KC_6, KC_RBRC, DE_OSX_MINS,  +    KC_TRNS, LSFT(KC_6), KC_1, KC_2, KC_3, LSFT(KC_7), KC_TRNS,  +                         KC_0, KC_DOT, KC_COMM, DE_OSX_EQL, KC_TRNS,  +    KC_TRNS, KC_TRNS,  +    KC_TRNS,  +    KC_TRNS, KC_TRNS, KC_TRNS), +[EGOS]=KEYMAP( +//left half +    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_LSFT, 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_LCTL, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  +                                              KC_F1, KC_F2,  +                                                     KC_F3,  +                                       KC_SPC, KC_LCTL, KC_F4,  +    //right half +    M(M_TOGGLE_5), 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),  };  const uint16_t PROGMEM fn_actions[] = { -    [1] = ACTION_LAYER_TAP_TOGGLE(SYMB),                // FN1 - Momentary Layer 1 (Symbols) -    [2] = ACTION_LAYER_TAP_TOGGLE(SMLY)                // FN2 - Momentary Layer 2 (Smiley) +  };  const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)  { -		static uint16_t start; -  // MACRODOWN only works in this function -      switch(id) { -        case 0: -		if (record->event.pressed) { -		  register_code(KC_RSFT); -		} else { -		  unregister_code(KC_RSFT); -		} -		break; -	case 1: -		if (record->event.pressed) { -			start = timer_read(); -			return MACRO(D(LCTRL), END); -		} else { -			if (timer_elapsed(start) > 150) { -			    return MACRO(U(LCTRL), END); -			} else { -			    return MACRO(U(LCTRL), D(LGUI), T(V), U(LGUI), END); -			} -		} -		break; -	case 2: -		if (record->event.pressed) { +static uint16_t start; +switch(id) { +case M_TOGGLE_5: +//Macro: M_TOGGLE_5//----------------------- + if (record->event.pressed){ +           layer_state ^= (1<<5); +           layer_state &= (1<<5); +        } + +break; +case M_CTRL_CMDC: +//Macro: M_CTRL_CMDC//----------------------- +if (record->event.pressed) {  			start = timer_read();  			return MACRO(D(LCTRL),END);  		} else { -			if (timer_elapsed(start) > 150){ +			if (timer_elapsed(start) >150) {  				return MACRO(U(LCTRL),END);  			} else {  				return MACRO(U(LCTRL),D(LGUI),T(C),U(LGUI),END);  			}  		} -		break; -	case 3: -		if (record->event.pressed) { + +break; +case M_DE_OSX_PLUS_CTRLALT: +//Macro: M_DE_OSX_PLUS_CTRLALT//----------------------- +if (record->event.pressed) {  			start = timer_read(); -			return MACRO(D(LCTRL),D(LSFT),D(LALT),END); +			return MACRO(D(LCTRL),D(LALT),END);  		} else { -			if (timer_elapsed(start) > 150){ -				return MACRO(U(LCTRL),U(LSFT),U(LALT),END); +			if (timer_elapsed(start) >150) { +				return MACRO(U(LCTRL),U(LALT),END);  			} else { -				return MACRO(U(LCTRL),U(LALT),T(EQL),U(LSFT),END); //cannot use DE_OSX_ACUT here, as macro needs KC_ prefix +				return MACRO(U(LCTRL),U(LALT),T(RBRC),END);  			}  		} -		break; -	case M_LGUI_SHFT: -		if (record->event.pressed){ + +break; +case SM_KISS: +//Macro: SM_KISS//----------------------- +if (record->event.pressed) { +			return MACRO(D(LSFT),T(DOT),U(LSFT),T(SLSH),D(LSFT),T(RBRC),U(LSFT),END); +		} + +break; +case SM_FROWN: +//Macro: SM_FROWN//----------------------- +if (record->event.pressed) { +			return MACRO(D(LSFT),T(DOT),U(LSFT),T(SLSH),D(LALT),T(8),U(LALT),END); +		} + +break; +case SM_CRY: +//Macro: SM_CRY//----------------------- +if (record->event.pressed) { +			return MACRO(D(LSFT),T(COMM),U(LSFT),T(SLSH),D(LSFT),T(8),U(LSFT),END); +		} + +break; +case SM_SMILE: +//Macro: SM_SMILE//----------------------- +if (record->event.pressed) { +			return MACRO(D(LSFT),T(DOT),U(LSFT),T(SLSH),D(LSFT),T(9),U(LSFT),END); +		} + +break; +case SM_SMIRK: +//Macro: SM_SMIRK//----------------------- +if (record->event.pressed) { +			return MACRO(D(LSFT),T(COMM),U(LSFT),T(SLSH),D(LSFT),T(9),U(LSFT),END); +		} + +break; +case M_LGUI_SHFT: +//Macro: M_LGUI_SHFT//----------------------- +if (record->event.pressed){  			return MACRO(D(LGUI),D(LSFT),END);  		}else{  			return MACRO(U(LGUI),U(LSFT),END);  		} -		break; -	case M_CTL_SFT_HASH: -		if (record->event.pressed) { -			start=timer_read();  -			return MACRO(D(LCTRL),D(LSFT),END);  + +break; +case SM_HEART: +//Macro: SM_HEART//----------------------- +if (record->event.pressed) { +			return MACRO(T(GRV),T(3),END); +		} + +break; +case SM_LAUGH: +//Macro: SM_LAUGH//----------------------- +if (record->event.pressed) { +			return MACRO(D(LSFT),T(DOT),U(LSFT),T(SLSH),D(LSFT),T(D),U(LSFT),END); +		} + +break; +case M_CTL_SFT_HASH: +//Macro: M_CTL_SFT_HASH//----------------------- +if (record->event.pressed) { +			start = timer_read(); +			return MACRO(D(LCTRL),D(LSFT),END);  		} else { -			if (timer_elapsed(start) > 150){ +			if (timer_elapsed(start) >150) {  				return MACRO(U(LCTRL),U(LSFT),END);  			} else {  				return MACRO(U(LCTRL),U(LSFT),T(BSLS),END);  			}  		} -		break;	 -	case M_DE_OSX_CIRC_CTRLCMD: -		if (record->event.pressed) { + +break; +case SM_SAD: +//Macro: SM_SAD//----------------------- +if (record->event.pressed) { +			return MACRO(D(LSFT),T(DOT),U(LSFT),T(SLSH),D(LSFT),T(8),U(LSFT),END); +		} + +break; +case M_DE_OSX_CIRC_CTRLCMD: +//Macro: M_DE_OSX_CIRC_CTRLCMD//----------------------- +if (record->event.pressed) {  			start = timer_read();  			return MACRO(D(LCTRL),D(LGUI),END);  		} else { -			if (timer_elapsed(start) > 150){ +			if (timer_elapsed(start) >150) {  				return MACRO(U(LCTRL),U(LGUI),END);  			} else { -				return MACRO(U(LCTRL),U(LGUI),T(NUBS),END);  +				return MACRO(U(LCTRL),U(LGUI),T(NUBS),END);  			}  		} -		break; -	case M_DE_OSX_PLUS_CTRLALT: -		if (record->event.pressed) { + +break; +case M_CTRL_CMDV: +//Macro: M_CTRL_CMDV//----------------------- +if (record->event.pressed) {  			start = timer_read(); -			return MACRO(D(LCTRL),D(LALT),END); +			return MACRO(D(LCTRL),END);  		} else { -			if (timer_elapsed(start) > 150){ -				return MACRO(U(LCTRL),U(LALT),END); +			if (timer_elapsed(start) >150) { +				return MACRO(U(LCTRL),END);  			} else { -				return MACRO(U(LCTRL),U(LALT),T(RBRC),END);  +				return MACRO(U(LCTRL),D(LGUI),T(V),U(LGUI),END);  			}  		} -		break; -	case SM_SMILE: -		if (record->event.pressed) { -			return MACRO(D(LSFT),T(DOT),U(LSFT),T(SLSH),D(LSFT),T(9),U(LSFT),END); -		} -		break; -	case SM_SMIRK: -		if (record->event.pressed) { -			return MACRO(D(LSFT),T(COMM),U(LSFT),T(SLSH),D(LSFT),T(9),U(LSFT),END); -		} -		break; -	case SM_CRY: -		if (record->event.pressed) { -			return MACRO(D(LSFT),T(COMM),U(LSFT),T(SLSH),D(LSFT),T(8),U(LSFT),END); -		} -		break; -  -	case SM_SAD: -		if (record->event.pressed) { -			return MACRO(D(LSFT),T(DOT),U(LSFT),T(SLSH),D(LSFT),T(8),U(LSFT),END); -		} -		break; -       -	case SM_HEART: -		if (record->event.pressed) { -			return MACRO(T(GRV),T(3),END); -		} -		break; -	case SM_LAUGH: -		if (record->event.pressed) { -			return MACRO(D(LSFT),T(DOT),U(LSFT),T(SLSH),D(LSFT),T(D),U(LSFT),END); -		} -		break; -	case SM_KISS: -		if (record->event.pressed) { -			return MACRO(D(LSFT),T(DOT),U(LSFT),T(SLSH),D(LSFT),T(RBRC),U(LSFT),END); -		} -		break; -	case SM_FROWN: -		if (record->event.pressed) { -			return MACRO(D(LSFT),T(DOT),U(LSFT),T(SLSH),D(LALT),T(8),U(LALT),END); +break; +case M_MEH_SH_ACUT: +//Macro: M_MEH_SH_ACUT//----------------------- +if (record->event.pressed) { +			start = timer_read(); +			return MACRO(D(LCTRL),D(LSFT),D(LALT),END); +		} else { +			if (timer_elapsed(start) >150) { +				return MACRO(U(LCTRL),U(LSFT),U(LALT),END); +			} else { +				return MACRO(U(LCTRL),U(LALT),T(EQL),U(LSFT),END); +			}  		} -		break; -    case M_TOGGLE_5:   -       if (record->event.pressed){ -           layer_state ^= (1<<5); -           layer_state &= (1<<5); -        } -        break; -    } -    return MACRO_NONE; + +break; +} +return MACRO_NONE;  };  // Runs just one time when the keyboard initializes. @@ -418,36 +334,43 @@ void matrix_init_user(void) {  // Runs constantly in the background, in a loop.  void matrix_scan_user(void) { -    uint8_t layer = biton32(layer_state); +uint8_t layer = biton32(layer_state); -    ergodox_board_led_off(); -    ergodox_right_led_1_off(); -    ergodox_right_led_2_off(); -    ergodox_right_led_3_off(); -    switch (layer) { -      // TODO: Make this relevant to the ErgoDox EZ. -        case 1: -            ergodox_right_led_1_on(); -            break; -        case 2: -            ergodox_right_led_2_on(); -	    break; -        case 3: -            ergodox_right_led_3_on(); -            break; -        case 4: -	    ergodox_right_led_1_on(); -            ergodox_right_led_3_on(); -	    //ergodox_board_led_on(); -            break; -        case 5:  -        	ergodox_right_led_1_on(); -        	ergodox_right_led_2_on(); -        	ergodox_right_led_3_on(); -        	break; -        default: -            // none -            break; -    } +ergodox_board_led_off(); +ergodox_right_led_1_off(); +ergodox_right_led_2_off(); +ergodox_right_led_3_off(); +switch (layer) { + +    case SYMB: +        ergodox_right_led_1_on(); +         +         +        break; +    case MDIA: +         +        ergodox_right_led_2_on(); +         +        break; +    case SMLY: +         +         +        ergodox_right_led_3_on(); +        break; +    case NUMB: +        ergodox_right_led_1_on(); +         +        ergodox_right_led_3_on(); +        break; +    case EGOS: +        ergodox_right_led_1_on(); +        ergodox_right_led_2_on(); +        ergodox_right_led_3_on(); +        break; +default: +// none +break; +}  }; + diff --git a/keyboard/ergodox_ez/keymaps/osx_de/osx_de_highres.png b/keyboard/ergodox_ez/keymaps/osx_de/osx_de_highres.pngBinary files differ index 8e709ee26..9249f3d2d 100644 --- a/keyboard/ergodox_ez/keymaps/osx_de/osx_de_highres.png +++ b/keyboard/ergodox_ez/keymaps/osx_de/osx_de_highres.png diff --git a/keyboard/ergodox_ez/keymaps/osx_de_experimental/keymap.c b/keyboard/ergodox_ez/keymaps/osx_de_experimental/keymap.c new file mode 100644 index 000000000..7c40a4f3c --- /dev/null +++ b/keyboard/ergodox_ez/keymaps/osx_de_experimental/keymap.c @@ -0,0 +1,346 @@ +#include "ergodox_ez.h" +#include "debug.h" +#include "action_layer.h" +#include "keymap_extras/keymap_french.h" +#include "keymap_extras/keymap_neo2.h" +#include "keymap_extras/keymap_uk.h" +#include "keymap_extras/keymap_colemak.h" +#include "keymap_extras/keymap_french_osx.h" +#include "keymap_extras/keymap_nordic.h" +#include "keymap_extras/keymap_dvorak.h" +#include "keymap_extras/keymap_german.h" +#include "keymap_extras/keymap_norwegian.c" +#include "keymap_extras/keymap_fr_ch.h" +#include "keymap_extras/keymap_german_osx.h" +#include "keymap_extras/keymap_spanish.h" +#include "keymap_extras/keymap_bepo.h" + +#define BASE 0 +#define SYMB 1 +#define MDIA 2 +#define SMLY 3 +#define NUMB 4 +#define EGOS 5 + +#define M_TOGGLE_5 0 +#define M_DE_OSX_PLUS_CTRLALT 1 +#define SM_KISS 2 +#define SM_FROWN 3 +#define SM_CRY 4 +#define SM_SMILE 5 +#define SM_SMIRK 6 +#define M_LGUI_SHFT 7 +#define SM_HEART 8 +#define SM_LAUGH 9 +#define M_CTL_SFT_HASH 10 +#define SM_SAD 11 +#define M_DE_OSX_CIRC_CTRLCMD 12 +#define M_MEH_SH_ACUT 13 + +//Layout keymap.c generated with ErgodoxLayoutGenerator V1.0BETA1 +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { +[BASE]=KEYMAP( +//left half +    KC_ESC, DE_OSX_1, DE_OSX_2, DE_OSX_3, DE_OSX_4, DE_OSX_5, TG(NUMB),  +    KC_TAB, DE_OSX_Q, DE_OSX_W, DE_OSX_E, DE_OSX_R, DE_OSX_T, KC_LGUI,  +    KC_LALT, DE_OSX_A, DE_OSX_S, DE_OSX_D, DE_OSX_F, DE_OSX_G,  +    KC_LSFT, CTL_T(DE_OSX_Y), DE_OSX_X, DE_OSX_C, DE_OSX_V, DE_OSX_B, KC_LALT,  +                  LT(SYMB,DE_OSX_LESS), M(M_DE_OSX_CIRC_CTRLCMD), M(M_DE_OSX_PLUS_CTRLALT), LSFT(KC_LCTRL), DE_OSX_QUOT,  +                                              KC_HOME, KC_END,  +                                                     KC_PGUP,  +                                       KC_BSPC, KC_DEL, KC_PGDN,  +    //right half +    TG(MDIA), DE_OSX_6, DE_OSX_7, DE_OSX_8, DE_OSX_9, DE_OSX_0, DE_OSX_SS,  +    KC_RGUI, DE_OSX_Z, DE_OSX_U, DE_OSX_I, DE_OSX_O, DE_OSX_P, DE_OSX_UE,  +           DE_OSX_H, DE_OSX_J, DE_OSX_K, DE_OSX_L, DE_OSX_OE, ALT_T(DE_OSX_AE),  +    KC_RALT, DE_OSX_N, DE_OSX_M, DE_OSX_COMM, DE_OSX_DOT, CTL_T(DE_OSX_MINS), KC_RSFT,  +                         MEH_T(DE_OSX_HASH), ALL_T(DE_OSX_ACUT), LGUI(KC_LSFT), LALT(KC_LSFT), LT(SYMB,DE_OSX_PLUS),  +    KC_LEFT, KC_RIGHT,  +    KC_UP,  +    KC_DOWN, KC_ENT, KC_SPC), +[SYMB]=KEYMAP( +//left half +    KC_APPLICATION, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F5,  +    KC_TRNS, DE_OSX_LESS, DE_OSX_MORE, DE_OSX_EXLM, DE_OSX_QST, KC_TRNS, KC_TRNS,  +    KC_TRNS, DE_OSX_HASH, DE_OSX_DLR, DE_OSX_BSLS, DE_OSX_SLSH, KC_DOT,  +    KC_TRNS, KC_TRNS, DE_OSX_LESS, DE_OSX_PERC, DE_OSX_PIPE, DE_OSX_TILD, KC_TRNS,  +                  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  +                                              KC_TRNS, KC_TRNS,  +                                                     KC_TRNS,  +                                       KC_TRNS, KC_DEL, KC_TRNS,  +    //right half +    KC_F6, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11,  +    KC_TRNS, DE_OSX_BSLS, DE_OSX_LBRC, DE_OSX_RBRC, DE_OSX_LESS, DE_OSX_MORE, DE_OSX_EXLM,  +           DE_OSX_SLSH, DE_OSX_LPRN, DE_OSX_RPRN, DE_OSX_LCBR, DE_OSX_RCBR, DE_OSX_HASH,  +    KC_TRNS, DE_OSX_PIPE, DE_OSX_TILD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  +                         DE_OSX_QUOT, DE_OSX_DQOT, KC_TRNS, M(M_TOGGLE_5), KC_TRNS,  +    KC_F13, KC_F12,  +    KC_F14,  +    KC_F15, KC_TRNS, KC_TRNS), +[MDIA]=KEYMAP( +//left half +    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  +    KC_TRNS, KC_TRNS, KC_BTN1, KC_MS_U, KC_BTN2, KC_WH_U, KC_TRNS,  +    KC_TRNS, KC_TRNS, KC_MS_L, KC_MS_D, KC_MS_R, KC_WH_D,  +    KC_TRNS, KC_TRNS, KC_WH_L, KC_WH_D, KC_WH_R, KC_BTN3, KC_TRNS,  +                  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  +                                              KC_TRNS, KC_TRNS,  +                                                     KC_TRNS,  +                                       KC_TRNS, KC_TRNS, KC_TRNS,  +    //right half +    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MPLY,  +    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  +           KC_VOLU, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  +    KC_TRNS, KC_VOLD, KC_TRNS, KC_MPRV, KC_MNXT, KC_UP, KC_TRNS,  +                         KC_MUTE, KC_TRNS, KC_LEFT, KC_DOWN, KC_RIGHT,  +    KC_TRNS, KC_TRNS,  +    KC_TRNS,  +    KC_TRNS, KC_TRNS, KC_WBAK), +[SMLY]=KEYMAP( +//left half +    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,  +    //right half +    M(SM_SMILE), M(SM_SMIRK), M(SM_LAUGH), KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  +    KC_TRNS, M(SM_FROWN), M(SM_SAD), M(SM_CRY), KC_TRNS, KC_TRNS, KC_TRNS,  +           M(SM_HEART), M(SM_KISS), 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), +[NUMB]=KEYMAP( +//left half +    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  +    KC_TRNS, KC_TRNS, KC_TRNS, KC_UP, KC_TRNS, KC_TRNS, KC_TRNS,  +    KC_TRNS, KC_TRNS, KC_LEFT, KC_DOWN, KC_RGHT, 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,  +    //right half +    KC_TRNS, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11,  +    KC_TRNS, DE_OSX_SLSH, KC_7, KC_8, KC_9, DE_OSX_ASTR, KC_F12,  +           DE_OSX_SLSH, KC_4, KC_5, KC_6, DE_OSX_PLUS, DE_OSX_MINS,  +    KC_TRNS, DE_OSX_PERC, KC_1, KC_2, KC_3, KC_TRNS, KC_TRNS,  +                         KC_0, KC_DOT, KC_COMM, DE_OSX_EQL, KC_TRNS,  +    KC_TRNS, KC_TRNS,  +    KC_TRNS,  +    KC_TRNS, KC_TRNS, KC_TRNS), +[EGOS]=KEYMAP( +//left half +    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_LSFT, 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_LCTL, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  +                                              KC_F1, KC_F2,  +                                                     KC_F3,  +                                       KC_SPC, KC_LCTL, KC_F4,  +    //right half +    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, M(M_TOGGLE_5), KC_TRNS,  +    KC_TRNS, KC_TRNS,  +    KC_TRNS,  +    KC_TRNS, KC_TRNS, KC_TRNS), +}; + +const uint16_t PROGMEM fn_actions[] = { + +}; + +const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) +{ +static uint16_t start; +switch(id) { +case M_TOGGLE_5: +//Macro: M_TOGGLE_5//----------------------- + if (record->event.pressed){ +           layer_state ^= (1<<5); +           layer_state &= (1<<5); +        } + +break; +case M_DE_OSX_PLUS_CTRLALT: +//Macro: M_DE_OSX_PLUS_CTRLALT//----------------------- +if (record->event.pressed) { +			start = timer_read(); +			return MACRO(D(LCTRL),D(LALT),END); +		} else { +			if (timer_elapsed(start) >150) { +				return MACRO(U(LCTRL),U(LALT),END); +			} else { +				return MACRO(U(LCTRL),U(LALT),T(RBRC),END); +			} +		} + +break; +case SM_KISS: +//Macro: SM_KISS//----------------------- +if (record->event.pressed) { +			return MACRO(D(LSFT),T(DOT),U(LSFT),T(SLSH),D(LSFT),T(RBRC),U(LSFT),END); +		} + +break; +case SM_FROWN: +//Macro: SM_FROWN//----------------------- +if (record->event.pressed) { +			return MACRO(D(LSFT),T(DOT),U(LSFT),T(SLSH),D(LALT),T(8),U(LALT),END); +		} + +break; +case SM_CRY: +//Macro: SM_CRY//----------------------- +if (record->event.pressed) { +			return MACRO(D(LSFT),T(COMM),U(LSFT),T(SLSH),D(LSFT),T(8),U(LSFT),END); +		} + +break; +case SM_SMILE: +//Macro: SM_SMILE//----------------------- +if (record->event.pressed) { +			return MACRO(D(LSFT),T(DOT),U(LSFT),T(SLSH),D(LSFT),T(9),U(LSFT),END); +		} + +break; +case SM_SMIRK: +//Macro: SM_SMIRK//----------------------- +if (record->event.pressed) { +			return MACRO(D(LSFT),T(COMM),U(LSFT),T(SLSH),D(LSFT),T(9),U(LSFT),END); +		} + +break; +case M_LGUI_SHFT: +//Macro: M_LGUI_SHFT//----------------------- +if (record->event.pressed){ +			return MACRO(D(LGUI),D(LSFT),END); +		}else{ +			return MACRO(U(LGUI),U(LSFT),U(LGUI),U(LSFT),U(LGUI),U(LSFT),U(LGUI),U(LSFT),U(LGUI),U(LSFT),U(LGUI),U(LSFT),U(LGUI),U(LSFT),U(LGUI),U(LSFT),U(LGUI),U(LSFT),U(LGUI),U(LSFT),END); +		} + +break; +case SM_HEART: +//Macro: SM_HEART//----------------------- +if (record->event.pressed) { +			return MACRO(T(GRV),T(3),END); +		} + +break; +case SM_LAUGH: +//Macro: SM_LAUGH//----------------------- +if (record->event.pressed) { +			return MACRO(D(LSFT),T(DOT),U(LSFT),T(SLSH),D(LSFT),T(D),U(LSFT),END); +		} + +break; +case M_CTL_SFT_HASH: +//Macro: M_CTL_SFT_HASH//----------------------- +if (record->event.pressed) { +			start = timer_read(); +			return MACRO(D(LCTRL),D(LSFT),END); +		} else { +			if (timer_elapsed(start) >150) { +				return MACRO(U(LCTRL),U(LSFT),END); +			} else { +				return MACRO(U(LCTRL),U(LSFT),T(BSLS),END); +			} +		} + +break; +case SM_SAD: +//Macro: SM_SAD//----------------------- +if (record->event.pressed) { +			return MACRO(D(LSFT),T(DOT),U(LSFT),T(SLSH),D(LSFT),T(8),U(LSFT),END); +		} + +break; +case M_DE_OSX_CIRC_CTRLCMD: +//Macro: M_DE_OSX_CIRC_CTRLCMD//----------------------- +if (record->event.pressed) { +			start = timer_read(); +			return MACRO(D(LCTRL),D(LGUI),END); +		} else { +			if (timer_elapsed(start) >150) { +				return MACRO(U(LCTRL),U(LGUI),END); +			} else { +				return MACRO(U(LCTRL),U(LGUI),T(NUBS),END); +			} +		} + +break; +case M_MEH_SH_ACUT: +//Macro: M_MEH_SH_ACUT//----------------------- +if (record->event.pressed) { +			start = timer_read(); +			return MACRO(D(LCTRL),D(LSFT),D(LALT),END); +		} else { +			if (timer_elapsed(start) >150) { +				return MACRO(U(LCTRL),U(LSFT),U(LALT),END); +			} else { +				return MACRO(U(LCTRL),U(LALT),T(EQL),U(LSFT),END); +			} +		} + +break; +} +return MACRO_NONE; +}; + +// Runs just one time when the keyboard initializes. +void matrix_init_user(void) { + +}; + +// Runs constantly in the background, in a loop. +void matrix_scan_user(void) { + +uint8_t layer = biton32(layer_state); + +ergodox_board_led_off(); +ergodox_right_led_1_off(); +ergodox_right_led_2_off(); +ergodox_right_led_3_off(); +switch (layer) { + +    case SYMB: +        ergodox_right_led_1_on(); +         +         +    break; +    case MDIA: +         +        ergodox_right_led_2_on(); +         +    break; +    case SMLY: +         +         +        ergodox_right_led_3_on(); +    break; +    case NUMB: +        ergodox_right_led_1_on(); +         +        ergodox_right_led_3_on(); +    break; +    case EGOS: +        ergodox_right_led_1_on(); +        ergodox_right_led_2_on(); +        ergodox_right_led_3_on(); +    break; +default: +// none +break; +} + +}; + diff --git a/keyboard/ergodox_ez/keymaps/osx_de_experimental/osx_de_experimental_highres.png b/keyboard/ergodox_ez/keymaps/osx_de_experimental/osx_de_experimental_highres.pngBinary files differ new file mode 100644 index 000000000..b1e9e763e --- /dev/null +++ b/keyboard/ergodox_ez/keymaps/osx_de_experimental/osx_de_experimental_highres.png diff --git a/quantum/keymap_extras/keymap_german_osx.h b/quantum/keymap_extras/keymap_german_osx.h index d0b77fb80..ee725bad5 100644 --- a/quantum/keymap_extras/keymap_german_osx.h +++ b/quantum/keymap_extras/keymap_german_osx.h @@ -85,8 +85,8 @@  #define DE_OSX_UNDS LSFT(DE_OSX_MINS) // _  // Alt-ed characters -#define DE_OSX_SQ2 LALT(KC_2) // ² -#define DE_OSX_SQ3 LALT(KC_3) // ³ +//#define DE_OSX_SQ2 LALT(KC_2) // ² +//#define DE_OSX_SQ3 LALT(KC_3) // ³  #define DE_OSX_LCBR LALT(KC_8) // {  #define DE_OSX_LBRC LALT(KC_5) // [  #define DE_OSX_RBRC LALT(KC_6) // ] | 
