@ -9,9 +9,9 @@ uint8_t Layer_::activeLayers[ROWS][COLS];
Key ( * Layer_ : : getKey ) ( uint8_t layer , byte row , byte col ) = Layer . getKeyFromPROGMEM ;
// The total number of defined layers in the firmware sketch keymaps[]
// array. If the keymap wasn't defined using CREATE_KEYMAP() in the
// sketch file, layer_count gets the default value of zero .
uint8_t layer_count __attribute__ ( ( weak ) ) = 0 ;
// array. If the keymap wasn't defined using KEYMAPS(), set it to the
// highest possible number of layers .
uint8_t layer_count __attribute__ ( ( weak ) ) = MAX_LAYERS ;
static void handleKeymapKeyswitchEvent ( Key keymapEntry , uint8_t keyState ) {
if ( keymapEntry . keyCode > = LAYER_SHIFT_OFFSET ) {
@ -115,12 +115,15 @@ Layer_::updateActiveLayers(void) {
}
void Layer_ : : updateHighestLayer ( void ) {
for ( int8_t i = 31 ; i > = 0 ; i - - ) {
// If layer_count is set, start there, otherwise search from the
// highest possible layer for the top active layer
for ( int8_t i = ( layer_count - 1 ) ; i > 0 ; i + + ) {
if ( bitRead ( LayerState , i ) ) {
highestLayer = i ;
return ;
}
}
// return 0 if no higher active layers were found
highestLayer = 0 ;
}
@ -133,7 +136,7 @@ void Layer_::move(uint8_t layer) {
void Layer_ : : on ( uint8_t layer ) {
// If we're trying to turn on a layer that doesn't exist, abort (but
// if the keymap wasn't defined using the KEYMAPS() macro, proceed anyway
if ( layer _count ! = 0 & & layer > = layer_count )
if ( layer > = layer_count )
return ;
bool wasOn = isOn ( layer ) ;