masq
/
qmk_firmware
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Align DIP_SWITCH_PINS_RIGHT implementation with encoders (#14079)

This commit is contained in:
Joel Challis 2021-08-20 10:15:11 +01:00 committed by GitHub
parent b229b0fba7
commit 69c71d4843
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
quantum/dip_switch.c
View File

@ -35,9 +35,6 @@
#ifdef DIP_SWITCH_PINS #ifdef DIP_SWITCH_PINS
# define NUMBER_OF_DIP_SWITCHES (sizeof(dip_switch_pad) / sizeof(pin_t)) # define NUMBER_OF_DIP_SWITCHES (sizeof(dip_switch_pad) / sizeof(pin_t))
static pin_t dip_switch_pad[] = DIP_SWITCH_PINS; static pin_t dip_switch_pad[] = DIP_SWITCH_PINS;
# if defined(SPLIT_KEYBOARD) && defined(DIP_SWITCH_PINS_RIGHT)
static pin_t dip_switch_pad_right[] = DIP_SWITCH_PINS_RIGHT;
# endif
#endif #endif
#ifdef DIP_SWITCH_MATRIX_GRID #ifdef DIP_SWITCH_MATRIX_GRID
@ -65,16 +62,16 @@ __attribute__((weak)) bool dip_switch_update_mask_kb(uint32_t state) { return di
void dip_switch_init(void) { void dip_switch_init(void) {
#ifdef DIP_SWITCH_PINS #ifdef DIP_SWITCH_PINS
for (uint8_t i = 0; i < NUMBER_OF_DIP_SWITCHES; i++) {
# if defined(SPLIT_KEYBOARD) && defined(DIP_SWITCH_PINS_RIGHT) # if defined(SPLIT_KEYBOARD) && defined(DIP_SWITCH_PINS_RIGHT)
if (isLeftHand) { if (!isLeftHand) {
# endif const pin_t dip_switch_pad_right[] = DIP_SWITCH_PINS_RIGHT;
setPinInputHigh(dip_switch_pad[i]); for (uint8_t i = 0; i < NUMBER_OF_DIP_SWITCHES; i++) {
# if defined(SPLIT_KEYBOARD) && defined(DIP_SWITCH_PINS_RIGHT) dip_switch_pad[i] = dip_switch_pad_right[i];
} else {
setPinInputHigh(dip_switch_pad_right[i]);
} }
}
# endif # endif
for (uint8_t i = 0; i < NUMBER_OF_DIP_SWITCHES; i++) {
setPinInputHigh(dip_switch_pad[i]);
} }
dip_switch_read(true); dip_switch_read(true);
#endif #endif
@ -103,15 +100,7 @@ void dip_switch_read(bool forced) {
for (uint8_t i = 0; i < NUMBER_OF_DIP_SWITCHES; i++) { for (uint8_t i = 0; i < NUMBER_OF_DIP_SWITCHES; i++) {
#ifdef DIP_SWITCH_PINS #ifdef DIP_SWITCH_PINS
# if defined(SPLIT_KEYBOARD) && defined(DIP_SWITCH_PINS_RIGHT) dip_switch_state[i] = !readPin(dip_switch_pad[i]);
if (isLeftHand) {
# endif
dip_switch_state[i] = !readPin(dip_switch_pad[i]);
# if defined(SPLIT_KEYBOARD) && defined(DIP_SWITCH_PINS_RIGHT)
} else {
dip_switch_state[i] = !readPin(dip_switch_pad_right[i]);
}
# endif
#endif #endif
#ifdef DIP_SWITCH_MATRIX_GRID #ifdef DIP_SWITCH_MATRIX_GRID
dip_switch_state[i] = peek_matrix(dip_switch_pad[i].row, dip_switch_pad[i].col, read_raw); dip_switch_state[i] = peek_matrix(dip_switch_pad[i].row, dip_switch_pad[i].col, read_raw);