Don't try to load the saved layer on setup()

If we want to allow plugins to implement EEPROM storage, it is best if we don't
do anything with EEPROM in the core firmware. As such, remove the
`Layer.defaultLayer` call from `Kaleidoscope.setup`.

With that gone, the `keymap_count` argument is obsolete, so drop it from
`Kaleidoscope.setup()` - but we keep an temporary `setup()` with the old arity,
so that plugins can be updated at a slower pace.

Signed-off-by: Gergely Nagy <algernon@madhouse-project.org>
pull/114/head
Gergely Nagy 8 years ago
parent 2397c488c6
commit 71d49dee51

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

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

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

Loading…
Cancel
Save