]> git.donarmstrong.com Git - qmk_firmware.git/commitdiff
projects / qmk_firmware.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: ed74bd9)
[Keyboard] Layout and configuration updates for Signum 3.0 (#5652)
authorJan Christoph Ebersbach <jceb@e-jc.de>
Sat, 20 Apr 2019 06:37:19 +0000 (08:37 +0200)
committerDrashna Jaelre <drashna@live.com>
Sat, 20 Apr 2019 06:37:19 +0000 (23:37 -0700)
* Make Signum 3.0 compatible with default ortho_4x12 layout

* Disable unicode map by default

* Add missing backspace key

* Add missing delete key

* Fix broken gui right command

* Move MO5 to a different key an add Esc to L4

* Move MO5 to a different key

* Add Del and Bspace to layer 4

keyboards/signum/3_0/elitec/elitec.h patch | blob | history
keyboards/signum/3_0/elitec/info.json patch | blob | history
keyboards/signum/3_0/elitec/keymaps/default/generate_km.py patch | blob | history
keyboards/signum/3_0/elitec/keymaps/default/keymap.c patch | blob | history
keyboards/signum/3_0/elitec/keymaps/default/layout.py patch | blob | history
keyboards/signum/3_0/elitec/keymaps/default/rules.mk [new file with mode: 0644] patch | blob
keyboards/signum/3_0/elitec/rules.mk patch | blob | history

diff --git a/keyboards/signum/3_0/elitec/elitec.h b/keyboards/signum/3_0/elitec/elitec.h
index 1749969de35fd62d414f117b58055a04739856e7..d28d3d476975be4cb1de299bc6da511576bac070 100644 (file)
--- a/keyboards/signum/3_0/elitec/elitec.h
+++ b/keyboards/signum/3_0/elitec/elitec.h
@@ -2,7 +2,7 @@
 
 #include "quantum.h"
 
-#define LAYOUT( \
+#define LAYOUT_ortho_4x12( \
        K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, \
        K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, \
        K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, \
diff --git a/keyboards/signum/3_0/elitec/info.json b/keyboards/signum/3_0/elitec/info.json
index e93dceb13c7898304bcfcf489c7d227a694806a3..e414d15967ba528d5f58e065fd14b58a1bfa0cc3 100644 (file)
--- a/keyboards/signum/3_0/elitec/info.json
+++ b/keyboards/signum/3_0/elitec/info.json
@@ -5,7 +5,8 @@
     "width": 17,
     "height": 8,
     "layouts": {
-        "LAYOUT": {
+        "LAYOUT_ortho_4x12": {
+            "key_count": 48,
             "layout": [
 
                 { "x": 1.25, "y": 0.75, "r": 15 },
@@ -13,15 +14,15 @@
                 { "x": 1.25, "y": 2.75, "r": 15 },
                 { "x": 1.25, "y": 4.25, "r": 15 },
 
-                { "x": 2.25, "y": 0.5, "r": 15 },
-                { "x": 2.25, "y": 1.5, "r": 15 },
-                { "x": 2.25, "y": 2.5, "r": 15 },
-                { "x": 2.25, "y": 3.5, "r": 15 },
+                { "x": 2.25, "y": 0.75, "r": 15 },
+                { "x": 2.25, "y": 1.75, "r": 15 },
+                { "x": 2.25, "y": 2.75, "r": 15 },
+                { "x": 2.25, "y": 3.75, "r": 15 },
 
-                { "x": 3.25, "y": 0, "r": 15 },
-                { "x": 3.25, "y": 1, "r": 15 },
-                { "x": 3.25, "y": 2, "r": 15 },
-                { "x": 3.25, "y": 3, "r": 15 },
+                { "x": 3.25, "y": 0.5, "r": 15 },
+                { "x": 3.25, "y": 1.5, "r": 15 },
+                { "x": 3.25, "y": 2.5, "r": 15 },
+                { "x": 3.25, "y": 3.5, "r": 15 },
 
                 { "x": 4.25, "y": 0.25, "r": 15 },
                 { "x": 4.25, "y": 1.25, "r": 15 },
@@ -55,15 +56,15 @@
                 { "x": 11.25, "y": 1.25, "r": -15 },
                 { "x": 11.25, "y": 2.25, "r": -15 },
 
-                { "x": 12.25, "y": 0, "r": -15 },
-                { "x": 12.25, "y": 1, "r": -15 },
-                { "x": 12.25, "y": 2, "r": -15 },
-                { "x": 12.25, "y": 3, "r": -15 },
+                { "x": 12.25, "y": 0.5, "r": -15 },
+                { "x": 12.25, "y": 1.5, "r": -15 },
+                { "x": 12.25, "y": 2.5, "r": -15 },
+                { "x": 12.25, "y": 3.5, "r": -15 },
 
-                { "x": 13.25, "y": 0.5, "r": -15 },
-                { "x": 13.25, "y": 1.5, "r": -15 },
-                { "x": 13.25, "y": 2.5, "r": -15 },
-                { "x": 13.25, "y": 3.5, "r": -15 },
+                { "x": 13.25, "y": 0.75, "r": -15 },
+                { "x": 13.25, "y": 1.75, "r": -15 },
+                { "x": 13.25, "y": 2.75, "r": -15 },
+                { "x": 13.25, "y": 3.75, "r": -15 },
 
                 { "x": 14.25, "y": 0.75, "r": -15 },
                 { "x": 14.25, "y": 1.75, "r": -15 },
diff --git a/keyboards/signum/3_0/elitec/keymaps/default/generate_km.py b/keyboards/signum/3_0/elitec/keymaps/default/generate_km.py
index 5147121b34daac821b30457b74779497252f4877..7778da8f5542554773864c876c8c825c1a6e3be1 100755 (executable)
--- a/keyboards/signum/3_0/elitec/keymaps/default/generate_km.py
+++ b/keyboards/signum/3_0/elitec/keymaps/default/generate_km.py
@@ -104,7 +104,7 @@ if __name__ == "__main__":
                 output.write(" *                                 -------------------------------------------------\n")
                 output.write(" */\n")
 
-                l_code = '\tLAYOUT(\n'
+                l_code = '\tLAYOUT_ortho_4x12(\n'
                 for r in range(r_counter):
                     r_counter -= 1
                     c_counter = 12
diff --git a/keyboards/signum/3_0/elitec/keymaps/default/keymap.c b/keyboards/signum/3_0/elitec/keymaps/default/keymap.c
index d7feba349a67a3f8844c7788352aaf8af0d3cb2f..22d60085f4c6c91049a558f71dd19b8abd5e0793 100644 (file)
--- a/keyboards/signum/3_0/elitec/keymaps/default/keymap.c
+++ b/keyboards/signum/3_0/elitec/keymaps/default/keymap.c
@@ -634,7 +634,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  *    MO2    LGui    LAlt          |  TT2  |LT6_SPC|  TT4  | Enter | Space |  TT2  |         RAlt    RGui    RCtrl
  *                                 -------------------------------------------------
  */
-       LAYOUT(
+       LAYOUT_ortho_4x12(
                KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC,
                KC_LCTRL, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT,
                KC_LSPO, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSPC,
@@ -652,7 +652,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  *    MO2    LGui    LAlt          |  TT2  |LT6_SPC|  TT4  | Enter | Space |  TT2  |         RAlt    RGui    RCtrl
  *                                 -------------------------------------------------
  */
-       LAYOUT(
+       LAYOUT_ortho_4x12(
                KC_TAB, KC_Q, KC_W, KC_F, KC_P, KC_G, KC_J, KC_L, KC_U, KC_Y, KC_SCLN, KC_LBRC,
                KC_LCTRL, KC_A, KC_R, KC_S, KC_T, KC_D, KC_H, KC_N, KC_E, KC_I, KC_O, KC_QUOT,
                KC_LSPO, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_K, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSPC,
@@ -665,16 +665,16 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * -------------------------------------------------               -------------------------------------------------
  * |       |  DF0  |  DF1  |  XXX  |  XXX  |  MO3  |               |   4   |   4   |   5   |   6   |   -   |   =   |
  * -------------------------------------------------               -------------------------------------------------
- * |       |  MO5  |  XXX  |  XXX  |  XXX  |  XXX  |               |   1   |   1   |   2   |   3   |   \   |       |
+ * |       |  XXX  |  XXX  |  XXX  |  XXX  |  MO5  |               |   1   |   1   |   2   |   3   |   \   |       |
  * -----------------------------------------------------------------------------------------------------------------
- *    TG2                          |       |       |       |       |       |   0   |
+ *    TG2                          |       |  Del  |       |       |BSpace |   0   |
  *                                 -------------------------------------------------
  */
-       LAYOUT(
+       LAYOUT_ortho_4x12(
                KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_RBRC,
                KC_TRNS, DF(0), DF(1), XXXXXXX, XXXXXXX, MO(3), KC_4, KC_4, KC_5, KC_6, KC_MINS, KC_EQL,
-               KC_TRNS, MO(5), XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_1, KC_1, KC_2, KC_3, KC_BSLS, KC_TRNS,
-               TG(2), KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_0, KC_TRNS, KC_TRNS, KC_TRNS
+               KC_TRNS, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, MO(5), KC_1, KC_1, KC_2, KC_3, KC_BSLS, KC_TRNS,
+               TG(2), KC_TRNS, KC_TRNS, KC_TRNS, KC_DEL, KC_TRNS, KC_TRNS, KC_BSPC, KC_0, KC_TRNS, KC_TRNS, KC_TRNS
        ),
 
 /* Layer 3
@@ -688,7 +688,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  *    TG3                          |       |       |       |  F10  |  F11  |  F12  |
  *                                 -------------------------------------------------
  */
-       LAYOUT(
+       LAYOUT_ortho_4x12(
                KC_TRNS, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, XXXXXXX,
                KC_TRNS, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, MO(3), KC_F4, KC_F4, KC_F5, KC_F6, XXXXXXX, XXXXXXX,
                KC_TRNS, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_F1, KC_F1, KC_F2, KC_F3, XXXXXXX, KC_TRNS,
@@ -697,20 +697,20 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 /* Layer 4
  * -------------------------------------------------               -------------------------------------------------
- * |       |  Esc  | Tab x | Tab n |CPg Dn |CPg Dn |               |Pg Down| Home  |^ Arrow|Insert |SInsert|  Esc  |
+ * |  Esc  |  Esc  | Tab x | Tab n |CPg Dn |CPg Dn |               |Pg Down| Home  |^ Arrow|Insert |SInsert|  Esc  |
  * -------------------------------------------------               -------------------------------------------------
- * |       | Caps  | < Gui |Gui Tab|  ðŸ’¥   |  ðŸ’¥   |               |< Arrow|< Arrow|v Arrow|> Arrow|  End  |Pr Scr |
+ * |       | Caps  | < Gui |Gui Tab| > Gui | > Gui |               |< Arrow|< Arrow|v Arrow|> Arrow|  End  |Pr Scr |
  * -------------------------------------------------               -------------------------------------------------
  * |       |  XXX  |  XXX  |  XXX  |CPg Up |CPg Up |               | Pg Up |  XXX  |v Arrow|  XXX  |  App  |       |
  * -----------------------------------------------------------------------------------------------------------------
- *    TG4                          |       |       |       |       |       |       |
+ *    TG4                          |       |  Del  |       |       |BSpace |       |
  *                                 -------------------------------------------------
  */
-       LAYOUT(
-               KC_TRNS, KC_ESC, LCTL(KC_W), LCTL(KC_T), CTL_T(KC_PGDN), CTL_T(KC_PGDN), KC_PGDN, KC_HOME, KC_UP, KC_INS, SFT_T(KC_INS), KC_ESC,
-               KC_TRNS, KC_CAPS, LGUI_T(KC_RIGHT), LGUI_T(KC_TAB), XXXXXXX, XXXXXXX, KC_LEFT, KC_LEFT, KC_DOWN, KC_RIGHT, KC_END, KC_PSCR,
+       LAYOUT_ortho_4x12(
+               KC_ESC, KC_ESC, LCTL(KC_W), LCTL(KC_T), CTL_T(KC_PGDN), CTL_T(KC_PGDN), KC_PGDN, KC_HOME, KC_UP, KC_INS, SFT_T(KC_INS), KC_ESC,
+               KC_TRNS, KC_CAPS, LGUI_T(KC_LEFT), LGUI_T(KC_TAB), LGUI_T(KC_RIGHT), LGUI_T(KC_RIGHT), KC_LEFT, KC_LEFT, KC_DOWN, KC_RIGHT, KC_END, KC_PSCR,
                KC_TRNS, XXXXXXX, XXXXXXX, XXXXXXX, CTL_T(KC_PGUP), CTL_T(KC_PGUP), KC_PGUP, XXXXXXX, KC_DOWN, XXXXXXX, KC_APP, KC_TRNS,
-               TG(4), KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
+               TG(4), KC_TRNS, KC_TRNS, KC_TRNS, KC_DEL, KC_TRNS, KC_TRNS, KC_BSPC, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
        ),
 
 /* Layer 5
@@ -719,15 +719,15 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * -------------------------------------------------               -------------------------------------------------
  * |       |  XXX  |  |<<  | Vol 0 |  >>|  |  XXX  |               |  XXX  |  XXX  |  XXX  |  XXX  |  XXX  | Sleep |
  * -------------------------------------------------               -------------------------------------------------
- * |       |  XXX  |  XXX  | Vol - | Vol - |  XXX  |               |  XXX  |  XXX  |  XXX  |  XXX  |  XXX  |  XXX  |
+ * |       |  XXX  |  XXX  | Vol - | Vol - |  MO5  |               |  XXX  |  XXX  |  XXX  |  XXX  |  XXX  |  XXX  |
  * -----------------------------------------------------------------------------------------------------------------
  *    TG5                          |       |       |       |       |       |       |
  *                                 -------------------------------------------------
  */
-       LAYOUT(
+       LAYOUT_ortho_4x12(
                KC_TRNS, XXXXXXX, KC_MPLY, KC_VOLU, KC_VOLU, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RESET, KC_PWR,
                KC_TRNS, XXXXXXX, KC_MPRV, KC_MUTE, KC_MNXT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_SLEP,
-               KC_TRNS, XXXXXXX, XXXXXXX, KC_VOLD, KC_VOLD, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
+               KC_TRNS, XXXXXXX, XXXXXXX, KC_VOLD, KC_VOLD, MO(5), XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
                TG(5), KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
        ),
 
@@ -742,7 +742,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  *    TG6                          |       |       |       |       |       |       |
  *                                 -------------------------------------------------
  */
-       LAYOUT(
+       LAYOUT_ortho_4x12(
                KC_TRNS, KC_ACL1, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_WH_U, KC_WH_L, KC_MS_U, KC_WH_R, XXXXXXX, XXXXXXX,
                KC_TRNS, KC_ACL2, KC_BTN3, KC_BTN2, KC_BTN1, KC_BTN1, KC_MS_L, KC_MS_L, KC_MS_D, KC_MS_R, XXXXXXX, XXXXXXX,
                KC_TRNS, KC_ACL0, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_WH_D, XXXXXXX, KC_MS_D, XXXXXXX, XXXXXXX, KC_TRNS,
diff --git a/keyboards/signum/3_0/elitec/keymaps/default/layout.py b/keyboards/signum/3_0/elitec/keymaps/default/layout.py
index 937fc172ce79b885ccc50260aa88cc54e9223a04..323a583212638c2f8f79101787c16c1d4f88d1d2 100644 (file)
--- a/keyboards/signum/3_0/elitec/keymaps/default/layout.py
+++ b/keyboards/signum/3_0/elitec/keymaps/default/layout.py
@@ -402,7 +402,7 @@ qmk_dict = {
     "Undo": "LCTL(KC_Z)", "Cut": "LCTL(KC_X)", "Copy": "LCTL(KC_C)", "Paste": "LCTL(KC_V)",
     "< Tab": "LCTL(S(KC_TAB))", "> Tab": "LCTL(KC_TAB)",
     "Tab x": "LCTL(KC_W)", "Tab n": "LCTL(KC_T)",
-    "Gui Tab":  "LGUI_T(KC_TAB)", "< Gui":  "LGUI_T(KC_LEFT)", "< Gui":  "LGUI_T(KC_RIGHT)",
+    "Gui Tab":  "LGUI_T(KC_TAB)", "< Gui":  "LGUI_T(KC_LEFT)", "> Gui":  "LGUI_T(KC_RIGHT)",
     "C+A+Del": "LCTL(LALT(KC_DEL))", "Mic 0": "LCTL(KC_M)",
     "Power": "KC_PWR", "Sleep": "KC_SLEP",
 
@@ -446,8 +446,8 @@ colemak = [
 numpad = [
     ["`",       "1",    "2",       "3",       "4",       "5",       "6",       "7",       "8",       "9",       "0",       "]"],
     ["",        "DF0",  "DF1",     "XXX",     "XXX",     "MO3",     "4",       "4",       "5",       "6",       "-",       "="],
-    ["",        "MO5",  "XXX",     "XXX",     "XXX",     "XXX",     "1",       "1",       "2",       "3",       "\\",      ""],
-    ["TG2",     "",     "",        "",        "",        "",        "",        "",        "0",       "",        "",        ""],
+    ["",        "XXX",  "XXX",     "XXX",     "XXX",     "MO5",     "1",       "1",       "2",       "3",       "\\",      ""],
+    ["TG2",     "",     "",        "",        "Del",     "",        "",        "BSpace",  "0",       "",        "",        ""],
     ]
 
 # 3
@@ -460,17 +460,17 @@ fpad = [
 
 # 4
 movement = [
-    ["",        "Esc",  "Tab x",   "Tab n",   "CPg Dn",  "CPg Dn",  "Pg Down", "Home",    "^ Arrow", "Insert",  "SInsert", "Esc"],
+    ["Esc",     "Esc",  "Tab x",   "Tab n",   "CPg Dn",  "CPg Dn",  "Pg Down", "Home",    "^ Arrow", "Insert",  "SInsert", "Esc"],
     ["",        "Caps", "< Gui",   "Gui Tab", "> Gui",   "> Gui",   "< Arrow", "< Arrow", "v Arrow", "> Arrow", "End",     "Pr Scr"],
     ["",        "XXX",  "XXX",     "XXX",     "CPg Up",  "CPg Up",  "Pg Up",   "XXX",     "v Arrow", "XXX",     "App",     ""],
-    ["TG4",     "",     "",        "",        "",        "",        "",        "",        "",        "",        "",        ""],
+    ["TG4",     "",     "",        "",        "Del",     "",        "",        "BSpace",  "",        "",        "",        ""],
     ]
 
 # 5
 media = [
     ["",        "XXX",  "play/ps", "Vol +",   "Vol +",   "XXX",     "XXX",     "XXX",     "XXX",     "XXX",     "_reset",  "Power"],
     ["",        "XXX",  "|<<",     "Vol 0",   ">>|",     "XXX",     "XXX",     "XXX",     "XXX",     "XXX",     "XXX",     "Sleep"],
-    ["",        "XXX",  "XXX",     "Vol -",   "Vol -",   "XXX",     "XXX",     "XXX",     "XXX",     "XXX",     "XXX",     "XXX"],
+    ["",        "XXX",  "XXX",     "Vol -",   "Vol -",   "MO5",     "XXX",     "XXX",     "XXX",     "XXX",     "XXX",     "XXX"],
     ["TG5",     "",     "",        "",        "",        "",        "",        "",        "",        "",        "",        ""],
     ]
 
diff --git a/keyboards/signum/3_0/elitec/keymaps/default/rules.mk b/keyboards/signum/3_0/elitec/keymaps/default/rules.mk
new file mode 100644 (file)
index 0000000..502b2de
--- /dev/null
+++ b/keyboards/signum/3_0/elitec/keymaps/default/rules.mk
@@ -0,0 +1 @@
+UNICODEMAP_ENABLE = yes
diff --git a/keyboards/signum/3_0/elitec/rules.mk b/keyboards/signum/3_0/elitec/rules.mk
index d2f987b20296438086c1857b54ad38679422622a..6a68eb443bc8defecb53fb0d27b2789b32db13f0 100644 (file)
--- a/keyboards/signum/3_0/elitec/rules.mk
+++ b/keyboards/signum/3_0/elitec/rules.mk
@@ -59,4 +59,6 @@ BACKLIGHT_ENABLE = no  # Enable keyboard backlight functionality
 AUDIO_ENABLE = no
 RGBLIGHT_ENABLE = no
 
-UNICODEMAP_ENABLE = yes
+UNICODEMAP_ENABLE = no
+
+LAYOUTS = ortho_4x12
Unnamed repository; edit this file 'description' to name the repository.