Merge branch 'master' into taamas

4 files changed, 338 insertions, 0 deletions

diff --git a/keyboards/idobao/id75/keymaps/greenshadowmaker/keyboard-layout-editor-gsm-idobo.json b/keyboards/idobao/id75/keymaps/greenshadowmaker/keyboard-layout-editor-gsm-idobo.json
new file mode 100644
index 0000000000..19c0780463
--- /dev/null
+++ b/keyboards/idobao/id75/keymaps/greenshadowmaker/keyboard-layout-editor-gsm-idobo.json
@@ -0,0 +1,190 @@
+[
+  {
+    "name": "gsm-idobo",
+    "notes": "Massdrop xd75\n\nFront Legend = \"Adust\" layer (both lower and Raise)"
+  },
+  [
+    {
+      "a": 3
+    },
+    "Esc\n\n\n\nreset",
+    {
+      "t": "#0000ff\n#ff0000",
+      "a": 4
+    },
+    "\nF1\n\n\n\n\n\n\n\n1 !",
+    "\nF2\n\n\n\n\n\n\n\n2 @",
+    "\nF3\n\n\n\n\n\n\n\n3 #",
+    "\nF4\n\n\n\n\n\n\n\n4 $",
+    "\nF5\n\n\n\n\n\n\n\n5 %",
+    {
+      "t": "#000000",
+      "a": 7
+    },
+    "= +",
+    "",
+    "- _",
+    {
+      "t": "#0000ff\n#ff0000",
+      "a": 0
+    },
+    "\nF6\n\n\nrgbplain\n\n\n\n\n6 ^",
+    "\nF7\n\n\nrgbtest\n\n\n\n\n7 &",
+    "\nF8\n\n\nrgbmode\n\n\n\n\n8 *",
+    {
+      "a": 4
+    },
+    "\nF9\n\n\n\n\n\n\n\n9 (",
+    "\nF10\n\n\n\n\n\n\n\n0 )",
+    {
+      "t": "#000000",
+      "a": 7
+    },
+    "Bksp"
+  ],
+  [
+    "Tab",
+    "Q",
+    {
+      "t": "#0000ff\n#ff0000",
+      "a": 4
+    },
+    "PgUp\nUP\n\n\n\n\n\n\n\nW",
+    {
+      "t": "#000000",
+      "a": 7
+    },
+    "E",
+    {
+      "a": 3
+    },
+    "R\n\n\n\nrgb_tog",
+    "T\n\n\n\nbl_tog",
+    {
+      "a": 7
+    },
+    "",
+    "",
+    "[ {",
+    "T",
+    "Y",
+    "I",
+    "O",
+    "P",
+    "]"
+  ],
+  [
+    {
+      "c": "#0000ff",
+      "t": "#ffffff"
+    },
+    "Raise",
+    {
+      "c": "#cccccc",
+      "t": "#0000ff\n#ff0000",
+      "a": 4
+    },
+    "Home\nLEFT\n\n\n\n\n\n\n\nA",
+    {
+      "a": 0
+    },
+    "PgDwn\nDOWN\n\n\nrgb_hai\n\n\n\n\nS",
+    "End\nRIGHT\n\n\nrgb_sai\n\n\n\n\nD",
+    {
+      "t": "#000000",
+      "a": 3
+    },
+    "F\n\n\n\nrgb_vai",
+    "G\n\n\n\nbl_inc",
+    {
+      "a": 7
+    },
+    "",
+    "UP",
+    "PrtScr",
+    "H",
+    "J",
+    "K",
+    "L",
+    "; :",
+    "' \""
+  ],
+  [
+    {
+      "a": 3
+    },
+    "Shift\n\n\n\neep_rst",
+    {
+      "a": 7
+    },
+    "Z",
+    {
+      "a": 3
+    },
+    "X\n\n\n\nrgb_hud",
+    "C\n\n\n\nrgb_sad",
+    "V\n\n\n\nrgb_vad",
+    "B\n\n\n\nbl_dec",
+    {
+      "a": 7
+    },
+    "LEFT",
+    "DOWN",
+    "RIGHT",
+    "N",
+    "M",
+    ", <",
+    ". >",
+    "/ ?",
+    {
+      "a": 6
+    },
+    "Shift"
+  ],
+  [
+    {
+      "a": 7
+    },
+    "` ~",
+    "\\ |",
+    "Alt",
+    "Ctrl",
+    {
+      "c": "#ff0000"
+    },
+    "Lower",
+    {
+      "c": "#eb7c15"
+    },
+    "Space",
+    {
+      "c": "#cccccc",
+      "t": "#0000ff\n#ff0000",
+      "a": 4
+    },
+    "\nApp\n\n\n\n\n\n\n\nOS",
+    {
+      "t": "#000000",
+      "a": 7
+    },
+    "Del",
+    "Enter",
+    {
+      "c": "#eb7c15"
+    },
+    "Space",
+    {
+      "c": "#0000ff",
+      "t": "#ffffff"
+    },
+    "Raise",
+    {
+      "c": "#cccccc",
+      "t": "#000000"
+    },
+    "Left",
+    "Down",
+    "Up",
+    "Right"
+  ]
+]
\ No newline at end of file
diff --git a/keyboards/idobao/id75/keymaps/greenshadowmaker/keymap.c b/keyboards/idobao/id75/keymaps/greenshadowmaker/keymap.c
new file mode 100644
index 0000000000..d23bc7c7df
--- /dev/null
+++ b/keyboards/idobao/id75/keymaps/greenshadowmaker/keymap.c
@@ -0,0 +1,140 @@
+#include QMK_KEYBOARD_H
+
+enum custom_keycodes {
+  LOWER = SAFE_RANGE,
+  RAISE,
+};
+
+enum layer_names {
+  _QWERTY,
+  _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      |        | UP     | PrtScr | H      | J      | K      | L      | ;      | '      |
+ * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------------------------+--------|
+ * | LSHIFT | Z      | X      | C      | V      | B      | LEFT   | DOWN   | RIGHT  | N      | M      | ,      | .      | /      | RSHIFT |
+ * |--------+--------+--------+--------+--------+-----------------+--------+--------+--------+--------+-----------------+--------+--------|
+ * | `      | \      | LALT   | LCTRL  | LOWER  | SPACE  | LGUI   | DEL    | ENTER  | SPACE  | RAISE  |  LEFT  |  DOWN  |  UP    | RIGHT  |
+ * '--------------------------------------------------------------------------------------------------------------------------------------'
+ */
+[_QWERTY] = LAYOUT_ortho_5x15( 
+    KC_ESC,     KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_EQL,  XXXXXXX,   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, 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,   KC_UP,   KC_PSCR,   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_LEFT, KC_DOWN,   KC_RGHT,   KC_N,    KC_M,    KC_COMM,  KC_DOT,  KC_SLSH, KC_RSFT, 
+  KC_GRAVE,  KC_BSLS, KC_LALT, KC_LCTL,   LOWER,  KC_SPC,    KC_LGUI,  KC_DEL,    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    |        |        |        |        |        |        |        |        |        | PR SCR |        |        |
+ * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
+ * | RAISE  | LEFT   |  DOWN  |  RIGHT |        |        |        |        |        |        |        |        |        |        |        |
+ * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
+ * |        |        |        |        |        |        |        |        |        |        |        |        |        |        |        |
+ * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
+ * |        |        |        |        | LOWER  |        |  APP   |        |        |        |  RAISE |        |        |        |        |
+ * '--------------------------------------------------------------------------------------------------------------------------------------'
+ */
+[_LOWER] = LAYOUT_ortho_5x15( 
+    XXXXXXX,   KC_F1,   KC_F2,   KC_F3, XXXXXXX,   KC_F5, XXXXXXX, 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, XXXXXXX,  
+      RAISE, KC_LEFT, KC_DOWN, KC_RGHT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, 
+    XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, 
+    XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,   LOWER, XXXXXXX,  KC_APP, XXXXXXX, XXXXXXX,  XXXXXXX,   RAISE, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX  
+),
+
+ /* RAISE
+ * .--------------------------------------------------------------------------------------------------------------------------------------.
+ * |        |        |        |        |        |        |        |        |        |        |        |        |        |        |        |
+ * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
+ * |        |        |  pgup  |        |        |        |        |        |        |        |        |        |        |        |        |
+ * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
+ * | RAISE  | home   |  pgdn  | end    |        |        |        |        |        |        |        |        |        |        |        |
+ * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
+ * |        |        |        |        |        |        |        |        |        |        |        |        |        |        |        |
+ * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
+ * |        |        |        |        | LOWER  |        |        |        |        |        |  RAISE |        |        |        |        |
+ * '--------------------------------------------------------------------------------------------------------------------------------------'
+ */
+[_RAISE] = LAYOUT_ortho_5x15( 
+    XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,  
+    XXXXXXX, XXXXXXX,   KC_UP, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,  
+      RAISE, KC_HOME, KC_PGDN,  KC_END, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, 
+    XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, 
+    XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,   LOWER, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,  XXXXXXX,   RAISE, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX  
+),
+
+
+ /* ADJUST
+ * .--------------------------------------------------------------------------------------------------------------------------------------.
+ * | RESET  |        |        |        |        |        |        |        |        |rgbplain|rgbtest | rgbmode|        |        |        |
+ * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
+ * |        |        |        |        |rgb tog | bl_tog |        |        |        |        |        |        |        |        |        |
+ * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
+ * | RAISE  |        | rgb hi | rgb sai|rgb vai | bl inc |        |        |        |        |        |        |        |        |        |
+ * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
+ * | EEP Rst|        | rgb hd | rgb sad|rgb vad | bl dec |        |        |        |        |        |        |        |        |        |
+ * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
+ * |        |        |        |        | LOWER  |        |        |        |        |        |  RAISE |        |        |        |        |
+ * '--------------------------------------------------------------------------------------------------------------------------------------'
+ */
+[_ADJUST] = LAYOUT_ortho_5x15( 
+    RESET, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,  RGB_M_P, RGB_M_T, RGB_MOD, XXXXXXX, XXXXXXX, XXXXXXX,  
+  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RGB_TOG, BL_TOGG, XXXXXXX, 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, XXXXXXX, 
+  EEP_RST, XXXXXXX, RGB_HUD, RGB_SAD, RGB_VAD,  BL_DEC, XXXXXXX, XXXXXXX, XXXXXXX,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, 
+  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,   LOWER, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,  XXXXXXX,   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;
+    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;
+  }
+  return true;
+}
+
+void matrix_init_user(void) {
+
+}
+
+void matrix_scan_user(void) {
+
+}
+
+void led_set_user(uint8_t usb_led) {
+
+}
diff --git a/keyboards/idobao/id75/keymaps/greenshadowmaker/readme.md b/keyboards/idobao/id75/keymaps/greenshadowmaker/readme.md
new file mode 100644
index 0000000000..7b6f654c71
--- /dev/null
+++ b/keyboards/idobao/id75/keymaps/greenshadowmaker/readme.md
@@ -0,0 +1,5 @@
+# GreenShadowMaker keymap for idobo
+
+make idobo:greenshadowmaker:dfu
+
+Note: keyboard-layout-editor-gsm-idobo.json shoudl be the matching layout for http://www.keyboard-layout-editor.com
diff --git a/keyboards/idobao/id75/keymaps/greenshadowmaker/rules.mk b/keyboards/idobao/id75/keymaps/greenshadowmaker/rules.mk
new file mode 100644
index 0000000000..f6587a835e
--- /dev/null
+++ b/keyboards/idobao/id75/keymaps/greenshadowmaker/rules.mk
@@ -0,0 +1,3 @@
+MOUSEKEY_ENABLE = no       # Mouse keys(+4700)
+COMMAND_ENABLE = no        # Commands for debug and configuration
+RGBLIGHT_ENABLE = yes      # Enable keyboard RGB underglow