Merge remote-tracking branch 'upstream/master'

* upstream/master:
  add macbook keyboard visualization * Vonng#44
  Update makefile deprecated -j flag to -o=json flag

docs/README.md

@@ -90,7 +90,7 @@ Capslock works on **ANSI** keyboards and similar layouts. It literally remaps ev
 
 ![](img/keyboard.jpg)
 
-> **[Control Planes](#Control-Planes)** are defined by combination of four extra left modifiers: <kbd>⌘</kbd><kbd>⌥</kbd><kbd>⌃</kbd><kbd>⇧</kbd>.This image shows the layout of control plane 0.
+> **[Control Planes](#Control-Planes)** are defined by combination of four extra left modifiers: <kbd>⌘</kbd><kbd>⌥</kbd><kbd>⌃</kbd><kbd>⇧</kbd>.This image shows the layout of control plane 0,1,2.
 
 |           Category            | Color  | Description                                                  |
 | :---------------------------: | :----: | :----------------------------------------------------------- |
@@ -329,6 +329,18 @@ Number keys <kbd>1</kbd>, <kbd>2</kbd>, …, <kbd>9</kbd>, <kbd>0</kbd> are used
 |   8   |    <kbd>✱</kbd><kbd>⇧</kbd>     |  10   |    <kbd>✱</kbd><kbd>⌥</kbd><kbd>⇧</kbd>    |  15   |   <kbd>✱</kbd><kbd>⌘</kbd><kbd>⌥</kbd><kbd>⌃</kbd><kbd>⇧</kbd>   |
 |       |           |  12   |    <kbd>✱</kbd><kbd>⌃</kbd><kbd>⇧</kbd>    |       |           |
 
+![](img/plane0.png)
+
+> Plane 0
+
+![](img/plane1.png)
+
+> Plane 1
+
+![](img/plane2.png)
+
+> Plane 2
+
 </details>
 
 

mac_v3/makefile

@@ -1,5 +1,5 @@
 compile:
-	yq eval capslock.yml -j > capslock.json
+	yq eval capslock.yml -o=json > capslock.json
 
 install: compile
 	mkdir -p $$HOME/.config/karabiner/assets/complex_modifications/