update pics and readme

keyboards/ergodox/keymaps/dvorak-hebrew/keymap.c → keyboards/ergodox/keymaps/twentylives_dvorak_with_hebrew/keymap.c

@@ -1,13 +1,11 @@
-#include "ergodox_ez.h"
+#include "ergodox.h"
 #include "debug.h"
 #include "action_layer.h"
-
-#define BASE 0 // default layer
-#define HEB 1 // Hebrew-Dvorak
-#define NUM 2 // symbols
-#define NAV 3 // media keys
+#include "version.h"
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+
 /* Keymap 0: Basic Dvorak layer
  *
  * ,--------------------------------------------------.           ,--------------------------------------------------.
@@ -22,86 +20,86 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  *   |FN2   | COPY | CUT  | PASTE| FN1  |                                       |   [  |   ]  |   \  | UNDO | CTRL+A |
  *   `----------------------------------'                                       `------------------------------------'
  *                                        ,-------------.       ,-------------.
-*                                         | DEL  | WIN+D|       | END  | HOME   |
+*                                         | DEL  |      |       | END  | HOME   |
  *                                 ,------|------|------|       |------+--------+------.
  *                                 |      |      | SUPER|       | PgUp |        |      |
  *                                 | BACK | CTRL |------|       |------|  Enter |SPACE |
  *                                 | SPACE|      | ALT  |       | PgDn |        |      |
  *                                 `--------------------'       `----------------------'
  */
-[BASE] = KEYMAP(  // layer 0 : default
-        // left hand
-        TG(HEB), KC_1,           KC_2,       KC_3,           KC_4,          KC_5,    LALT(KC_LSFT),
-        KC_TAB,  KC_QUOT,        KC_COMM,    KC_DOT,         KC_P,          KC_Y,    TG(NUM),
-        KC_ESC,  KC_A,           KC_O,       KC_E,           KC_U,          KC_I,
-        KC_LSFT, KC_SCLN,        KC_Q,       KC_J,           KC_K,          KC_X,    TG(NAV),
-        MO(NUM), LCTL(KC_C),     LCTL(KC_X), LCTL(KC_V),     MO(NAV),
-                                                             KC_DEL,        KC_TRNS,
-                                                                            KC_LGUI,
-                                                             KC_BSPC,       KC_LCTL, KC_LALT,
-        // right hand
-        KC_GRV,     KC_6,     KC_7,    KC_8,    KC_9,    KC_0,        KC_EQL,
-        KC_TRNS,    KC_F,     KC_G,    KC_C,    KC_R,    KC_L,        KC_SLSH,
-                    KC_D,     KC_H,    KC_T,    KC_N,    KC_S,        KC_MINS,
-        KC_TRNS,    KC_B,     KC_M,    KC_W,    KC_V,    KC_Z,        KC_RSFT,
-                              KC_LBRC, KC_RBRC, KC_BSLS, LCTL(KC_Z),  LCTL(KC_A),
-        KC_END,     KC_HOME,
-        KC_PGUP,
-        KC_PGDN,    KC_ENT,  KC_SPC
-    ),
-/* Keymap 1: Hebrew Dvorak layer
+[0] = KEYMAP(
+	TG(1),     KC_1,      KC_2,     KC_3,     KC_4,  KC_5, LALT(KC_LSHIFT),
+	KC_TAB,    KC_QUOTE,  KC_COMMA, KC_DOT,   KC_P,  KC_Y, TG(3),
+	KC_ESCAPE, KC_A,      KC_O,     KC_E,     KC_U,  KC_I,
+	KC_LSHIFT, KC_SCOLON, KC_Q,     KC_J,     KC_K,  KC_X, TG(2),
+	MO(3),     KC_COPY,   KC_CUT,   KC_PASTE, MO(2),
+	                                          KC_DELETE, KC_TRNS,
+	                                                     KC_LGUI,
+	                              KC_BSPACE,CTL_T(KC_NO),KC_LALT,
+	
+	KC_TILD,   KC_6,    KC_7,        KC_8,        KC_9,      KC_0,     KC_TRNS,
+	KC_TRNS,   KC_F,    KC_G,        KC_C,        KC_R,      KC_L,     KC_SLASH,
+	KC_D,      KC_H,    KC_T,        KC_N,        KC_S,      KC_MINUS,
+	KC_TRNS,   KC_B,    KC_M,        KC_W,        KC_V,      KC_Z,     KC_LSHIFT,
+	                    KC_LBRACKET, KC_RBRACKET, KC_BSLASH, KC_UNDO,  LCTL(KC_A),
+	KC_END,    KC_HOME,
+	KC_PGUP,
+	KC_PGDOWN, KC_ENTER, KC_SPACE
+),
+
+ /* Keymap 1: Hebrew layer
  *
  * ,--------------------------------------------------.           ,--------------------------------------------------.
- * | Hebrew |   1  |   2  |   3  |   4  |   5  |ALT+S |           |B.tick|  6   |   7  |   8  |   9  |   0  |   =    |
+ * |        |      |      |      |      |      |      |           |      |      |      |      |      |      |        |
  * |--------+------+------+------+------+-------------|           |------+------+------+------+------+------+--------|
- * | TAB    |   '  |   ,  |   .  |   P  |   Y  | LCK2 |           |      |   F  |   G  |   C  |   R  |   L  |   /    |
+ * |        |      |      |      |      |      |      |           |      |      |      |      |      |      |        |
  * |--------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
- * | ESC    |   A  |   O  |   E  |   U  |   I  |------|           |------|   D  |   H  |   T  |   N  |   S  |   -    |
- * |--------+------+------+------+------+------| LCK1 |           |      |------+------+------+------+------+--------|
- * | LShift |   ;  |   Q  |   J  |   K  |   X  |      |           |      |   B  |   M  |   W  |   V  |   Z  | RSHIFT |
+ * |        |      |      |      |      |      |------|           |------|      |      |      |      |      |        |
+ * |--------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
+ * |        |      |      |      |      |      |      |           |      |      |      |      |      |      |        |
  * `--------+------+------+------+------+-------------'           `-------------+------+------+------+------+--------'
- *   |FN2   | COPY | CUT  | PASTE| FN1  |                                       |   [  |   ]  |   \  | UNDO | CTRL+A |
- *   `----------------------------------'                                       `------------------------------------'
+ *   |      |      |      |      |      |                                       |      |      |      |      |      |
+ *   `----------------------------------'                                       `----------------------------------'
  *                                        ,-------------.       ,-------------.
-*                                         | DEL  | WIN+D|       | END  | HOME   |
- *                                 ,------|------|------|       |------+--------+------.
- *                                 |      |      | SUPER|       | PgUp |        |      |
- *                                 | BACK | CTRL |------|       |------|  Enter |SPACE |
- *                                 | SPACE|      | ALT  |       | PgDn |        |      |
- *                                 `--------------------'       `----------------------'
+ *                                        |      |      |       |      |      |
+ *                                 ,------|------|------|       |------+------+------.
+ *                                 |      |      |      |       |      |      |      |
+ *                                 |      |      |------|       |------|      |      |
+ *                                 |      |      |      |       |      |      |      |
+ *                                 `--------------------'       `--------------------'
  */
-[HEB] = KEYMAP(  // layer 0 : default
-       // left hand
-       KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-       KC_TRNS, KC_W,    KC_QUOT, KC_SLSH, KC_R,    KC_T,    KC_TRNS,
-       KC_TRNS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,
-       KC_TRNS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    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_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-       KC_TRNS,  KC_Y,    KC_U,    KC_E,    KC_O,    KC_P,    KC_TRNS,
-                 KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_MPLY,
-       KC_TRNS,  KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_I,    KC_TRNS,
-                          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-       KC_TRNS, KC_TRNS,
-       KC_TRNS,
-       KC_TRNS, KC_TRNS, KC_TRNS
-    ),
- /* Keymap 2: Numpad Layer
+[1] = KEYMAP(
+	KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS,
+	KC_TRNS, KC_W,    KC_QUOTE, KC_SLASH, KC_R,    KC_T,    KC_TRNS,
+	KC_TRNS, KC_A,    KC_S,     KC_D,     KC_F,    KC_G,
+	KC_TRNS, KC_Z,    KC_X,     KC_C,     KC_V,    KC_B,    KC_TRNS,
+	KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS,  KC_TRNS,
+	                                               KC_TRNS, KC_TRNS,
+	                                                        KC_TRNS,
+	                                      KC_TRNS, KC_TRNS, KC_TRNS,
+	
+	KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS,   KC_TRNS,   KC_TRNS,
+	KC_TRNS, KC_Y,    KC_U,    KC_E,     KC_O,      KC_P,      KC_TRNS,
+	         KC_H,    KC_J,    KC_K,     KC_L,      KC_SCOLON, KC_TRNS,
+	KC_TRNS, KC_N,    KC_M,    KC_COMMA, KC_DOT,    KC_I,      KC_TRNS,
+                    KC_TRNS, KC_TRNS,  KC_TRNS,   KC_TRNS,   KC_TRNS,
+	KC_TRNS, KC_TRNS,
+	KC_TRNS,
+	KC_TRNS, KC_TRNS, KC_TRNS
+),
+
+/* Keymap 2: Arrows ,Mouse Navigation and F Layer
  *
  * ,--------------------------------------------------.           ,--------------------------------------------------.
- * |        |      |      |      |      |      |      |           |      |      | NMLK |  P/  |  P*  |  P-  |        |
+ * |        |  F1  |  F2  |  F3  |  F4  |  F5  |      |           |      |  F6  |  F7  |  F8  |  F9  |  F10 |        |
  * |--------+------+------+------+------+-------------|           |------+------+------+------+------+------+--------|
- * |        |      |      |      |      |      |      |           |      |      |  7   |   8  |  9   |  P+  |        |
- * |--------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
- * |        |      |      |      |      |      |------|           |------|      |  4   |   5  |  6   |  P+  |        |
+ * |        |      |      | MsUp |      |      |      |           |  F11 |      |      |  UP  |      |      |        |
  * |--------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
- * |        |      |      |      |      |      |      |           |      |      |  1   |   2  |  3   | ENTER|        |
+ * |        |      |MsLeft|MsDown|MsRght|      |------|           |------|      | LEFT | DOWN | RIGHT|      |        |
+ * |--------+------+------+------+------+------|      |           |  F12 |------+------+------+------+------+--------|
+ * |        |      |      |      |      |      |      |           |      |      |      |      |      |      |        |
  * `--------+------+------+------+------+-------------'           `-------------+------+------+------+------+--------'
- *   |      |      |      |      |      |                                       |  0   |   0  |  .   | ENTER|      |
+ *   |      |      |      |      |      |                                       | Lclk | Rclk |      |      |      |
  *   `----------------------------------'                                       `----------------------------------'
  *                                        ,-------------.       ,-------------.
  *                                        |      |      |       |      |      |
@@ -111,94 +109,87 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  *                                 |      |      |      |       |      |      |      |
  *                                 `--------------------'       `--------------------'
  */
-[NUM] = KEYMAP(
-       // left hand
-       KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-       KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-       KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-       KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 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_TRNS,  KC_NLCK, KC_PSLS, KC_PAST, 	KC_PMNS, KC_TRNS,
-       KC_TRNS,  KC_TRNS,  KC_P7,   KC_P8,   KC_P9,   	KC_PPLS, KC_TRNS,
-                 KC_TRNS,  KC_P4,   KC_P5,   KC_P6,   	KC_PPLS, KC_TRNS,
-       KC_TRNS,  KC_TRNS,  KC_P1,   KC_P2,   KC_P3,   	KC_PENT, KC_TRNS,
-                           KC_P0,   KC_P0,   KC_DOT,    KC_PENT, KC_TRNS,
-       KC_TRNS,  KC_TRNS,
-       KC_TRNS,
-       KC_TRNS,  KC_TRNS,  KC_TRNS
+[2] = KEYMAP(
+	KC_TRNS, KC_F1,   KC_F2,      KC_F3,      KC_F4,       KC_F5,   KC_TRNS, 
+	KC_TRNS, KC_TRNS, KC_TRNS,    KC_MS_UP,   KC_TRNS,     KC_TRNS, KC_TRNS,
+	KC_TRNS, KC_TRNS, KC_MS_LEFT, KC_MS_DOWN, KC_MS_RIGHT, KC_TRNS, 
+	KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS,    KC_TRNS,     KC_TRNS, KC_TRNS,
+	KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS,    KC_TRNS,
+	                                                       KC_TRNS, KC_TRNS,
+	                                                                KC_TRNS,
+	                                              KC_TRNS, KC_TRNS, KC_TRNS,
+
+	KC_TRNS,    KC_F6,      KC_F7,      KC_F8,      KC_F9,   KC_F10,  KC_TRNS,
+	KC_F11,     KC_TRNS,    KC_TRNS,    KC_UP,      KC_TRNS, KC_TRNS, KC_TRNS, 
+	KC_TRNS,    KC_LEFT,    KC_DOWN,    KC_RIGHT,   KC_TRNS, KC_TRNS,
+	KC_F12,     KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS, KC_TRNS, KC_TRNS,
+	                        KC_MS_BTN1, KC_MS_BTN2, KC_TRNS, KC_TRNS, KC_TRNS,
+	KC_TRNS,    KC_TRNS,
+	KC_TRNS, 
+	KC_TRNS,    KC_TRNS,    KC_TRNS
 ),
-/* Keymap 3: Arrows and Mouse Navigation Layer
+
+ /* Keymap 3: Numpad Layer
  *
  * ,--------------------------------------------------.           ,--------------------------------------------------.
- * |        |  F1  |  F2  |  F3  |  F4  |  F5  |      |           | MUTE |  F6  |  F7  |  F8  |  F9  |  F10 |        |
+ * |        |      |      |      |      |      |      |           |      |      | NMLK |  P/  |  P*  |  P-  |        |
  * |--------+------+------+------+------+-------------|           |------+------+------+------+------+------+--------|
- * |        |      |      | MsUp |      |      | F11  |           | VOL  |      |      |  UP  |      |      |        |
- * |--------+------+------+------+------+------|      |           |   +  |------+------+------+------+------+--------|
- * |        |      |MsLeft|MsDown|MsRght|      |------|           |------|      | LEFT | DOWN | RIGHT|      |        |
- * |--------+------+------+------+------+------| F12  |           | VOL  |------+------+------+------+------+--------|
- * |        |      |      |      |      |      |      |           |   -  |      |      |      |      |      |        |
+ * |        |      |      |      |      |      |      |           |      |      |  7   |   8  |  9   |  P+  |        |
+ * |--------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
+ * |        |      |      |      |      |      |------|           |------|      |  4   |   5  |  6   |  P+  |        |
+ * |--------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
+ * |        |      |      |      |      |      |      |           |      |      |  1   |   2  |  3   | ENTER|        |
  * `--------+------+------+------+------+-------------'           `-------------+------+------+------+------+--------'
- *   |      |      |      |      |      |                                       | Lclk | Rclk |      |      |      |
+ *   |      |      |      |      |      |                                       |  0   |   0  |  .   | ENTER|      |
  *   `----------------------------------'                                       `----------------------------------'
  *                                        ,-------------.       ,-------------.
- *                                        |      |      |       | PL/PS|      |
+ *                                        |      |      |       |      |      |
  *                                 ,------|------|------|       |------+------+------.
- *                                 |      |      |      |       | NEXT |      |      |
+ *                                 |      |      |      |       |      |      |      |
  *                                 |      |      |------|       |------|      |      |
- *                                 |      |      |      |       | PREV |      |      |
+ *                                 |      |      |      |       |      |      |      |
  *                                 `--------------------'       `--------------------'
  */
-[NAV] = KEYMAP(
-       KC_TRNS, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_TRNS,
-       KC_TRNS, KC_TRNS, KC_TRNS, KC_MS_U, KC_TRNS, KC_TRNS, KC_F11,
-       KC_TRNS, KC_TRNS, KC_MS_L, KC_MS_D, KC_MS_R, KC_TRNS,
-       KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_F12,
-       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_F6,   KC_F7,   KC_F8,   KC_F9,    KC_F10,  KC_TRNS,
-       KC_VOLU,  KC_TRNS,   KC_TRNS, KC_UP,   KC_TRNS,  KC_TRNS, KC_TRNS,
-                 KC_TRNS,   KC_LEFT, KC_DOWN, KC_RIGHT, KC_TRNS, KC_MPLY,
-       KC_VOLD,  KC_TRNS,   KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS,
-                            KC_BTN1, KC_BTN2, KC_TRNS,  KC_TRNS, KC_TRNS,
-       KC_MPLY,  KC_TRNS,
-       KC_MNXT,
-       KC_MPRV,  KC_TRNS,   KC_TRNS
+[3] = KEYMAP(
+	// Left Hand
+	KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS,    KC_TRNS,     KC_TRNS, KC_TRNS,
+	KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS,    KC_TRNS,     KC_TRNS, KC_TRNS,
+	KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS,    KC_TRNS,     KC_TRNS, 
+	KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS,    KC_TRNS,     KC_TRNS, 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_TRNS,  KC_LOCKING_NUM, KC_KP_SLASH, KC_KP_ASTERISK, KC_KP_MINUS, KC_TRNS, 
+	KC_TRNS, KC_TRNS,  KC_KP_7,        KC_KP_8,     KC_KP_9,        KC_KP_PLUS,  KC_TRNS,
+	         KC_TRNS,  KC_KP_4,        KC_KP_5,     KC_KP_6,        KC_KP_PLUS,  KC_TRNS,     
+	KC_TRNS, KC_TRNS,  KC_KP_1,        KC_KP_2,     KC_KP_3,        KC_ENTER,    KC_TRNS,
+	                   KC_KP_0,        KC_KP_0,     KC_KP_DOT,      KC_ENTER,    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(NAV)                // FN1 - Momentary Layer 1 (Symbols)
+  [1] = ACTION_LAYER_TAP_TOGGLE(1)
 };
 
 const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
 {
-  // MACRODOWN only works in this function
       switch(id) {
         case 0:
         if (record->event.pressed) {
-          register_code(KC_RSFT);
-        } else {
-          unregister_code(KC_RSFT);
+          SEND_STRING (QMK_KEYBOARD "/" QMK_KEYMAP " @ " QMK_VERSION);
         }
         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) {
+void matrix_scan_user(void) {
 
     uint8_t layer = biton32(layer_state);
 
@@ -207,18 +198,15 @@ void * matrix_scan_user(void) {
     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:
+        case 3:
             ergodox_right_led_3_on();
-            break;
         default:
-            // none
             break;
     }
 

keyboards/ergodox/keymaps/dvorak-hebrew/readme.md → keyboards/ergodox/keymaps/twentylives_dvorak_with_hebrew/readme.md

@@ -6,4 +6,5 @@
 
 * these are only good when using a public computer or one you can't change settings on, because you need to change both keyboard layout and os layout each time you change language. A better solution is to use [hebrew-hw-dvorak](https://github.com/20lives/hebrew-hw-dvorak) as os layout.
 
-![layout image](https://github.com/20lives/qmk_firmware/blob/master/keyboards/ergodox/keymaps/dvorak-hebrew/twentylives.png?raw=true)
+![layout image](https://github.com/20lives/qmk_firmware/blob/master/keyboards/ergodox/keymaps/dvorak-hebrew/keymap.png)
+![layout image](https://github.com/20lives/qmk_firmware/blob/master/keyboards/ergodox/keymaps/dvorak-hebrew/keymap2.png)