14 files changed, 22 insertions(+), 12 deletions(-)

M doc/FUSE.txt
M keyboard/ergodox_ez/keymaps/adnw_k_o_y/keymap.c
M keyboard/ergodox_ez/keymaps/bepo/keymap.c
M keyboard/ergodox_ez/keymaps/colemak_osx_pc_no/keymap.c
M keyboard/ergodox_ez/keymaps/german-kinergo/keymap.c
M keyboard/ergodox_ez/keymaps/german-manuneo/keymap.c
M keyboard/ergodox_ez/keymaps/german/keymap.c
M keyboard/ergodox_ez/keymaps/mpiechotka/keymap.c
M keyboard/ergodox_ez/keymaps/osx_de_adnw_koy/keymap.c
M keyboard/ergodox_ez/keymaps/osx_de_experimental/keymap.c
M keyboard/ergodox_ez/keymaps/software_neo2/keymap.c
M keyboard/planck/keymaps/lucas/keymap.c
M quantum/keymap_extras/keymap_neo2.h
R quantum/keymap_extras/{keymap_norwegian.c => keymap_norwegian.h}

@@ 1,3 1,12 @@
+Atmega32u4 Fuse/Lock Bits for Planck/Atomic/Preonic
+=========================
+
+	Low Fuse: 0x5E
+	High Fuse: 0x99
+	Extended Fuse: 0xF3
+	Lock Byte: 0xFF
+
+
 ATMega168P Fuse/Lock Bits
 =========================
 This configuration is from usbasploader's Makefile.


@@ 38,3 47,4 @@ This configuration is from usbasploader's Makefile.
 #             |     |   +----- LB 2..1 (No memory lock features enabled)
 #             |     +--------- BLB0 2..1 (No restrictions for SPM or LPM accessing the Application section)
 #             +--------------- BLB1 2..1 (No restrictions for SPM or LPM accessing the Boot Loader section)
+

@@ 1,7 1,7 @@
 #include "ergodox_ez.h"
 #include "debug.h"
 #include "action_layer.h"
-#include "keymap_extras/keymap_german.h"
+#include "keymap_german.h"
 
 #define BASE 0 // default layer
 #define SYMB 1 // symbols

@@ 1,7 1,7 @@
 #include "ergodox_ez.h"
 #include "debug.h"
 #include "action_layer.h"
-#include "keymap_extras/keymap_bepo.h"
+#include "keymap_bepo.h"
 
 #define BASE 0 // default layer
 #define QWER 1 // qwerty compat layer

@@ 1,7 1,7 @@
 #include "ergodox_ez.h"
 #include "debug.h"
 #include "action_layer.h"
-#include "../../../../quantum/keymap_extras/keymap_norwegian.c"
+#include "keymap_norwegian.h"
 
 #define BASE 0 // default layer
 #define BASE_MAC 1 // default layer mac

@@ 4,7 4,7 @@
 #include "ergodox_ez.h"
 #include "debug.h"
 #include "action_layer.h"
-#include "keymap_extras/keymap_german.h"
+#include "keymap_german.h"
 
 // Layer names
 #define BASE 0 // default layer

@@ 1,7 1,7 @@
 #include "ergodox_ez.h"
 #include "action_layer.h"
 #include "keymap.h"
-#include "keymap_extras/keymap_german.h"
+#include "keymap_german.h"
 
 #define UC_ASYMPTOTICALLY_EQUAL_TO 0
 #define UC_DIVISION_SIGN 1

@@ 1,7 1,7 @@
 #include "ergodox_ez.h"
 #include "debug.h"
 #include "action_layer.h"
-#include "keymap_extras/keymap_german.h"
+#include "keymap_german.h"
 
 // Layer names
 #define BASE 0 // default layer

@@ 1,7 1,7 @@
 #include "ergodox_ez.h"
 #include "debug.h"
 #include "action_layer.h"
-#include "keymap_extras/keymap_colemak.h"
+#include "keymap_colemak.h"
 
 enum {
     BASE = 0,

@@ 9,7 9,7 @@
 #include "keymap_nordic.h"
 #include "keymap_dvorak.h"
 #include "keymap_german.h"
-#include "keymap_norwegian.c"
+#include "keymap_norwegian.h"
 #include "keymap_fr_ch.h"
 #include "keymap_german_osx.h"
 #include "keymap_spanish.h"

@@ 7,7 7,7 @@
 #include "keymap_nordic.h"
 #include "keymap_dvorak.h"
 #include "keymap_german.h"
-#include "keymap_norwegian.c"
+#include "keymap_norwegian.h"
 #include "keymap_fr_ch.h"
 #include "keymap_german_osx.h"
 #include "keymap_spanish.h"

@@ 1,7 1,7 @@
 #include "ergodox_ez.h"
 #include "debug.h"
 #include "action_layer.h"
-#include "keymap_extras/keymap_neo2.h"
+#include "keymap_neo2.h"
 
 // Layer names
 #define BASE 0 // default layer

@@ 9,7 9,7 @@ If you have any question about this keymap feel free to shoot me a message on re
 */
 
 #include "keymap.h"
-#include "keymap_extras/keymap_german.h"
+#include "keymap_german.h"
 #include "backlight.h"
 #include "debug.h"
 #include "action_layer.h"

@@ 2,7 2,7 @@
 #define KEYMAP_NEO2
 
 #include "keymap.h"
-#include "keymap_extras/keymap_german.h"
+#include "keymap_german.h"
 
 #define NEO_A KC_D
 #define NEO_B KC_N