Merge branch 'master' into ps2avrGB

8 files changed, 10 insertions, 7 deletions

diff --git a/keyboards/ergodox/keymaps/algernon/Makefile b/keyboards/ergodox/keymaps/algernon/Makefile
index 699add3dda..23d3bb7239 100644
--- a/keyboards/ergodox/keymaps/algernon/Makefile
+++ b/keyboards/ergodox/keymaps/algernon/Makefile
@@ -1,15 +1,15 @@
 BOOTMAGIC_ENABLE=no
 COMMAND_ENABLE=no
 SLEEP_LED_ENABLE=no
-FORCE_NKRO ?= yes
+FORCE_NKRO = yes
 DEBUG_ENABLE = no
 CONSOLE_ENABLE = no
 TAP_DANCE_ENABLE = yes
-KEYLOGGER_ENABLE ?= yes
+KEYLOGGER_ENABLE = yes
 UCIS_ENABLE = yes
 MOUSEKEY_ENABLE = no
 
-AUTOLOG_ENABLE ?= no
+AUTOLOG_ENABLE = no
 
 ifeq (${FORCE_NKRO},yes)
 OPT_DEFS += -DFORCE_NKRO
diff --git a/keyboards/ergodox/keymaps/algernon/images/adore-layer.png b/keyboards/ergodox/keymaps/algernon/images/adore-layer.png
deleted file mode 100644
index f6c64ca645..0000000000
--- a/keyboards/ergodox/keymaps/algernon/images/adore-layer.png
+++ /dev/null
diff --git a/keyboards/ergodox/keymaps/algernon/images/base-layer.png b/keyboards/ergodox/keymaps/algernon/images/base-layer.png
deleted file mode 100644
index 5bd0611f65..0000000000
--- a/keyboards/ergodox/keymaps/algernon/images/base-layer.png
+++ /dev/null
diff --git a/keyboards/ergodox/keymaps/algernon/images/heatmap.png b/keyboards/ergodox/keymaps/algernon/images/heatmap.png
deleted file mode 100644
index 4f55c5adff..0000000000
--- a/keyboards/ergodox/keymaps/algernon/images/heatmap.png
+++ /dev/null
diff --git a/keyboards/ergodox/keymaps/algernon/images/hun-layer.png b/keyboards/ergodox/keymaps/algernon/images/hun-layer.png
deleted file mode 100644
index 104a9544d0..0000000000
--- a/keyboards/ergodox/keymaps/algernon/images/hun-layer.png
+++ /dev/null
diff --git a/keyboards/ergodox/keymaps/algernon/images/nav-n-media-layer.png b/keyboards/ergodox/keymaps/algernon/images/nav-n-media-layer.png
deleted file mode 100644
index 16d29e124d..0000000000
--- a/keyboards/ergodox/keymaps/algernon/images/nav-n-media-layer.png
+++ /dev/null
diff --git a/keyboards/ergodox/keymaps/algernon/images/steno-layer.png b/keyboards/ergodox/keymaps/algernon/images/steno-layer.png
deleted file mode 100644
index 9a2ba55eff..0000000000
--- a/keyboards/ergodox/keymaps/algernon/images/steno-layer.png
+++ /dev/null
diff --git a/keyboards/ergodox/keymaps/algernon/readme.md b/keyboards/ergodox/keymaps/algernon/readme.md
index 3783eadf16..4c1fb15ff7 100644
--- a/keyboards/ergodox/keymaps/algernon/readme.md
+++ b/keyboards/ergodox/keymaps/algernon/readme.md
@@ -34,7 +34,7 @@ Some of the things in the layout only work when one uses [Spacemacs][spacemacs]
 
 ## Base layer
 
-[![Base layer](images/base-layer.png)](http://www.keyboard-layout-editor.com/#/gists/28f7eb305fdbff943613e1dc7aa9e82b)
+[![Base layer](https://i.imgur.com/q1MDvq4.png)](http://www.keyboard-layout-editor.com/#/gists/28f7eb305fdbff943613e1dc7aa9e82b)
 
 At its core, this is a Dvorak layout, with some minor changes. The more interesting parts are how certain keys behave:
 
@@ -62,7 +62,7 @@ The symbols on the front in the image above have the same color as the key that
 
 ## ADORE layer
 
-[![ADORE layer](images/adore-layer.png)](http://www.keyboard-layout-editor.com/#/gists/45681a17453d235925b6028dd83bf12a)
+[![ADORE layer](https://i.imgur.com/r3LnQAA.png)](http://www.keyboard-layout-editor.com/#/gists/45681a17453d235925b6028dd83bf12a)
 
 My experimental layout, that I keep tweaking. No full description here, because things are very much in flux.
 
@@ -70,7 +70,7 @@ Note that the **HUN** layer does not work well with ADORE: it still has the same
 
 ## Steno layer
 
-[![Steno layer for Plover](images/steno-layer.png)](http://www.keyboard-layout-editor.com/#/gists/401ef9a84369e47c57f9aedcf0a0d667)
+[![Steno layer for Plover](https://i.imgur.com/PgifhBF.png)](http://www.keyboard-layout-editor.com/#/gists/401ef9a84369e47c57f9aedcf0a0d667)
 
 This is to be used with [Plover](http://www.openstenoproject.org/plover/), nothing really fancy here. The **STENO** key toggles the layer on and off, and sends the toggle command to Plover too.
 
@@ -110,7 +110,7 @@ Included with the firmware is a small tool that can parse these logs, and create
 
 The generated heatmap looks somewhat like this:
 
- ![Heatmap](images/heatmap.png)
+ ![Heatmap](https://i.imgur.com/tly9XSy.png)
 
 ## Layer notification
 
@@ -144,3 +144,6 @@ The keymap default to forcing NKRO, which seems to upset Windows, and except the
 # License
 
 The layout, being a derivative of the original TMK firmware which is under the GPL-2+, this layout is under the GPL as well, but GPL-3+, rather than the older version.
+
+![nav-n-media-layer.png](https://i.imgur.com/AReX8C9.png)
+![hun-layer.png](https://i.imgur.com/uPGBl9J.png)
\ No newline at end of file