resolved conflicts

4 files changed, 632 insertions, 0 deletions

diff --git a/keyboards/ergodash/rev1/keymaps/greenshadowmaker/config.h b/keyboards/ergodash/rev1/keymaps/greenshadowmaker/config.h
new file mode 100644
index 000000000..df04873a9
--- /dev/null
+++ b/keyboards/ergodash/rev1/keymaps/greenshadowmaker/config.h
@@ -0,0 +1,33 @@
+/*
+This is the c configuration file for the keymap
+
+Copyright 2012 Jun Wako <wakojun@gmail.com>
+Copyright 2015 Jack Humbert
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#pragma once
+
+
+/* Use I2C or Serial, not both */
+
+#define USE_SERIAL
+// #define USE_I2C
+
+/* Select hand configuration */
+
+#define MASTER_LEFT
+// #define MASTER_RIGHT
+// #define EE_HANDS
diff --git a/keyboards/ergodash/rev1/keymaps/greenshadowmaker/keyboard-layout-editor.json b/keyboards/ergodash/rev1/keymaps/greenshadowmaker/keyboard-layout-editor.json
new file mode 100644
index 000000000..8f8d30855
--- /dev/null
+++ b/keyboards/ergodash/rev1/keymaps/greenshadowmaker/keyboard-layout-editor.json
@@ -0,0 +1,460 @@
+[
+  {
+    "name": "gsm-ErgoDash",
+    "notes": "Front Legend = \"Adust\" layer (both lower and Raise)\n\n\nLayout Positions are an aproximation and not exact"
+  },
+  [
+    {
+      "x": 3,
+      "t": "#0000ff\n#ff0000"
+    },
+    "\nF3\n\n\n\n\n\n\n\n3 #",
+    {
+      "x": 11
+    },
+    "\nF8\n\n\n\n\n\n\n\n8 *"
+  ],
+  [
+    {
+      "y": -0.875,
+      "x": 2
+    },
+    "\nF2\n\n\n\n\n\n\n\n2 @",
+    {
+      "x": 1
+    },
+    "\nF4\n\n\n\n\n\n\n\n4 $",
+    {
+      "x": 9
+    },
+    "\nF7\n\n\n\n\n\n\n\n7 &",
+    {
+      "x": 1
+    },
+    "\nF9\n\n\n\n\n\n\n\n9 ("
+  ],
+  [
+    {
+      "y": -0.875,
+      "x": 5
+    },
+    "\nF5\n\n\n\n\n\n\n\n5 %",
+    {
+      "x": 7
+    },
+    "\nF6\n\n\n\n\n\n\n\n6 &"
+  ],
+  [
+    {
+      "y": -0.875,
+      "t": "#000000",
+      "a": 3
+    },
+    "Esc\n\n\n\nreset",
+    {
+      "t": "#0000ff\n#ff0000",
+      "a": 4
+    },
+    "\nF1\n\n\n\n\n\n\n\n1 !",
+    {
+      "x": 15
+    },
+    "\nF10\n\n\n\n\n\n\n\n0 )",
+    {
+      "t": "#000000",
+      "a": 7,
+      "fa": [
+        2
+      ]
+    },
+    "Bksp"
+  ],
+  [
+    {
+      "y": -0.625,
+      "x": 6,
+      "f": 3
+    },
+    "= +",
+    {
+      "x": 5,
+      "f": 3
+    },
+    "- _"
+  ],
+  [
+    {
+      "y": -0.75,
+      "x": 3,
+      "f": 3
+    },
+    "E",
+    {
+      "x": 11,
+      "f": 3
+    },
+    "I"
+  ],
+  [
+    {
+      "y": -0.875,
+      "x": 2,
+      "t": "#0000ff\n#ff0000\n\n\n\n\n\n\n\n\n#ff0000",
+      "a": 4,
+      "f": 3
+    },
+    "PgUP\nUP\n\n\n\n\n\n\n\nW",
+    {
+      "x": 1,
+      "t": "#000000",
+      "a": 3,
+      "f": 3
+    },
+    "R\n\n\n\nrgb_tog",
+    {
+      "x": 9,
+      "a": 7,
+      "f": 3
+    },
+    "U",
+    {
+      "x": 1,
+      "f": 3
+    },
+    "O"
+  ],
+  [
+    {
+      "y": -0.875,
+      "x": 5,
+      "a": 3,
+      "f": 3
+    },
+    "T\n\n\n\nbl_tog",
+    {
+      "x": 7,
+      "a": 7,
+      "f": 3
+    },
+    "Y"
+  ],
+  [
+    {
+      "y": -0.875,
+      "f": 3
+    },
+    "Tab",
+    {
+      "f": 3
+    },
+    "Q",
+    {
+      "x": 15,
+      "f": 3
+    },
+    "P",
+    {
+      "f": 3
+    },
+    "] }"
+  ],
+  [
+    {
+      "y": -0.625,
+      "x": 6
+    },
+    "",
+    {
+      "x": 5,
+      "f": 3
+    },
+    "[ {"
+  ],
+  [
+    {
+      "y": -0.75,
+      "x": 3,
+      "t": "#0000ff\n#ff0000\n\n\n\n\n\n\n\n\n#ff0000",
+      "a": 0,
+      "f": 3
+    },
+    "End\nRIGHT\n\n\nrgb_sai\n\n\n\n\nD",
+    {
+      "x": 11,
+      "t": "#000000",
+      "a": 7,
+      "f": 3
+    },
+    "K"
+  ],
+  [
+    {
+      "y": -0.875,
+      "x": 2,
+      "t": "#0000ff\n#ff0000\n\n\n\n\n\n\n\n\n#ff0000",
+      "a": 0,
+      "f": 3
+    },
+    "PgDwn\nDOWN\n\n\nrgb_hai\n\n\n\n\nS",
+    {
+      "x": 1,
+      "t": "#000000",
+      "a": 3,
+      "f": 3
+    },
+    "F\n\n\n\nrgb_val",
+    {
+      "x": 9,
+      "a": 7,
+      "f": 3
+    },
+    "J",
+    {
+      "x": 1,
+      "f": 3
+    },
+    "L"
+  ],
+  [
+    {
+      "y": -0.875,
+      "x": 5,
+      "a": 3,
+      "f": 3
+    },
+    "G\n\n\n\nbl_inc",
+    {
+      "x": 7,
+      "a": 7,
+      "f": 3
+    },
+    "H"
+  ],
+  [
+    {
+      "y": -0.875,
+      "c": "#0000ff",
+      "t": "#ffffffff",
+      "f": 3
+    },
+    "Raise",
+    {
+      "c": "#cccccc",
+      "t": "#0000ff\n#ff0000\n\n\n\n\n\n\n\n\n#ff0000",
+      "a": 4,
+      "f": 3
+    },
+    "Home\nLEFT\n\n\n\n\n\n\n\nA",
+    {
+      "x": 15,
+      "t": "#000000",
+      "a": 7,
+      "f": 3
+    },
+    ": ;",
+    {
+      "f": 3
+    },
+    "' \""
+  ],
+  [
+    {
+      "y": -0.625,
+      "x": 6
+    },
+    "",
+    {
+      "x": 5
+    },
+    ""
+  ],
+  [
+    {
+      "y": -0.75,
+      "x": 3,
+      "a": 3,
+      "f": 3
+    },
+    "C\n\n\n\nrgb_sad",
+    {
+      "x": 11,
+      "a": 7,
+      "f": 3
+    },
+    ", <"
+  ],
+  [
+    {
+      "y": -0.875,
+      "x": 2,
+      "a": 3,
+      "f": 3
+    },
+    "X\n\n\n\nrgb_sad",
+    {
+      "x": 1,
+      "f": 3
+    },
+    "V\n\n\n\nrgb_vad",
+    {
+      "x": 9,
+      "a": 7,
+      "f": 3
+    },
+    "M",
+    {
+      "x": 1,
+      "f": 3
+    },
+    ". >"
+  ],
+  [
+    {
+      "y": -0.875,
+      "x": 5,
+      "a": 3,
+      "f": 3
+    },
+    "B\n\n\n\nbl_dec",
+    {
+      "x": 7,
+      "a": 7,
+      "f": 3
+    },
+    "N"
+  ],
+  [
+    {
+      "y": -0.875,
+      "a": 3,
+      "f": 3
+    },
+    "Shift\n\n\n\neep_rst",
+    {
+      "a": 7,
+      "f": 3
+    },
+    "Z",
+    {
+      "x": 15,
+      "f": 3
+    },
+    "/ ?",
+    {
+      "f": 3
+    },
+    "Shift"
+  ],
+  [
+    {
+      "y": -0.25,
+      "x": 2,
+      "f": 3
+    },
+    "Alt",
+    {
+      "x": 13,
+      "f": 3
+    },
+    "DOWN"
+  ],
+  [
+    {
+      "y": -0.9749999999999996,
+      "x": 3.5,
+      "f": 3
+    },
+    "Ctrl",
+    {
+      "x": 10.15,
+      "f": 3
+    },
+    "LEFT"
+  ],
+  [
+    {
+      "y": -0.7750000000000004,
+      "f": 3
+    },
+    "`~",
+    {
+      "f": 3
+    },
+    "\\|",
+    {
+      "x": 15,
+      "f": 3
+    },
+    "UP",
+    {
+      "f": 3
+    },
+    "RIGHT"
+  ],
+  [
+    {
+      "r": 30,
+      "rx": 6.5,
+      "ry": 4.25,
+      "y": -0.25,
+      "x": -0.2999999999999998,
+      "c": "#eb7c15",
+      "f": 3,
+      "h": 2
+    },
+    "Space",
+    {
+      "c": "#cccccc",
+      "f": 3
+    },
+    "Del"
+  ],
+  [
+    {
+      "x": -1.2999999999999998,
+      "c": "#ff0000",
+      "f": 3
+    },
+    "Lower",
+    {
+      "x": 1,
+      "c": "#cccccc",
+      "t": "#0000ff\n#ff0000",
+      "a": 4
+    },
+    "\nApp\n\n\n\n\n\n\n\nOS"
+  ],
+  [
+    {
+      "r": -30,
+      "rx": 13,
+      "y": -0.5,
+      "x": -2,
+      "t": "#000000",
+      "a": 7,
+      "f": 3
+    },
+    "PrtScr",
+    {
+      "c": "#eb7c15",
+      "f": 3,
+      "h": 2
+    },
+    "Space"
+  ],
+  [
+    {
+      "x": -2,
+      "c": "#cccccc",
+      "f": 3
+    },
+    "Enter",
+    {
+      "x": 1,
+      "c": "#0000ff",
+      "t": "#ffffff",
+      "f": 3
+    },
+    "Raise"
+  ]
+]
\ No newline at end of file
diff --git a/keyboards/ergodash/rev1/keymaps/greenshadowmaker/keymap.c b/keyboards/ergodash/rev1/keymaps/greenshadowmaker/keymap.c
new file mode 100644
index 000000000..7a7985f75
--- /dev/null
+++ b/keyboards/ergodash/rev1/keymaps/greenshadowmaker/keymap.c
@@ -0,0 +1,136 @@
+#include QMK_KEYBOARD_H
+
+extern keymap_config_t keymap_config;
+
+#define _QWERTY 0
+#define _LOWER 1
+#define _RAISE 2
+#define _ADJUST 16
+
+enum custom_keycodes {
+  QWERTY = SAFE_RANGE,
+  LOWER,
+  RAISE,
+  ADJUST,
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+  /* Qwerty
+   * ,----------------------------------------------------------------------------------------------------------------------.
+   * | ESC  |   1  |   2  |   3  |   4  |   5  |   =  |                    |   -  |   6  |   7  |   8  |   9  |   0  |Backsp|
+   * |------+------+------+------+------+------+------+--------------------+------+------+------+------+------+------+------|
+   * |  Tab |   Q  |   W  |   E  |   R  |   T  |      |                    |   [  |   Y  |   U  |   I  |   O  |   P  |  ]   |
+   * |------+------+------+------+------+------+------+--------------------+------+------+------+------+------+------+------|
+   * | Raise|   A  |   S  |   D  |   F  |   G  |      |                    |      |   H  |   J  |   K  |   L  |   ;  |  "   |
+   * |------+------+------+------+------+------+---------------------------+------+------+------+------+------+------+------|
+   * | Shift|   Z  |   X  |   C  |   V  |   B  ||||||||  Del |      |      ||||||||   N  |   M  |   ,  |   .  |   /  | Shift|
+   * |-------------+------+------+------+------+------+------+------+------+------+------+------+------+------+-------------|
+   * |  `   |  \   |  ALt | Ctrl |||||||| Lower| Space|  LGui|||||||| Enter| Space| Raise|||||||| Left | Down |  Up  | Right|
+   * ,----------------------------------------------------------------------------------------------------------------------.
+   */
+  [_QWERTY] = LAYOUT( \
+     KC_ESC,   KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_EQL,                        KC_MINS, KC_6,    KC_7,  KC_8,    KC_9,    KC_0,    KC_BSPC, \
+     KC_TAB,   KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,   XXXXXXX,                        KC_LBRC, KC_Y,    KC_U,  KC_I,    KC_O,    KC_P,    KC_RBRC, \
+      RAISE,   KC_A,    KC_S,    KC_D,    KC_F,    KC_G,   XXXXXXX,                        XXXXXXX, KC_H,    KC_J,  KC_K,    KC_L,    KC_SCLN, KC_QUOT, \
+    KC_LSFT,   KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,            KC_DEL,        KC_PSCR,         KC_N,    KC_M,  KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, \
+     KC_GRV,KC_BSLS, KC_LALT, KC_LCTL,            LOWER,    KC_SPC,KC_LGUI,        KC_ENT ,KC_SPC , RAISE,          KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT  \
+  ),
+
+  /* Lower
+   * ,----------------------------------------------------------------------------------------------------------------------.
+   * |      |  F1  |  F2  |  F3  |  F4  |  F5  |      |                    |      |  F6  |  F7  |  F8  |  F9  |  F10 |      |
+   * |------+------+------+------+------+------+------+--------------------+------+------+------+------+------+------+------|
+   * |      |      |  Up  |      |      |      |      |                    |      |      |      |      |      |      |      |
+   * |------+------+------+------+------+------+------+--------------------+------+------+------+------+------+------+------|
+   * | Raise| Left | Down | Rght |      |      |      |                    |      |      |      |      |      |      |      |
+   * |------+------+------+------+------+------+---------------------------+------+------+------+------+------+------+------|
+   * | Shift|      |      |      |      |      ||||||||      |      |      ||||||||      |      |      |      |      | Shift|
+   * |-------------+------+------+------+------+------+------+------+------+------+------+------+------+------+-------------|
+   * |      |      |      |      |||||||| Lower| Space|      ||||||||      | Space| Raise||||||||      |      |      |      |
+   * ,----------------------------------------------------------------------------------------------------------------------.
+   */
+  [_LOWER] = LAYOUT(
+    XXXXXXX,  KC_F1,   KC_F2,   KC_F3,   KC_F4,    KC_F5, XXXXXXX,                        XXXXXXX, KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  XXXXXXX,  \
+    XXXXXXX, XXXXXXX,   KC_UP, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,                        XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \
+      RAISE, KC_LEFT, KC_DOWN, KC_RGHT, XXXXXXX, XXXXXXX, XXXXXXX,                        XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \
+    KC_LSFT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,           XXXXXXX,     XXXXXXX,          XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_RSFT, \
+    XXXXXXX, XXXXXXX, XXXXXXX,XXXXXXX,             LOWER,   KC_SPC ,XXXXXXX,     XXXXXXX, KC_SPC ,   RAISE,          XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX   \
+  ),
+
+  /* Raise
+   * ,----------------------------------------------------------------------------------------------------------------------.
+   * |      |      |      |      |      |      |      |                    |      |      |      |      |      |      |      |
+   * |------+------+------+------+------+------+------+--------------------+------+------+------+------+------+------+------|
+   * |      |      | PgUp |      |      |      |      |                    |      |      |      |      |      |      |      |
+   * |------+------+------+------+------+------+------+--------------------+------+------+------+------+------+------+------|
+   * | Raise| Home | PgDwn| End  |      |      |      |                    |      |      |      |      |      |      |      |
+   * |------+------+------+------+------+------+---------------------------+------+------+------+------+------+------+------|
+   * | Shift|      |      |      |      |      ||||||||      |      |      ||||||||      |      |      |      |      | Shift|
+   * |-------------+------+------+------+------+------+------+------+------+------+------+------+------+------+-------------|
+   * |      |      |      |      |||||||| Lower| Space|      ||||||||      |Space | Raise||||||||      |      |      |      |
+   * ,----------------------------------------------------------------------------------------------------------------------.
+   */
+  [_RAISE] = LAYOUT(
+    XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,                        XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,  \
+    XXXXXXX, XXXXXXX, KC_PGUP, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,                        XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \
+      RAISE, KC_HOME,KC_PGDOWN, KC_END, XXXXXXX, XXXXXXX, XXXXXXX,                        XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \
+    KC_LSFT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,           XXXXXXX,     XXXXXXX,          XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_RSFT, \
+    XXXXXXX, XXXXXXX, XXXXXXX,XXXXXXX,             LOWER,   KC_SPC ,XXXXXXX,     XXXXXXX, KC_SPC ,   RAISE,          XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX   \
+  ),
+
+  /* Adjust  (Both Raise and Lower Together)
+   * ,----------------------------------------------------------------------------------------------------------------------.
+   * | Reset|      |      |      |      |      |      |                    |      |      |      |      |      |      |      |
+   * |------+------+------+------+------+------+------+--------------------+------+------+------+------+------+------+------|
+   * |      |      |      |      |rgbtog|bl_tog|      |                    |      |      |      |      |      |      |      |
+   * |------+------+------+------+------+------+------+--------------------+------+------+------+------+------+------+------|
+   * | Raise|      |rgbhui|rgbsai|rgbvai|bl_inc|      |                    |      |      |      |      |      |      |      |
+   * |------+------+------+------+------+------+---------------------------+------+------+------+------+------+------+------|
+   *|EEP_RST|      |rgbhud|rgbdec|rgbvad|bl_dec||||||||      |      |      ||||||||      |      |      |      |      | Shift|
+   * |-------------+------+------+------+------+------+------+------+------+------+------+------+------+------+-------------|
+   * |      |      |      |      |||||||| Lower| Space|      ||||||||      | Space| Raise||||||||      |      |      |      |
+   * ,----------------------------------------------------------------------------------------------------------------------.
+   */
+  [_ADJUST] = LAYOUT(
+      RESET, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,                        XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,  \
+    XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RGB_TOG, BL_TOGG, XXXXXXX,                        XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \
+      RAISE, XXXXXXX, RGB_HUI, RGB_SAI, RGB_VAI,  BL_INC, XXXXXXX,                        XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \
+    EEP_RST, XXXXXXX, RGB_HUD, RGB_SAD, RGB_VAD,  BL_DEC,           XXXXXXX,     XXXXXXX,          XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_RSFT, \
+    XXXXXXX, XXXXXXX, XXXXXXX,XXXXXXX,             LOWER,   KC_SPC ,XXXXXXX,     XXXXXXX,  KC_SPC,   RAISE,          XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX   \
+  )
+}; 
+
+bool process_record_user(uint16_t keycode, keyrecord_t *record) {
+  switch (keycode) {
+    case LOWER:
+      if (record->event.pressed) {
+        layer_on(_LOWER);
+        update_tri_layer(_LOWER, _RAISE, _ADJUST);
+      } else {
+        layer_off(_LOWER);
+        update_tri_layer(_LOWER, _RAISE, _ADJUST);
+      }
+      return false;
+      break;
+    case RAISE:
+      if (record->event.pressed) {
+        layer_on(_RAISE);
+        update_tri_layer(_LOWER, _RAISE, _ADJUST);
+      } else {
+        layer_off(_RAISE);
+        update_tri_layer(_LOWER, _RAISE, _ADJUST);
+      }
+      return false;
+      break;
+    case ADJUST:
+      if (record->event.pressed) {
+        layer_on(_ADJUST);
+      } else {
+        layer_off(_ADJUST);
+      }
+      return false;
+      break;
+  }
+  return true;
+}
diff --git a/keyboards/ergodash/rev1/keymaps/greenshadowmaker/rules.mk b/keyboards/ergodash/rev1/keymaps/greenshadowmaker/rules.mk
new file mode 100644
index 000000000..11b62b9bf
--- /dev/null
+++ b/keyboards/ergodash/rev1/keymaps/greenshadowmaker/rules.mk
@@ -0,0 +1,3 @@
+BACKLIGHT_ENABLE = yes
+RGBLIGHT_ENABLE = yes
+AUDIO_ENABLE = no