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

bliu13 · Jan 9, 2021 · c550047 · c550047
2 parents e9eaf41 + 3dc5e5a
commit c550047
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/keyboards/tunks/ergo33/info.json b/keyboards/tunks/ergo33/info.json
@@ -4,13 +4,13 @@
   "width": 9,
   "height": 6,
   "layouts": {
-    "LAYOUT_all": {
+    "LAYOUT": {
       "layout": [
         {"x": 0, "y": 0}, {"x": 1, "y": 0}, {"x": 2, "y": 0.4}, {"x": 3, "y": 0.3}, {"x": 4, "y": 0.4}, {"x": 5, "y": 0.5}, {"x": 6, "y": 0.5},
         {"x": 0, "y": 1}, {"x": 1, "y": 1}, {"x": 2, "y": 1.4}, {"x": 3, "y": 1.3}, {"x": 4, "y": 1.4}, {"x": 5, "y": 1.5}, {"x": 6, "y": 1.5},
         {"x": 0, "y": 2}, {"x": 1, "y": 2}, {"x": 2, "y": 2.4}, {"x": 3, "y": 2.3}, {"x": 4, "y": 2.4}, {"x": 5, "y": 2.5}, {"x": 6, "y": 2.5},
-        {"x": 0, "y": 3}, {"x": 1, "y": 3}, {"x": 2, "y": 3.4}, {"x": 3, "y": 3.3}, {"x": 4, "y": 3.4}, {"x": 5, "y": 3.5}, {"x": 6, "y": 3.5}, {"x": 8, "y": 3.5},
-        {"x": 0, "y": 4}, {"x": 1, "y": 4},                                                                     
+        {"x": 0, "y": 3}, {"x": 1, "y": 3}, {"x": 2, "y": 3.4}, {"x": 3, "y": 3.3}, {"x": 4, "y": 3.4}, {"x": 5, "y": 3.5}, {"x": 6, "y": 3.5},
+        {"x": 0, "y": 4}, {"x": 1, "y": 4},                                                                                                     {"x": 8, "y": 3.5},
                                                                           {"x": 4.7, "y": 4.7}, {"x": 5.8, "y": 4.7}, {"x": 6.8, "y": 4.8}
       ]
     }

diff --git a/keyboards/tunks/ergo33/readme.md b/keyboards/tunks/ergo33/readme.md
@@ -11,7 +11,7 @@ A one-handed 33-key keypad for gaming, macros etc.
 
 Make example for this keyboard (after setting up your build environment):
 
-    make ergo33:default
+    make tunks/ergo33:default
 
 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).