Merge remote-tracking branch 'qmk/master' into merge-2024-04-15

This commit is contained in:
Ilya Zhuravlev
2024-04-15 19:43:02 -06:00
8919 changed files with 113667 additions and 418236 deletions

View File

@ -29,6 +29,10 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
# include "encoder.h"
#endif
#ifdef DIP_SWITCH_MAP_ENABLE
# include "dip_switch.h"
#endif
#ifdef BACKLIGHT_ENABLE
# include "backlight.h"
#endif
@ -217,5 +221,13 @@ __attribute__((weak)) uint16_t keymap_key_to_keycode(uint8_t layer, keypos_t key
return keycode_at_encodermap_location(layer, key.col, false);
}
#endif // ENCODER_MAP_ENABLE
#ifdef DIP_SWITCH_MAP_ENABLE
else if (key.row == KEYLOC_DIP_SWITCH_ON && key.col < NUM_DIP_SWITCHES) {
return keycode_at_dip_switch_map_location(key.col, true);
} else if (key.row == KEYLOC_DIP_SWITCH_OFF && key.col < NUM_DIP_SWITCHES) {
return keycode_at_dip_switch_map_location(key.col, false);
}
#endif // DIP_SWITCH_MAP_ENABLE
return KC_NO;
}