From e329729d3a11b5798f4e2b9f65ac9bc2dcc84a9e Mon Sep 17 00:00:00 2001 From: Jack Humbert Date: Tue, 21 Jun 2016 18:32:28 -0400 Subject: adds fuse settings for atmega32u4, fixes keymap_extras includes --- doc/FUSE.txt | 10 ++++++ keyboard/ergodox_ez/keymaps/adnw_k_o_y/keymap.c | 2 +- keyboard/ergodox_ez/keymaps/bepo/keymap.c | 2 +- .../ergodox_ez/keymaps/colemak_osx_pc_no/keymap.c | 2 +- .../ergodox_ez/keymaps/german-kinergo/keymap.c | 2 +- .../ergodox_ez/keymaps/german-manuneo/keymap.c | 2 +- keyboard/ergodox_ez/keymaps/german/keymap.c | 2 +- keyboard/ergodox_ez/keymaps/mpiechotka/keymap.c | 2 +- .../ergodox_ez/keymaps/osx_de_adnw_koy/keymap.c | 2 +- .../keymaps/osx_de_experimental/keymap.c | 2 +- keyboard/ergodox_ez/keymaps/software_neo2/keymap.c | 2 +- keyboard/planck/keymaps/lucas/keymap.c | 2 +- quantum/keymap_extras/keymap_neo2.h | 2 +- quantum/keymap_extras/keymap_norwegian.c | 41 ---------------------- quantum/keymap_extras/keymap_norwegian.h | 41 ++++++++++++++++++++++ 15 files changed, 63 insertions(+), 53 deletions(-) delete mode 100644 quantum/keymap_extras/keymap_norwegian.c create mode 100644 quantum/keymap_extras/keymap_norwegian.h diff --git a/doc/FUSE.txt b/doc/FUSE.txt index 40055e5ab..99ddd2d18 100644 --- a/doc/FUSE.txt +++ b/doc/FUSE.txt @@ -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) + diff --git a/keyboard/ergodox_ez/keymaps/adnw_k_o_y/keymap.c b/keyboard/ergodox_ez/keymaps/adnw_k_o_y/keymap.c index e33037b33..052517d70 100644 --- a/keyboard/ergodox_ez/keymaps/adnw_k_o_y/keymap.c +++ b/keyboard/ergodox_ez/keymaps/adnw_k_o_y/keymap.c @@ -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 diff --git a/keyboard/ergodox_ez/keymaps/bepo/keymap.c b/keyboard/ergodox_ez/keymaps/bepo/keymap.c index dac6b7b51..921a94d63 100644 --- a/keyboard/ergodox_ez/keymaps/bepo/keymap.c +++ b/keyboard/ergodox_ez/keymaps/bepo/keymap.c @@ -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 diff --git a/keyboard/ergodox_ez/keymaps/colemak_osx_pc_no/keymap.c b/keyboard/ergodox_ez/keymaps/colemak_osx_pc_no/keymap.c index da540c7a3..3b74d266f 100644 --- a/keyboard/ergodox_ez/keymaps/colemak_osx_pc_no/keymap.c +++ b/keyboard/ergodox_ez/keymaps/colemak_osx_pc_no/keymap.c @@ -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 diff --git a/keyboard/ergodox_ez/keymaps/german-kinergo/keymap.c b/keyboard/ergodox_ez/keymaps/german-kinergo/keymap.c index 572e03a1d..b1cecf0dd 100644 --- a/keyboard/ergodox_ez/keymaps/german-kinergo/keymap.c +++ b/keyboard/ergodox_ez/keymaps/german-kinergo/keymap.c @@ -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 diff --git a/keyboard/ergodox_ez/keymaps/german-manuneo/keymap.c b/keyboard/ergodox_ez/keymaps/german-manuneo/keymap.c index 131796fc5..5fcc14d51 100644 --- a/keyboard/ergodox_ez/keymaps/german-manuneo/keymap.c +++ b/keyboard/ergodox_ez/keymaps/german-manuneo/keymap.c @@ -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 diff --git a/keyboard/ergodox_ez/keymaps/german/keymap.c b/keyboard/ergodox_ez/keymaps/german/keymap.c index 7ec8d99cc..3eab51f0e 100644 --- a/keyboard/ergodox_ez/keymaps/german/keymap.c +++ b/keyboard/ergodox_ez/keymaps/german/keymap.c @@ -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 diff --git a/keyboard/ergodox_ez/keymaps/mpiechotka/keymap.c b/keyboard/ergodox_ez/keymaps/mpiechotka/keymap.c index 0c4f85a3d..5bfef5995 100644 --- a/keyboard/ergodox_ez/keymaps/mpiechotka/keymap.c +++ b/keyboard/ergodox_ez/keymaps/mpiechotka/keymap.c @@ -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, diff --git a/keyboard/ergodox_ez/keymaps/osx_de_adnw_koy/keymap.c b/keyboard/ergodox_ez/keymaps/osx_de_adnw_koy/keymap.c index 20b085ed4..687a5cb8b 100644 --- a/keyboard/ergodox_ez/keymaps/osx_de_adnw_koy/keymap.c +++ b/keyboard/ergodox_ez/keymaps/osx_de_adnw_koy/keymap.c @@ -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" diff --git a/keyboard/ergodox_ez/keymaps/osx_de_experimental/keymap.c b/keyboard/ergodox_ez/keymaps/osx_de_experimental/keymap.c index 4a9ceb4ef..21d695894 100644 --- a/keyboard/ergodox_ez/keymaps/osx_de_experimental/keymap.c +++ b/keyboard/ergodox_ez/keymaps/osx_de_experimental/keymap.c @@ -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" diff --git a/keyboard/ergodox_ez/keymaps/software_neo2/keymap.c b/keyboard/ergodox_ez/keymaps/software_neo2/keymap.c index a734062f1..2eaba0d7d 100644 --- a/keyboard/ergodox_ez/keymaps/software_neo2/keymap.c +++ b/keyboard/ergodox_ez/keymaps/software_neo2/keymap.c @@ -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 diff --git a/keyboard/planck/keymaps/lucas/keymap.c b/keyboard/planck/keymaps/lucas/keymap.c index 7ac9c5cd0..2208780b1 100644 --- a/keyboard/planck/keymaps/lucas/keymap.c +++ b/keyboard/planck/keymaps/lucas/keymap.c @@ -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" 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