[Keyboard] Move Hillside out of handwired (#18751)

Co-authored-by: mmccoyd <mmccoyd@cs.berkley.edu>

15 files changed, 588 insertions, 0 deletions

diff --git a/keyboards/hillside/48/0_1/0_1.c b/keyboards/hillside/48/0_1/0_1.c
new file mode 100644
index 0000000000..34659eb424
--- /dev/null
+++ b/keyboards/hillside/48/0_1/0_1.c
@@ -0,0 +1,4 @@
+// Copyright 2022 Michael McCoyd (@mmccoyd)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include "0_1.h"
diff --git a/keyboards/hillside/48/0_1/0_1.h b/keyboards/hillside/48/0_1/0_1.h
new file mode 100644
index 0000000000..65e1aaee30
--- /dev/null
+++ b/keyboards/hillside/48/0_1/0_1.h
@@ -0,0 +1,34 @@
+// Copyright 2022 Michael McCoyd (@mmccoyd)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+#include "quantum.h"
+
+/* This is a shortcut to help you visually see your layout.
+ *
+ * The first section contains all of the arguments representing the physical
+ * layout of the board and position of the keys.
+ *
+ * The second converts those identifiers into a two-dimensional array which
+ * represents the switch matrix.
+ */
+
+// clang-format off
+#define LAYOUT( \
+  L00, L01, L02, L03, L04, L05,                     R00, R01, R02, R03, R04, R05, \
+  L10, L11, L12, L13, L14, L15,                     R10, R11, R12, R13, R14, R15, \
+  L20, L21, L22, L23, L24, L25, LT4,           RT4, R20, R21, R22, R23, R24, R25, \
+            L30,      LT0, LT1, LT2, LT3, RT3, RT2, RT1, RT0,      R30       	  \
+  ) \
+  { \
+    { L00, L01, L02, L03, L04, L05 }, \
+    { L10, L11, L12, L13, L14, L15 }, \
+    { L20, L21, L22, L23, L24, L25 }, \
+    { L30, LT0, LT1, LT2, LT3, LT4 }, \
+    { R05, R04, R03, R02, R01, R00 }, \
+    { R15, R14, R13, R12, R11, R10 }, \
+    { R25, R24, R23, R22, R21, R20 }, \
+    { R30, RT0, RT1, RT2, RT3, RT4 }  \
+  }
+// clang-format on
diff --git a/keyboards/hillside/48/0_1/config.h b/keyboards/hillside/48/0_1/config.h
new file mode 100644
index 0000000000..c83b23d0e8
--- /dev/null
+++ b/keyboards/hillside/48/0_1/config.h
@@ -0,0 +1,35 @@
+// Copyright 2021 Michael McCoyd (@mmccoyd)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+#include "config_common.h"
+
+/* key matrix size */
+// Rows are doubled-up
+#define MATRIX_ROWS 8
+#define MATRIX_COLS 6
+
+/* Encoder */
+#define ENCODERS_PAD_A { F5 }
+#define ENCODERS_PAD_B { F4 }
+#define ENCODERS_PAD_A_RIGHT { F4 }
+#define ENCODERS_PAD_B_RIGHT { F5 }
+
+#define RGBLIGHT_SLEEP
+
+/* Haptic hardware */
+// The Pimoroni is the likely hardware, for which these settings work
+#define FB_ERM_LRA 1
+#define FB_BRAKEFACTOR 3 /* 1x:0, 2x:1, 3x:2, 4x:3, 6:4, 8:5, 16:6, Disable:7 */
+#define FB_LOOPGAIN 1 /* For  Low:0, Medium:1, High:2, Very High:3 */
+/* Please refer to your datasheet for optimal setting for your specific motor.*/
+#define RATED_VOLTAGE 2
+#define V_PEAK 2.8
+#define V_RMS 2.0
+#define F_LRA 205 /* resonance freq */
+
+/* Haptic waveforms */
+// Two mild waveforms
+#define DRV_GREETING alert_750ms
+#define DRV_MODE_DEFAULT sharp_tick3_60
diff --git a/keyboards/hillside/48/0_1/info.json b/keyboards/hillside/48/0_1/info.json
new file mode 100644
index 0000000000..943982d65e
--- /dev/null
+++ b/keyboards/hillside/48/0_1/info.json
@@ -0,0 +1,35 @@
+{
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu",
+
+    "matrix_pins": {
+        "rows": ["D7", "E6", "B4", "B5"],
+        "cols": ["F6", "F7", "B1", "B3", "B2", "B6"]
+     },    
+    "diode_direction": "COL2ROW",
+
+    "usb": {
+      "vid": "0xFEED",
+      "pid": "0x67C0",
+      "device_version": "0.0.1"
+    },
+
+    "features": {
+        "encoder": true,
+        "extrakey": true,
+        "rgblight": true
+    },
+    "split": {
+        "soft_serial_pin": "D2",
+        "main": "left"
+    },
+
+    "rgblight": {
+        "led_count": 5,
+        "pin": "D3",
+        "split": true,
+        "hue_steps": 8,
+        "saturation_steps": 8,
+        "brightness_steps": 8
+    }
+}
diff --git a/keyboards/hillside/48/0_1/rules.mk b/keyboards/hillside/48/0_1/rules.mk
new file mode 100644
index 0000000000..2501147ea8
--- /dev/null
+++ b/keyboards/hillside/48/0_1/rules.mk
@@ -0,0 +1,8 @@
+SPLIT_KEYBOARD = yes        # Use shared split_common code
+LTO_ENABLE = yes            # Use link time optimization for smaller firmware
+
+# If you add a haptic board,
+# enable it and set its driver here or in your keymap folder
+# The Pimoroni board's driver is DRV2605L 
+# HAPTIC_ENABLE = yes        # Enable haptic driver
+# HAPTIC_DRIVER = DRV2605L
diff --git a/keyboards/hillside/48/info.json b/keyboards/hillside/48/info.json
new file mode 100644
index 0000000000..a488671008
--- /dev/null
+++ b/keyboards/hillside/48/info.json
@@ -0,0 +1,76 @@
+{
+    "manufacturer": "mmccoyd",
+    "maintainer": "mmccoyd",
+
+    "keyboard_name": "Hillside48",
+    "url": "http://github.com/mmccoyd/hillside/",
+
+    "tags": ["split", "column stagger", "choc v1", "choc spaced" ],
+
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+
+                {"label": "`", "x": 0, "y": 0.93},
+                {"label": "Q", "x": 1, "y": 0.93},
+                {"label": "W", "x": 2, "y": 0.31},
+                {"label": "E", "x": 3, "y": 0},
+                {"label": "R", "x": 4, "y": 0.28},
+                {"label": "T", "x": 5, "y": 0.42},
+
+                {"label": "Y", "x": 9.5, "y": 0.42},
+                {"label": "U", "x": 10.5, "y": 0.28},
+                {"label": "I", "x": 11.5, "y": 0},
+                {"label": "O", "x": 12.5, "y": 0.31},
+                {"label": "P", "x": 13.5, "y": 0.93},
+                {"label": "Backspace", "x": 14.5, "y": 0.93},
+
+
+                {"label": "Tab", "x": 0, "y": 1.93},
+                {"label": "A", "x": 1, "y": 1.93},
+                {"label": "S", "x": 2, "y": 1.31},
+                {"label": "D", "x": 3, "y": 1},
+                {"label": "F", "x": 4, "y": 1.28},
+                {"label": "G", "x": 5, "y": 1.42},
+
+                {"label": "H", "x": 9.5, "y": 1.42},
+                {"label": "J", "x": 10.5, "y": 1.28},
+                {"label": "K", "x": 11.5, "y": 1},
+                {"label": "L", "x": 12.5, "y": 1.31},
+                {"label": ";", "x": 13.5, "y": 1.93},
+                {"label": "Enter", "x": 14.5, "y": 1.93},
+
+
+                {"label": "Shift", "x": 0, "y": 2.93},
+                {"label": "Z", "x": 1, "y": 2.93},
+                {"label": "X", "x": 2, "y": 2.31},
+                {"label": "C", "x": 3, "y": 2},
+                {"label": "V", "x": 4, "y": 2.28},
+                {"label": "B", "x": 5, "y": 2.42},
+                {"label": "Esc", "x": 6, "y": 2.78},
+
+                {"label": "Caps", "x": 8.5, "y": 2.78},
+                {"label": "N", "x": 9.5, "y": 2.42},
+                {"label": "M", "x": 10.5, "y": 2.28},
+                {"label": ",", "x": 11.5, "y": 2},
+                {"label": ".", "x": 12.5, "y": 2.31},
+                {"label": "/", "x": 13.5, "y": 2.93},
+                {"label": "Shift", "x": 14.5, "y": 2.93},
+
+
+                {"label": "Ctrl", "x": 2, "y": 3.31},
+                {"label": "Gui", "x": 3.5, "y": 3.28},
+                {"label": "Alt", "x": 4.5, "y": 3.42},
+                {"label": "Sym", "x": 5.5, "y": 3.78},
+                {"label": "Shift", "x": 6.5, "y": 4.14},
+
+
+                {"label": "Nav", "x": 8, "y": 4.14},
+                {"label": "Space", "x": 9, "y": 3.78},
+                {"label": "Alt", "x": 10, "y": 3.42},
+                {"label": "Gui", "x": 11, "y": 3.28},
+                {"label": "'", "x": 12.5, "y": 3.31}
+            ]
+        }
+    }
+}
diff --git a/keyboards/hillside/48/keymaps/default/config.h b/keyboards/hillside/48/keymaps/default/config.h
new file mode 100644
index 0000000000..1f71d42e67
--- /dev/null
+++ b/keyboards/hillside/48/keymaps/default/config.h
@@ -0,0 +1,9 @@
+// Copyright 2022 Michael McCoyd (@mmccoyd)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+// Some boards have issues detecting handedness using the vbus voltage,
+// such as Elite-C v3, but not v3.1 on, and apparently some ProMicro boards.
+// For those boards, use usb detection instead.
+// #define SPLIT_USB_DETECT
diff --git a/keyboards/hillside/48/keymaps/default/keymap.json b/keyboards/hillside/48/keymaps/default/keymap.json
new file mode 100644
index 0000000000..e5351b5f1a
--- /dev/null
+++ b/keyboards/hillside/48/keymaps/default/keymap.json
@@ -0,0 +1,88 @@
+{    "version": 1,
+    "notes": "",
+    "documentation": "\"This file is a QMK Configurator export. You can import this at <https://config.qmk.fm>. It can also be used directly with QMK's source code.\n\nTo setup your QMK environment check out the tutorial: <https://docs.qmk.fm/#/newbs>\n\nYou can convert this file to a keymap.c using this command: `qmk json2c {keymap}`\n\nYou can compile this keymap using this command: `qmk compile {keymap}`\"\n",
+    "keyboard": "hillside/48",
+    "keymap": "default",
+    "layout": "LAYOUT",
+    "layers": [
+        ["KC_GRV"    , "KC_Q"    , "KC_W"   , "KC_E"   , "KC_R"         , "KC_T",
+         "KC_Y"      , "KC_U"    , "KC_I"   , "KC_O"   , "KC_P"         , "KC_BSPC",
+
+         "KC_TAB"    , "KC_A"    , "KC_S"   , "KC_D"   , "KC_F"         , "KC_G",
+         "KC_H"      , "KC_J"    , "KC_K"   , "KC_L"   , "KC_SCLN"      , "KC_ENT",
+
+         "KC_LSFT"   , "KC_Z"    , "KC_X"   , "KC_C"   , "KC_V"         , "KC_B"      , "KC_ESC",
+         "CW_TOGG"   , "KC_N"    , "KC_M"   , "KC_COMM", "KC_DOT"       , "KC_SLSH"   , "KC_RSFT",
+
+         "KC_LCTL"   , "KC_LGUI" , "KC_LALT", "MO(3)"  , "OSM(MOD_LSFT)",
+         "MO(4)"     , "KC_SPC"  , "KC_LALT", "KC_RGUI", "KC_QUOT"
+
+        ],
+        ["KC_GRV"    , "KC_QUOT" , "KC_COMM", "KC_DOT" , "KC_P"         , "KC_Y",
+         "KC_F"      , "KC_G"    , "KC_C"   , "KC_R"   , "KC_L"         , "KC_BSPC",
+
+         "KC_TAB"    , "KC_A"    , "KC_O"   , "KC_E"   , "KC_U"         , "KC_I",
+         "KC_D"      , "KC_H"    , "KC_T"   , "KC_N"   , "KC_S"         , "KC_ENT",
+
+         "KC_LSFT"   , "KC_SCLN" , "KC_Q"   , "KC_J"   , "KC_K"         , "KC_X"      , "KC_ESC",
+         "CW_TOGG"   , "KC_B"    , "KC_M"   , "KC_W"   , "KC_V"         , "KC_Z"      , "KC_RSFT",
+
+         "KC_LCTL"   , "KC_LGUI" , "KC_LALT", "MO(3)"  , "OSM(MOD_LSFT)",
+         "MO(4)"     , "KC_SPC"  , "KC_LALT", "KC_RGUI", "KC_SLSH"
+
+        ],
+        ["KC_GRV"    , "KC_Q"    , "KC_W"   , "KC_F"   , "KC_P"         , "KC_B",
+         "KC_J"      , "KC_L"    , "KC_U"   , "KC_Y"   , "KC_SCLN"      , "KC_BSPC",
+
+         "KC_TAB"    , "KC_A"    , "KC_R"   , "KC_S"   , "KC_T"         , "KC_G",
+         "KC_M"      , "KC_N"    , "KC_E"   , "KC_I"   , "KC_O"         , "KC_ENT",
+
+         "KC_LSFT"   , "KC_Z"    , "KC_X"   , "KC_C"   , "KC_D"         , "KC_V"      , "KC_ESC",
+         "CW_TOGG"   , "KC_K"    , "KC_H"   , "KC_COMM", "KC_DOT"       , "KC_SLSH"   , "KC_RSFT",
+
+         "KC_LCTL"   , "KC_LGUI" , "KC_LALT", "MO(3)"  , "OSM(MOD_LSFT)",
+         "MO(4)"     , "KC_SPC"  , "KC_LALT", "KC_RGUI", "KC_QUOT"
+
+        ],
+        ["KC_HOME"   , "KC_EXLM" , "KC_AT"  , "KC_HASH", "KC_DLR"       , "KC_PERC",
+         "KC_CIRC"   , "KC_AMPR" , "KC_ASTR", "KC_LPRN", "KC_RPRN"      , "KC_DEL",
+
+         "KC_END"    , "KC_LGUI" , "KC_LALT", "KC_LCTL", "KC_LSFT"      , "KC_INS",
+         "KC_LBRC"   , "KC_RBRC" , "KC_MINS", "KC_EQL" , "KC_BSLS"      , "KC_TRNS",
+
+         "KC_LSFT"   , "KC_NO"   , "KC_VOLD", "KC_MUTE", "KC_VOLU"      , "KC_MPLY"   , "OSM(MOD_RALT)",
+         "KC_APP"    , "KC_LCBR" , "KC_RCBR", "KC_UNDS", "KC_PLUS"      , "KC_PIPE"   , "KC_TRNS",
+
+         "KC_TRNS"   , "KC_TRNS" , "KC_TRNS", "KC_TRNS", "OSM(MOD_LSFT)",
+         "MO(5)"     , "KC_TRNS" , "KC_TRNS", "KC_TRNS", "KC_RCTL"
+
+        ],
+        ["LCTL(KC_X)", "KC_1"    , "KC_2"   , "KC_3"   , "KC_4"         , "KC_5",
+         "KC_6"      , "KC_7"    , "KC_8"   , "KC_9"   , "KC_0"         , "KC_BSPC",
+
+         "LCTL(KC_C)", "KC_LEFT" , "KC_DOWN", "KC_UP"  , "KC_RGHT"      , "LCTL(KC_V)",
+         "KC_PGUP"   , "KC_RSFT" , "KC_RCTL", "KC_LALT", "KC_RGUI"      , "KC_PGDN",
+
+         "KC_LSFT"   , "KC_F1"   , "KC_F2"  , "KC_F3"  , "KC_F4"        , "KC_F5"     , "LCTL(KC_Z)",
+         "LCTL(KC_Y)", "KC_F6"   , "KC_F7"  , "KC_F8"  , "KC_F9"        , "KC_F10"    , "KC_TRNS",
+
+         "KC_TRNS"   , "KC_TRNS" , "KC_TRNS", "MO(5)"  , "KC_TRNS",
+         "KC_TRNS"   , "KC_TRNS" , "KC_TRNS", "KC_TRNS", "KC_RCTL"
+
+        ],
+        ["KC_NO"     , "DF(0)"   , "DF(1)"  , "DF(2)"  , "AG_SWAP"      , "CG_SWAP",
+         "KC_NO"     , "KC_F11"  , "KC_F12" , "KC_PSCR", "KC_NO"        , "KC_NO",
+
+         "KC_NO"     , "KC_NO"   , "KC_NO"  , "KC_NO"  , "AG_NORM"      , "CG_NORM",
+         "RGB_MOD"   , "RGB_VAI" , "RGB_HUI", "RGB_SAI", "KC_NO"        , "KC_NO",
+
+         "KC_NO"     , "KC_LGUI" , "KC_LALT", "KC_LCTL", "KC_LSFT"      , "KC_NO"     , "KC_NO",
+         "RGB_TOG"   , "RGB_RMOD", "RGB_VAD", "RGB_HUD", "RGB_SAD"      , "KC_NO"     , "QK_BOOT",
+
+         "KC_NO"     , "KC_NO"   , "KC_NO"  , "KC_TRNS", "KC_NO",
+         "KC_TRNS"   , "KC_NO"   , "KC_NO"  , "KC_NO"  , "KC_NO"
+
+        ]
+    ],
+    "author": "@mmccoyd"
+}
diff --git a/keyboards/hillside/48/keymaps/default/readme.md b/keyboards/hillside/48/keymaps/default/readme.md
new file mode 100644
index 0000000000..bfa720f57a
--- /dev/null
+++ b/keyboards/hillside/48/keymaps/default/readme.md
@@ -0,0 +1,165 @@
+# Hillside 48 Default Keymap
+
+For easier initial use, this keymap follows the layout of more standard keyboards where possible. It is a starting point for you to tweak over time to suit your preferences better. You can easily customize it with the [QMK configurator](https://config.qmk.fm/#/hillside/48/LAYOUT).
+
+Some of its key features are:
+
+- Numbers and symbols along the top row of their layers for familiarity.
+- Comfortable combination of modifier and function or symbol on the non-base layers
+  using modifiers on the home row of the symbol and number/function layers.
+- A layer with both navigation and editing keys allows document editing without leaving the layer.
+- QWERTY, Colemak-DH and Dvorak base layer options.
+
+## Base Layer
+
+```
+|  `    |  Q  |  W  |  E  |  R  |  T  |---------------------------|  Y  |  U  |  I  |  O  |  P  | BKSPC |
+| TAB   |  A  |  S  |  D  |  F  |  G  |---------------------------|  H  |  J  |  K  |  L  |  ;  | ENTER |
+| SHIFT |  Z  |  X  |  C  |  V  |  B  | ESC |---------------|CAPS |  N  |  M  |  ,  |  .  |  /  | SHIFT |
+--------------|CTRL |-----| GUI | ALT | Sym |SHIFT|---| Nav |SPACE| ALT | GUI |-----|  '  |--------------
+```
+
+The base layer provides a very standard key layout with five differences:
+
+- Numbers, functions and most symbols are accessed with number and symbol shift keys.
+- Escape is on the left thumb.
+- The left thumb has a shift key that affects the next key pressed. So to get 'A', press and release the thumb shift key, press 'a'. You can also hold the key down, and it will work like a standard shift key. There are still standard shift keys at either end of the keyboard.
+- The right upper thumb turns on a mode that capitalizes all letters until something other than a letter, digit, dash, underscore, delete or backspace is typed. The caps word mode also times out after five seconds of no key presses.
+- The Menu and AltGr keys are on a layer.
+
+The default layout is QWERTY with alternatives of Dvorak and Colemak-DH, and the alt/option and the win/command key locations are swappable for windows or mac.
+
+
+<details>
+<summary>Details of Dvorak and Colemak-DH</summary>
+The Dvorak and Colemak-DH base layers
+  have identical non-alpha and non-symbol keys as the QWERTY base layer.
+
+```
+Dvorak
+|  `    |  '  |  ,  |  .  |  P  |  Y  |---------------------------|  F  |  G  |  C  |  R  |  L  | BKSPC |
+| TAB   |  A  |  O  |  E  |  U  |  I  |---------------------------|  D  |  H  |  T  |  N  |  S  | ENTER |
+| SHIFT |  ;  |  Q  |  J  |  K  |  X  | ESC |---------------|CAPS |  B  |  M  |  W  |  V  |  Z  | SHIFT |
+--------------|CTRL |-----| GUI | ALT | Sym |SHIFT|---| Nav |SPACE| ALT | GUI |-----|  /  |--------------
+
+Colemak-DH
+|  `    |  Q  |  W  |  F  |  P  |  B  |---------------------------|  J  |  L  |  U  |  Y  |  ;  | BKSPC |
+| TAB   |  A  |  R  |  S  |  T  |  G  |---------------------------|  M  |  N  |  E  |  I  |  O  | ENTER |
+| SHIFT |  Z  |  X  |  C  |  D  |  V  | ESC |---------------|CAPS |  K  |  H  |  ,  |  .  |  /  | SHIFT |
+--------------|CTRL |-----| GUI | ALT | Sym |SHIFT|---| Nav |SPACE| ALT | GUI |-----|  '  |--------------
+```
+</details>
+
+## Symbol and Media Layer
+
+```
+| HOME  |  !  |  @  |  #  |  $  |  %  |---------------------------|  ^  |  &  |  *  |  (  |  )  | DEL   |
+| END   | GUI | ALT |CTRL |SHIFT| INS |---------------------------|  [  |  ]  |  -  |  =  |  \  | ENTER |
+| SHIFT |     |VOL- |MUTE |VOL+ |PLAY |OSM ALT |------------|MENU |  {  |  }  |  _  |  +  |  |  | SHIFT |
+--------------|CTRL |-----| GUI | ALT | *** |SHIFT|---| Adj |SPACE| ALT | GUI |-----|CTRL |--------------
+```
+Holding down the SYM key accesses the symbol layer:
+
+- The symbols not present on the base layer are along the top row and right side, similar to a full-size keyboard.
+- Duplicates of the modifier keys are along the left home keys. This allows a very comfortable combination of any set of modifiers plus a key on the right side of the board.
+- Forward delete is on the upper right, taking backspace's place.
+- The Windows OS application menu key is on the upper right thumb.
+- The AltGr key affects the next key pressed so that it can combine with a key on any layer. It changes the meaning of the next key pressed after the AltGr key is pressed and released. For example, to do AltGr-h: press SYM, press and release AltGr, release SYM, press and release h.
+
+## Navigation, Editing, Number and Function Layer
+
+```
+| CUT   |  1  |  2  |  3  |  4  |  5  |---------------------------|  6  |  7  |  8  |  9  |  0  | BSPC  |
+| COPY  |LEFT |DOWN | UP  |RIGHT|PASTE|---------------------------|PG_UP|SHIFT|CTRL | ALT | GUI | PG_DN |
+| SHIFT | F1  | F2  | F3  | F4  | F5  |UNDO |---------------|REDO | F6  | F7  | F8  | F9  | F10 | SHIFT |
+--------------|CTRL |-----| GUI | ALT | Adj |SHIFT|---| *** |SPACE| ALT | GUI |-----|CTRL |--------------
+```
+Holding down the Nav/Edit key accesses the navigation, editing, number and function layer:
+
+- Numbers are along the top row, and function keys are on the bottom row.
+- The arrow keys on the left can be combined with the home row modifiers on the right to easily move around and select text, which can then be cut, copied and pasted.
+
+
+## Adjust Layer
+```
+|       |QWERT|DVORK|COLMK|AG_SWAP|CTR_SWAP|----------------------|     | F11 | F12 |PR_SCR|    |       |
+|       |     |     |     |AG_NORM|CTR_NORM|----------------------|MOD+ |BRI+ |HUE+ |SAT+ |     |       |
+|       | GUI | ALT |CTRL |SHIFT|     |     |--------------|RGBTOG|MOD- |BRI- |HUE- |SAT- |     | BOOT  |
+--------------|     |-----|     |     | *** |     |---| *** |     |     |     |-----|     |--------------
+```
+Simultaneously holding down the Sym and Nav/Edit keys enables keys to adjust keyboard settings:
+
+- The base layer can be set to QWERTY, Colemak-DH or Dvorak, although the keyboard reverts to QWERTY each time it is plugged in.
+- Alt/option and GUI/command can be swapped for mac users or restored to the windows norm.
+- The backlight LEDs can be enabled, disabled, and controlled.
+- BOOT allows loading new firmware, such as for keymap changes.
+- The remaining Fn keys are here with modifiers to use with them.
+
+## Make it Yours
+
+If you are coming from a traditional keyboard,
+  with a large set of physical keys,
+  learning to use a column staggered (ergo) and layer-based keyboard,
+  which uses layers instead of finger reaches to access numbers, symbols and functions,
+  will be an adjustment for your muscle memory and your mental keyboard map.
+This default layout tries to simplify that adjustment by keeping things in the expected spots when possible.
+
+Yet this layout is only a decent compromise and is not optimal for each user.
+The online [configurator](https://config.qmk.fm/#/hillside/48/LAYOUT) makes it easy to tweak this layout to your needs.
+You can add additional layers or completely switch around what these do.
+
+A good metaphor is to think of your keymap as a bonsai tree that you tweak slightly over time
+  in response to ideas of how it might serve you better.
+  
+Some changes you might consider making:
+
+- If you are on a mac, switch the editing keys from ctrl-x to cmd-x.
+- Change the shift keys to one-shot shift keys,
+  where pressing and releasing them shifts the next key pressed.
+  That is much easier on your hands than holding them down.
+  Yet, they can still be held as usual if desired.
+- Instead of holding down the thumb key to keep the symbol layer active,
+  you could use a one-shot layer key.
+  One-shot modifiers are likely less stress on your hands and may even be faster.
+  You would still be able to hold it down instead.
+
+Here are some other keymaps for inspiration and ideas:
+
+- The [Ferris default](https://github.com/qmk/qmk_firmware/tree/master/keyboards/ferris/keymaps/default) uses more advanced features as it has far fewer keys.
+- The [Miryoku](https://github.com/manna-harbour/miryoku/tree/master/docs/reference) keymap ensures that all modifiers are comfortably available with each character key.
+- The [Kyria default](https://github.com/qmk/qmk_firmware/tree/master/keyboards/splitkb/kyria/keymaps/default) has different keymap choices and a couple more keys.
+
+
+
+## Why no keymap.c
+
+The online configurator provides a straightforward visual way
+   to work with a simple layout and uses a .json keymap format.
+So this default ```keymap.json``` was created with the online configurator.
+
+If you wish, you can edit the ```keymap.json``` directly in a text editor,  compile it and flash it.
+
+Or, you can use the graphical configurator to edit the keymap. To do that:
+
+- Open the [QMK configurator](https://config.qmk.fm/#/hillside/48/LAYOUT)
+- Using the green up arrow button, load the keymap from ```qmk_firmware/keyboards/hillside/48/keymaps/default/keymap.json```
+- Make the changes you wish to the layout
+- Save the keymap using the green down arrow button.
+- Move the downloaded keymap back into your QMK repository 
+     at the same location as above.
+- Rename it back to keymap.json
+- Compile and flash the firmware.
+
+You can combine a .json based keymap with more advanced features
+  specified in .c files with a bit more complexity.
+For example, see
+ [pierrec83's Kyria map](https://github.com/qmk/qmk_firmware/tree/master/keyboards/splitkb/kyria/keymaps/pierrec83).
+ 
+### Pretty Printing
+ 
+The QMK configurator's .json download has only one key per line,
+so it is hard to visualize the keymap if editing manually.
+If you want, the Hillside git repo has a pretty-printing script for the keymap.json file.
+ 
+As with anything downloaded from the internet, you should take some steps to assure yourself that the script will not harm your computer nor steal your data. The script is short, so reading it should at least convince you it is rearranging and printing the keymap provided, not reading your banking data.
+See the [Hillside wiki](https://github.com/mmccoyd/hillside/wiki) for the script.
diff --git a/keyboards/hillside/48/keymaps/default/rules.mk b/keyboards/hillside/48/keymaps/default/rules.mk
new file mode 100644
index 0000000000..4711d2ff74
--- /dev/null
+++ b/keyboards/hillside/48/keymaps/default/rules.mk
@@ -0,0 +1 @@
+CAPS_WORD_ENABLE = yes
diff --git a/keyboards/hillside/48/keymaps/manna-harbour_miryoku/config.h b/keyboards/hillside/48/keymaps/manna-harbour_miryoku/config.h
new file mode 100644
index 0000000000..e779de8a99
--- /dev/null
+++ b/keyboards/hillside/48/keymaps/manna-harbour_miryoku/config.h
@@ -0,0 +1,38 @@
+// Copyright 2022 Davide Masserut (@mssdvd)
+// Copyright 2019 Manna Harbour
+// https://github.com/manna-harbour/miryoku
+
+// 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
+
+#define XXX KC_NO
+
+// clang-format off
+#if defined MIRYOKU_MAPPING_EXTENDED_THUMBS
+#define LAYOUT_miryoku( \
+     K00, K01, K02, K03, K04,                          K05, K06, K07, K08, K09, \
+     K10, K11, K12, K13, K14,                          K15, K16, K17, K18, K19, \
+     K20, K21, K22, K23, K24,                          K25, K26, K27, K28, K29, \
+     N30, N31, K32, K33, K34,                          K35, K36, K37, N38, N39 \
+) \
+LAYOUT( \
+XXX, K00, K01, K02, K03, K04,                K05, K06, K07, K08, K09, XXX, \
+XXX, K10, K11, K12, K13, K14,                K15, K16, K17, K18, K19, XXX, \
+XXX, K20, K21, K22, K23, K24, XXX,      XXX, K25, K26, K27, K28, K29, XXX, \
+          XXX, XXX, K32, K33, K34,      K35, K36, K37, XXX, XXX \
+)
+#else
+#define LAYOUT_miryoku( \
+     K00, K01, K02, K03, K04,                          K05, K06, K07, K08, K09, \
+     K10, K11, K12, K13, K14,                          K15, K16, K17, K18, K19, \
+     K20, K21, K22, K23, K24,                          K25, K26, K27, K28, K29, \
+     N30, N31, K32, K33, K34,                          K35, K36, K37, N38, N39 \
+) \
+LAYOUT( \
+XXX, K00, K01, K02, K03, K04,                K05, K06, K07, K08, K09, XXX, \
+XXX, K10, K11, K12, K13, K14,                K15, K16, K17, K18, K19, XXX, \
+XXX, K20, K21, K22, K23, K24, XXX,      XXX, K25, K26, K27, K28, K29, XXX, \
+          XXX, K32, K33, K34, XXX,      XXX, K35, K36, K37, XXX \
+)
+#endif
diff --git a/keyboards/hillside/48/keymaps/manna-harbour_miryoku/keymap.c b/keyboards/hillside/48/keymaps/manna-harbour_miryoku/keymap.c
new file mode 100644
index 0000000000..dbab7f9820
--- /dev/null
+++ b/keyboards/hillside/48/keymaps/manna-harbour_miryoku/keymap.c
@@ -0,0 +1,4 @@
+// Copyright 2019 Manna Harbour
+// https://github.com/manna-harbour/miryoku
+
+// 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/>.
diff --git a/keyboards/hillside/48/keymaps/via/keymap.json b/keyboards/hillside/48/keymaps/via/keymap.json
new file mode 100644
index 0000000000..1405f5d2f0
--- /dev/null
+++ b/keyboards/hillside/48/keymaps/via/keymap.json
@@ -0,0 +1,61 @@
+{    "version": 1,
+    "notes": "",
+    "keyboard": "hillside/48",
+    "keymap": "via",
+    "layout": "LAYOUT",
+    "layers": [
+        ["KC_TAB"      , "KC_Q"   , "KC_W"   , "KC_E"   , "KC_R"   , "KC_T",
+         "KC_Y"        , "KC_U"   , "KC_I"   , "KC_O"   , "KC_P"   , "KC_BSPC",
+
+         "KC_CAPS"     , "KC_A"   , "KC_S"   , "KC_D"   , "KC_F"   , "KC_G",
+         "KC_H"        , "KC_J"   , "KC_K"   , "KC_L"   , "KC_SCLN", "KC_ENT",
+
+         "KC_LSFT"     , "KC_Z"   , "KC_X"   , "KC_C"   , "KC_V"   , "KC_B"   , "KC_GRV",
+         "KC_ESC"      , "KC_N"   , "KC_M"   , "KC_COMM", "KC_DOT" , "KC_SLSH", "KC_RSFT",
+
+         "KC_LCTL"     , "KC_LGUI", "KC_LALT", "MO(3)"  , "MO(1)",
+         "MO(2)"       , "KC_SPC" , "KC_LALT", "KC_RGUI", "KC_QUOT"
+
+        ],
+        ["KC_NO"       , "KC_INS" , "KC_NO"  , "KC_NO"  , "KC_NO"  , "KC_VOLU",
+         "KC_PGUP"     , "KC_HOME", "KC_NO"  , "KC_END" , "KC_NO"  , "KC_DEL",
+
+         "KC_NO"       , "KC_LGUI", "KC_LALT", "KC_LCTL", "KC_LSFT", "KC_VOLD",
+         "KC_PGDN"     , "KC_LEFT", "KC_UP"  , "KC_RGHT", "KC_NO"  , "KC_TRNS",
+
+         "KC_LSFT"     , "KC_NO"  , "KC_NO"  , "KC_NO"  , "KC_NO"  , "KC_NO"  , "KC_MUTE",
+         "KC_ESC"      , "KC_CAPS", "KC_NO"  , "KC_DOWN", "KC_NO"  , "KC_APP" , "KC_TRNS",
+
+         "KC_TRNS"     , "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS",
+         "KC_TRNS"     , "KC_BSPC", "KC_TRNS", "KC_TRNS", "KC_RCTL"
+
+        ],
+        ["KC_F11"      , "KC_EXLM", "KC_AT"  , "KC_HASH", "KC_DLR" , "KC_PERC",
+         "KC_CIRC"     , "KC_AMPR", "KC_ASTR", "KC_LPRN", "KC_RPRN", "KC_TRNS",
+
+         "KC_F12"      , "KC_F1"  , "KC_F2"  , "KC_F3"  , "KC_F4"  , "KC_F5",
+         "KC_PIPE"     , "KC_LSFT", "KC_LCTL", "KC_LALT", "KC_LGUI", "KC_TRNS",
+
+         "KC_LSFT"     , "KC_F6"  , "KC_F7"  , "KC_F8"  , "KC_F9"  , "KC_F10" , "KC_PSCR",
+         "KC_ESC"      , "KC_BSLS", "KC_LBRC", "KC_RBRC", "KC_LCBR", "KC_RCBR", "KC_TRNS",
+
+         "KC_TRNS"     , "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS",
+         "KC_TRNS"     , "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_RCTL"
+
+        ],
+        ["KC_TAB"      , "KC_MINS", "KC_PLUS", "KC_EQL" , "KC_SLSH", "KC_ASTR",
+         "KC_COMM"     , "KC_7"   , "KC_8"   , "KC_9"   , "KC_NO"  , "KC_TRNS",
+
+         "ANY(RGB_TOG)", "KC_LGUI", "KC_LALT", "KC_LCTL", "KC_LSFT", "KC_NO",
+         "KC_0"        , "KC_1"   , "KC_2"   , "KC_3"   , "KC_UNDS", "KC_TRNS",
+
+         "KC_TRNS"     , "KC_NO"  , "KC_NO"  , "KC_NO"  , "KC_NO"  , "KC_NO"  , "KC_NO",
+         "KC_NO"       , "KC_DOT" , "KC_4"   , "KC_5"   , "KC_6"   , "KC_NO"  , "KC_TRNS",
+
+         "KC_TRNS"     , "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_NO",
+         "KC_NO"       , "KC_BSPC", "KC_TRNS", "KC_TRNS", "KC_RCTL"
+
+        ]
+    ],
+    "author": "@mmccoyd"
+}
diff --git a/keyboards/hillside/48/readme.md b/keyboards/hillside/48/readme.md
new file mode 100644
index 0000000000..c23702fdfa
--- /dev/null
+++ b/keyboards/hillside/48/readme.md
@@ -0,0 +1,29 @@
+# Hillside
+
+![hillside](https://imgur.com/XW0rX13.png)
+
+[Hillside 48](https://github.com/mmccoyd/hillside)
+ is a split ergonomic keyboard
+ with 3x6+4+2 choc-spaced keys with aggressive column stagger,
+ a longer thumb arc and a breakoff outer-pinky column.
+
+* Keyboard Maintainer: [Michael McCoyd](https://github.com/mmccoyd)
+* Hardware Supported: ProMicro/Elite-C and compatible
+* Hardware Availability: https://github.com/mmccoyd/hillside
+
+Make example for this keyboard (after setting up your build environment):
+
+    make hillside/48/0_1:default
+
+Flashing example for this keyboard:
+
+    make hillside/48/0_1:default:flash
+
+## Bootloader
+
+Enter the bootloader by either:
+
+* **Physical reset button**: Briefly press the button on the front of the PCB.
+* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available
+
+See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
diff --git a/keyboards/hillside/48/rules.mk b/keyboards/hillside/48/rules.mk
new file mode 100644
index 0000000000..d8d69d9ec1
--- /dev/null
+++ b/keyboards/hillside/48/rules.mk
@@ -0,0 +1 @@
+DEFAULT_FOLDER = hillside/48/0_1