drashna/qmk_firmware
1
0
Fork 0
Code Activity Actions

Update GPIO API usage in keyboard code (#23361)

Browse source
This commit is contained in:
Ryan 2024-05-03 15:21:29 +10:00 • committed by GitHub
parent 5426a7a129
commit d09a06a1b3
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
390 changed files with 3912 additions and 3913 deletions
Download patch file Download diff file Expand all files Collapse all files

24
keyboards/qvex/lynepad/lynepad.c
View file

@ -15,12 +15,12 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
void keyboard_pre_init_kb(void) {
// Encoder pins
setPinInput(PIN_TW_SW);
setPinInput(PIN_RJ_SW);
setPinInput(PIN_RJ_DIR_A);
setPinInput(PIN_RJ_DIR_C);
setPinInput(PIN_RJ_DIR_B);
setPinInput(PIN_RJ_DIR_D);
gpio_set_pin_input(PIN_TW_SW);
gpio_set_pin_input(PIN_RJ_SW);
gpio_set_pin_input(PIN_RJ_DIR_A);
gpio_set_pin_input(PIN_RJ_DIR_C);
gpio_set_pin_input(PIN_RJ_DIR_B);
gpio_set_pin_input(PIN_RJ_DIR_D);
keyboard_pre_init_user();
}
@ -40,18 +40,18 @@ int16_t enc2RightPrev = 1;
void matrix_scan_kb(void) {
enc1CenterPrev = enc1Center;
enc1Center = readPin(PIN_TW_SW);
enc1Center = gpio_read_pin(PIN_TW_SW);
enc2CenterPrev = enc2Center;
enc2Center = readPin(PIN_RJ_SW);
enc2Center = gpio_read_pin(PIN_RJ_SW);
enc2UpPrev = enc2Up;
enc2Up = readPin(PIN_RJ_DIR_A);
enc2Up = gpio_read_pin(PIN_RJ_DIR_A);
enc2DownPrev = enc2Down;
enc2Down = readPin(PIN_RJ_DIR_C);
enc2Down = gpio_read_pin(PIN_RJ_DIR_C);
enc2LeftPrev = enc2Left;
enc2Left = readPin(PIN_RJ_DIR_B);
enc2Left = gpio_read_pin(PIN_RJ_DIR_B);
enc2RightPrev = enc2Right;
enc2Right = readPin(PIN_RJ_DIR_D);
enc2Right = gpio_read_pin(PIN_RJ_DIR_D);
// Ensure any user customizations are called (for some reason this wasn't happening by default)
matrix_scan_user();

36
keyboards/qvex/lynepad2/matrix.c
View file

@ -24,31 +24,31 @@ extern matrix_row_t raw_matrix[MATRIX_ROWS]; // raw values
extern matrix_row_t matrix[MATRIX_ROWS]; // debounced values
static void select_row(uint8_t row) {
setPinOutput(row_pins[row]);
writePinLow(row_pins[row]);
gpio_set_pin_output(row_pins[row]);
gpio_write_pin_low(row_pins[row]);
}
static void unselect_row(uint8_t row) {
setPinInputHigh(row_pins[row]);
gpio_set_pin_input_high(row_pins[row]);
}
static void unselect_rows(void) {
for (uint8_t x = 0; x < MATRIX_ROWS; x++) {
setPinInputHigh(row_pins[x]);
gpio_set_pin_input_high(row_pins[x]);
}
}
static void init_pins(void) {
unselect_rows();
for (uint8_t x = 0; x < MATRIX_COLS; x++) {
setPinInputHigh(col_pins[x]);
gpio_set_pin_input_high(col_pins[x]);
}
setPinInputHigh(PIN_JU);
setPinInputHigh(PIN_JD);
setPinInputHigh(PIN_JL);
setPinInputHigh(PIN_JR);
setPinInputHigh(PIN_JC);
setPinInputHigh(PIN_TC);
gpio_set_pin_input_high(PIN_JU);
gpio_set_pin_input_high(PIN_JD);
gpio_set_pin_input_high(PIN_JL);
gpio_set_pin_input_high(PIN_JR);
gpio_set_pin_input_high(PIN_JC);
gpio_set_pin_input_high(PIN_TC);
}
static bool read_cols_on_row(matrix_row_t current_matrix[], uint8_t current_row) {
@ -62,7 +62,7 @@ static bool read_cols_on_row(matrix_row_t current_matrix[], uint8_t current_row)
wait_us(30);
for (uint8_t col_index = 0; col_index < MATRIX_COLS; col_index++) {
uint8_t pin_state = readPin(col_pins[col_index]);
uint8_t pin_state = gpio_read_pin(col_pins[col_index]);
current_matrix[current_row] |= pin_state ? 0 : (MATRIX_ROW_SHIFTER << col_index);
}
@ -78,16 +78,16 @@ static bool read_encoder_switches(matrix_row_t current_matrix[]) {
current_matrix[3] = 0;
current_matrix[4] = 0;
current_matrix[4] |= !readPin(PIN_TC) ? (1 << 1) : 0;
current_matrix[4] |= !gpio_read_pin(PIN_TC) ? (1 << 1) : 0;
if (!readPin(PIN_JC)) {
if (!readPin(PIN_JU)) {
if (!gpio_read_pin(PIN_JC)) {
if (!gpio_read_pin(PIN_JU)) {
current_matrix[3] |= (1 << 0);
} else if (!readPin(PIN_JD)) {
} else if (!gpio_read_pin(PIN_JD)) {
current_matrix[3] |= (1 << 1);
} else if (!readPin(PIN_JL)) {
} else if (!gpio_read_pin(PIN_JL)) {
current_matrix[3] |= (1 << 2);
} else if (!readPin(PIN_JR)) {
} else if (!gpio_read_pin(PIN_JR)) {
current_matrix[3] |= (1 << 3);
} else {
current_matrix[4] |= (1 << 0);