Merge pull request #114 from algernon/f/no-layer-restore

Don't try to load the saved layer on setup()
pull/116/head
Jesse Vincent 8 years ago committed by GitHub
commit b2fd8d148a

@ -125,7 +125,7 @@ const macro_t *macroAction(uint8_t macroIndex, uint8_t keyState) {
}
void setup() {
Kaleidoscope.setup(KEYMAP_SIZE);
Kaleidoscope.setup();
Kaleidoscope.use(&TestMode,
&LEDControl, &LEDOff,

@ -8,7 +8,7 @@ Kaleidoscope_::Kaleidoscope_(void) {
}
void
Kaleidoscope_::setup(const byte keymap_count) {
Kaleidoscope_::setup(void) {
wdt_disable();
delay(100);
Keyboard.begin();
@ -16,8 +16,6 @@ Kaleidoscope_::setup(const byte keymap_count) {
// A workaround, so that the compiler does not optimize this out...
handle_key_event (Key_NoKey, 255, 255, 0);
Layer.defaultLayer (KeyboardHardware.load_primary_layer (keymap_count));
}
void

@ -61,7 +61,8 @@ class Kaleidoscope_ {
public:
Kaleidoscope_(void);
void setup(const byte keymap_count);
void setup(const byte keymap_count) { setup(); };
void setup(void);
void loop(void);
void use(KaleidoscopePlugin *plugin, ...) __attribute__((sentinel));

Loading…
Cancel
Save