Merge remote-tracking branch 'origin/master' into develop

2 files changed, 144 insertions, 0 deletions

diff --git a/keyboards/rgbkb/sol3/readme.md b/keyboards/rgbkb/sol3/readme.md
new file mode 100644
index 0000000000..c896f7c0cd
--- /dev/null
+++ b/keyboards/rgbkb/sol3/readme.md
@@ -0,0 +1,26 @@
+# Sol 3
+
+![Sol 3](https://raw.githubusercontent.com/noroadsleft/qmk_images/master/keyboards/rgbkb/sol3/rev1/rgbkb_sol3_rev1_01.jpg)
+
+An extensible split keyboard with hotswap sockets and per-key RGB lighting.
+
+* Keyboard Maintainer: [XScorpion2](https://github.com/XScorpion2), [RGBKB](https://github.com/rgbkb)
+* Hardware Supported: RGBKB Sol 3 rev1 (STM32F303)
+* Hardware Availability: [RGBKB.net](https://www.rgbkb.net/collections/sol-3)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make rgbkb/sol3/rev1:default
+
+Flashing example for this keyboard:
+
+    make rgbkb/sol3/rev1:default:flash
+
+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).
+
+## Bootloader
+
+To reset the board into bootloader mode, do one of the following:
+
+* **Keycode in layout**: Press the key mapped to `RESET` if it is available (Adjust + R by default)
+* **Bootmagic reset**: Hold down the key at (0,0) in the matrix (usually the top left key or Escape) and plug in the keyboard (also erases persistent settings)
diff --git a/keyboards/rgbkb/sol3/rev1/info.json b/keyboards/rgbkb/sol3/rev1/info.json
new file mode 100644
index 0000000000..7003726b7f
--- /dev/null
+++ b/keyboards/rgbkb/sol3/rev1/info.json
@@ -0,0 +1,118 @@
+{
+    "keyboard_name": "Sol 3 rev1",
+    "url": "",
+    "maintainer": "XScorpion2, rgbkb",
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"x":0, "y":0, "w":1.5},
+                {"x":1.5, "y":0},
+                {"x":2.5, "y":0},
+                {"x":3.5, "y":0},
+                {"x":4.5, "y":0},
+                {"x":5.5, "y":0},
+                {"x":6.75, "y":0},
+
+                {"x":9.25, "y":0},
+                {"x":10.5, "y":0},
+                {"x":11.5, "y":0},
+                {"x":12.5, "y":0},
+                {"x":13.5, "y":0},
+                {"x":14.5, "y":0},
+                {"x":15.5, "y":0, "w":1.5},
+
+                {"x":0, "y":1, "w":1.5},
+                {"x":1.5, "y":1},
+                {"x":2.5, "y":1},
+                {"x":3.5, "y":1},
+                {"x":4.5, "y":1},
+                {"x":5.5, "y":1},
+                {"x":6.75, "y":1},
+
+                {"x":9.25, "y":1},
+                {"x":10.5, "y":1},
+                {"x":11.5, "y":1},
+                {"x":12.5, "y":1},
+                {"x":13.5, "y":1},
+                {"x":14.5, "y":1},
+                {"x":15.5, "y":1, "w":1.5},
+
+                {"x":0, "y":2, "w":1.5},
+                {"x":1.5, "y":2},
+                {"x":2.5, "y":2},
+                {"x":3.5, "y":2},
+                {"x":4.5, "y":2},
+                {"x":5.5, "y":2},
+                {"x":6.75, "y":2},
+
+                {"x":9.25, "y":2},
+                {"x":10.5, "y":2},
+                {"x":11.5, "y":2},
+                {"x":12.5, "y":2},
+                {"x":13.5, "y":2},
+                {"x":14.5, "y":2},
+                {"x":15.5, "y":2, "w":1.5},
+
+                {"x":0, "y":3, "w":1.5},
+                {"x":1.5, "y":3},
+                {"x":2.5, "y":3},
+                {"x":3.5, "y":3},
+                {"x":4.5, "y":3},
+                {"x":5.5, "y":3},
+                {"x":6.75, "y":3},
+
+                {"x":9.25, "y":3},
+                {"x":10.5, "y":3},
+                {"x":11.5, "y":3},
+                {"x":12.5, "y":3},
+                {"x":13.5, "y":3},
+                {"x":14.5, "y":3},
+                {"x":15.5, "y":3, "w":1.5},
+
+                {"x":0, "y":4, "w":1.5},
+                {"x":1.5, "y":4},
+                {"x":2.5, "y":4},
+                {"x":3.5, "y":4},
+                {"x":4.5, "y":4},
+                {"x":6, "y":4.5, "h":2},
+                {"x":7, "y":4.5},
+                {"x":7, "y":5.5},
+
+                {"x":9, "y":5.5},
+                {"x":9, "y":4.5},
+                {"x":10, "y":4.5, "h":2},
+                {"x":11.5, "y":4},
+                {"x":12.5, "y":4},
+                {"x":13.5, "y":4},
+                {"x":14.5, "y":4},
+                {"x":15.5, "y":4, "w":1.5},
+
+                {"x":0, "y":7, "w":0.8, "h":0.8},
+                {"x":0.8, "y":7, "w":0.8, "h":0.8},
+                {"x":1.6, "y":7, "w":0.8, "h":0.8},
+                {"x":2.4, "y":7, "w":0.8, "h":0.8},
+                {"x":3.2, "y":7, "w":0.8, "h":0.8},
+                {"x":4, "y":7, "w":0.8, "h":0.8},
+
+                {"x":12.2, "y":7, "w":0.8, "h":0.8},
+                {"x":13, "y":7, "w":0.8, "h":0.8},
+                {"x":13.8, "y":7, "w":0.8, "h":0.8},
+                {"x":14.6, "y":7, "w":0.8, "h":0.8},
+                {"x":15.4, "y":7, "w":0.8, "h":0.8},
+                {"x":16.2, "y":7, "w":0.8, "h":0.8},
+
+                {"x":0, "y":7.8, "w":0.8, "h":0.8},
+                {"x":0.8, "y":7.8, "w":0.8, "h":0.8},
+                {"x":1.6, "y":7.8, "w":0.8, "h":0.8},
+                {"x":2.4, "y":7.8, "w":0.8, "h":0.8},
+                {"x":3.2, "y":7.8, "w":0.8, "h":0.8},
+
+                {"x":13, "y":7.8, "w":0.8, "h":0.8},
+                {"x":13.8, "y":7.8, "w":0.8, "h":0.8},
+                {"x":14.6, "y":7.8, "w":0.8, "h":0.8},
+                {"x":15.4, "y":7.8, "w":0.8, "h":0.8},
+                {"x":16.2, "y":7.8, "w":0.8, "h":0.8}
+            ]
+        }
+    }
+}