From e329729d3a11b5798f4e2b9f65ac9bc2dcc84a9e Mon Sep 17 00:00:00 2001
From: Jack Humbert <jack.humb@gmail.com>
Date: Tue, 21 Jun 2016 18:32:28 -0400
Subject: adds fuse settings for atmega32u4, fixes keymap_extras includes

---
 quantum/keymap_extras/keymap_neo2.h      |  2 +-
 quantum/keymap_extras/keymap_norwegian.c | 41 --------------------------------
 quantum/keymap_extras/keymap_norwegian.h | 41 ++++++++++++++++++++++++++++++++
 3 files changed, 42 insertions(+), 42 deletions(-)
 delete mode 100644 quantum/keymap_extras/keymap_norwegian.c
 create mode 100644 quantum/keymap_extras/keymap_norwegian.h

(limited to 'quantum')

diff --git a/quantum/keymap_extras/keymap_neo2.h b/quantum/keymap_extras/keymap_neo2.h
index b54cb74b9..80439af34 100644
--- a/quantum/keymap_extras/keymap_neo2.h
+++ b/quantum/keymap_extras/keymap_neo2.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
diff --git a/quantum/keymap_extras/keymap_norwegian.c b/quantum/keymap_extras/keymap_norwegian.c
deleted file mode 100644
index 018bfeae5..000000000
--- a/quantum/keymap_extras/keymap_norwegian.c
+++ /dev/null
@@ -1,41 +0,0 @@
-#ifndef KEYMAP_NORWEGIAN_H
-#define KEYMAP_NORWEGIAN_H
-
-#include "keymap_nordic.h"
-
-// There are slight differrences in the keyboards in the nordic contries
-
-// Norwegian redifinitions from the nordic keyset
-#undef NO_ACUT
-#define NO_ACUT	ALGR(NO_BSLS)  // ´
-#undef NO_AE
-#define NO_AE	KC_QUOT  // æ
-#undef NO_BSLS
-#define NO_BSLS KC_EQL  // '\'
-#undef NO_CIRC
-#define NO_CIRC LSFT(C_RBRC)  // ^
-#undef NO_GRV
-#define NO_GRV	LSFT(NO_BSLS)  //
-#undef NO_OSLH
-#define NO_OSLH	KC_SCLN  // ø
-#undef NO_PIPE
-#define NO_PIPE KC_GRV  // |
-
-// Additional norwegian keys not defined in the nordic keyset
-#define NO_AA	KC_LBRC  // å
-#define NO_ASTR LSFT(KC_BSLS)  // *
-
-// Norwegian unique MAC characters
-#define NO_ACUT_MAC KC_EQL  // =
-#define NO_APOS_MAC KC_NUBS  // '
-#define NO_AT_MAC   KC_BSLS  // @
-#define NO_BSLS_MAC ALGR(LSFT(KC_7)) // '\'
-#define NO_DLR_MAC  LSFT(KC_4) // $
-#define NO_GRV_MAC ALGR(NO_BSLS) // `
-#define NO_GRTR_MAC LSFT(KC_GRV)  // >
-#define NO_LCBR_MAC ALGR(LSFT(KC_8))  // }
-#define NO_LESS_MAC KC_GRV  // >
-#define NO_PIPE_MAC ALGR(KC_7)  // |
-#define NO_RCBR_MAC ALGR(LSFT(KC_9))  // }
-
-#endif
diff --git a/quantum/keymap_extras/keymap_norwegian.h b/quantum/keymap_extras/keymap_norwegian.h
new file mode 100644
index 000000000..018bfeae5
--- /dev/null
+++ b/quantum/keymap_extras/keymap_norwegian.h
@@ -0,0 +1,41 @@
+#ifndef KEYMAP_NORWEGIAN_H
+#define KEYMAP_NORWEGIAN_H
+
+#include "keymap_nordic.h"
+
+// There are slight differrences in the keyboards in the nordic contries
+
+// Norwegian redifinitions from the nordic keyset
+#undef NO_ACUT
+#define NO_ACUT	ALGR(NO_BSLS)  // ´
+#undef NO_AE
+#define NO_AE	KC_QUOT  // æ
+#undef NO_BSLS
+#define NO_BSLS KC_EQL  // '\'
+#undef NO_CIRC
+#define NO_CIRC LSFT(C_RBRC)  // ^
+#undef NO_GRV
+#define NO_GRV	LSFT(NO_BSLS)  //
+#undef NO_OSLH
+#define NO_OSLH	KC_SCLN  // ø
+#undef NO_PIPE
+#define NO_PIPE KC_GRV  // |
+
+// Additional norwegian keys not defined in the nordic keyset
+#define NO_AA	KC_LBRC  // å
+#define NO_ASTR LSFT(KC_BSLS)  // *
+
+// Norwegian unique MAC characters
+#define NO_ACUT_MAC KC_EQL  // =
+#define NO_APOS_MAC KC_NUBS  // '
+#define NO_AT_MAC   KC_BSLS  // @
+#define NO_BSLS_MAC ALGR(LSFT(KC_7)) // '\'
+#define NO_DLR_MAC  LSFT(KC_4) // $
+#define NO_GRV_MAC ALGR(NO_BSLS) // `
+#define NO_GRTR_MAC LSFT(KC_GRV)  // >
+#define NO_LCBR_MAC ALGR(LSFT(KC_8))  // }
+#define NO_LESS_MAC KC_GRV  // >
+#define NO_PIPE_MAC ALGR(KC_7)  // |
+#define NO_RCBR_MAC ALGR(LSFT(KC_9))  // }
+
+#endif
-- 
cgit v1.2.3-24-g4f1b