Skip to content

Commit

Permalink
Update GPIO API usage in keyboard code (#23361)
Browse files Browse the repository at this point in the history
  • Loading branch information
@fauxpark
fauxpark authored May 3, 2024
1 parent 5426a7a commit d09a06a
Show file tree
Hide file tree
Showing 390 changed files with 3,914 additions and 3,915 deletions.
14 changes: 7 additions & 7 deletions keyboards/3w6/rev1/matrix.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -165,8 +165,8 @@ static void init_cols(void) {
pin_t matrix_col_pins_mcu[MATRIX_COLS_PER_SIDE] = MATRIX_COL_PINS_L;
for (int pin_index = 0; pin_index < MATRIX_COLS_PER_SIDE; pin_index++) {
pin_t pin = matrix_col_pins_mcu[pin_index];
setPinInput(pin);
writePinHigh(pin);
gpio_set_pin_input(pin);
gpio_write_pin_high(pin);
}
}

Expand All @@ -177,7 +177,7 @@ static matrix_row_t read_cols(uint8_t row) {
// For each col...
for (uint8_t col_index = 0; col_index < MATRIX_COLS_PER_SIDE; col_index++) {
// Select the col pin to read (active low)
uint8_t pin_state = readPin(matrix_col_pins_mcu[col_index]);
uint8_t pin_state = gpio_read_pin(matrix_col_pins_mcu[col_index]);

// Populate the matrix row with the state of the col pin
current_row_value |= pin_state ? 0 : (MATRIX_ROW_SHIFTER << col_index);
Expand Down Expand Up @@ -223,8 +223,8 @@ static void unselect_rows(void) {
pin_t matrix_row_pins_mcu[MATRIX_ROWS_PER_SIDE] = MATRIX_ROW_PINS_L;
for (int pin_index = 0; pin_index < MATRIX_ROWS_PER_SIDE; pin_index++) {
pin_t pin = matrix_row_pins_mcu[pin_index];
setPinInput(pin);
writePinLow(pin);
gpio_set_pin_input(pin);
gpio_write_pin_low(pin);
}
}

Expand All @@ -236,8 +236,8 @@ static void select_row(uint8_t row) {
// select on atmega32u4
pin_t matrix_row_pins_mcu[MATRIX_ROWS_PER_SIDE] = MATRIX_ROW_PINS_L;
pin_t pin = matrix_row_pins_mcu[row];
setPinOutput(pin);
writePinLow(pin);
gpio_set_pin_output(pin);
gpio_write_pin_low(pin);
} else {
// select on tca9555
if (tca9555_status) { // if there was an error
Expand Down
14 changes: 7 additions & 7 deletions keyboards/3w6/rev2/matrix.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -165,8 +165,8 @@ static void init_cols(void) {
pin_t matrix_col_pins_mcu[MATRIX_COLS_PER_SIDE] = MATRIX_COL_PINS_L;
for (int pin_index = 0; pin_index < MATRIX_COLS_PER_SIDE; pin_index++) {
pin_t pin = matrix_col_pins_mcu[pin_index];
setPinInput(pin);
writePinHigh(pin);
gpio_set_pin_input(pin);
gpio_write_pin_high(pin);
}
}

Expand All @@ -177,7 +177,7 @@ static matrix_row_t read_cols(uint8_t row) {
// For each col...
for (uint8_t col_index = 0; col_index < MATRIX_COLS_PER_SIDE; col_index++) {
// Select the col pin to read (active low)
uint8_t pin_state = readPin(matrix_col_pins_mcu[col_index]);
uint8_t pin_state = gpio_read_pin(matrix_col_pins_mcu[col_index]);

// Populate the matrix row with the state of the col pin
current_row_value |= pin_state ? 0 : (MATRIX_ROW_SHIFTER << col_index);
Expand Down Expand Up @@ -221,8 +221,8 @@ static void unselect_rows(void) {
pin_t matrix_row_pins_mcu[MATRIX_ROWS_PER_SIDE] = MATRIX_ROW_PINS_L;
for (int pin_index = 0; pin_index < MATRIX_ROWS_PER_SIDE; pin_index++) {
pin_t pin = matrix_row_pins_mcu[pin_index];
setPinInput(pin);
writePinLow(pin);
gpio_set_pin_input(pin);
gpio_write_pin_low(pin);
}
}

Expand All @@ -233,8 +233,8 @@ static void select_row(uint8_t row) {
// select on atmega32u4
pin_t matrix_row_pins_mcu[MATRIX_ROWS_PER_SIDE] = MATRIX_ROW_PINS_L;
pin_t pin = matrix_row_pins_mcu[row];
setPinOutput(pin);
writePinLow(pin);
gpio_set_pin_output(pin);
gpio_write_pin_low(pin);
} else {
// select on tca9555
if (tca9555_status) { // if there was an error
Expand Down
4 changes: 2 additions & 2 deletions keyboards/40percentclub/4pack/4pack.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@ void matrix_init_kb(void) {
// put your keyboard start-up code here
// runs once when the firmware starts up

setPinOutput(F4); // cathodes
setPinOutput(F5); // cathodes
gpio_set_pin_output(F4); // cathodes
gpio_set_pin_output(F5); // cathodes

// Do the rest
matrix_init_user();
Expand Down
6 changes: 3 additions & 3 deletions keyboards/40percentclub/sixpack/sixpack.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@
#include "quantum.h"

void matrix_init_kb(void) {
setPinOutput(B6); // Backlight cathodes Col.3
setPinOutput(F6); // Backlight cathodes Col.2
setPinOutput(F7); // Backlight cathodes Col.1
gpio_set_pin_output(B6); // Backlight cathodes Col.3
gpio_set_pin_output(F6); // Backlight cathodes Col.2
gpio_set_pin_output(F7); // Backlight cathodes Col.1

matrix_init_user();
}
94 changes: 47 additions & 47 deletions keyboards/4pplet/eagle_viper_rep/rev_a/rev_a.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,33 +17,33 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include "rev_a.h"

void board_init(void) {
setPinInputHigh(CAPS_PIN);
setPinInputHigh(SCROLL_PIN);
setPinInputHigh(NUM_PIN);
gpio_set_pin_input_high(CAPS_PIN);
gpio_set_pin_input_high(SCROLL_PIN);
gpio_set_pin_input_high(NUM_PIN);
}

/* Set indicator leds to indicate lock states */
bool led_update_kb(led_t led_state) {
bool res = led_update_user(led_state);
if(res && LOCK_LIGHTS) {
if(led_state.caps_lock){
setPinOutput(CAPS_PIN);
writePin(CAPS_PIN, 0);
gpio_set_pin_output(CAPS_PIN);
gpio_write_pin(CAPS_PIN, 0);
}
else
setPinInputHigh(CAPS_PIN);
gpio_set_pin_input_high(CAPS_PIN);
if(led_state.scroll_lock){
setPinOutput(SCROLL_PIN);
writePin(SCROLL_PIN, 0);
gpio_set_pin_output(SCROLL_PIN);
gpio_write_pin(SCROLL_PIN, 0);
}
else
setPinInputHigh(SCROLL_PIN);
gpio_set_pin_input_high(SCROLL_PIN);
if(led_state.num_lock){
setPinOutput(NUM_PIN);
writePin(NUM_PIN, 0);
gpio_set_pin_output(NUM_PIN);
gpio_write_pin(NUM_PIN, 0);
}
else
setPinInputHigh(NUM_PIN);
gpio_set_pin_input_high(NUM_PIN);
}
return res;
}
Expand All @@ -59,50 +59,50 @@ layer_state_t layer_state_set_kb(layer_state_t state) {
void setLayerLed(layer_state_t state){
switch(get_highest_layer(state)){
case 0 :
setPinOutput(LAYER_1);
writePin(LAYER_1, 0);
setPinInputHigh(LAYER_2);
setPinInputHigh(LAYER_3);
setPinInputHigh(LAYER_4);
setPinInputHigh(LAYER_5);
gpio_set_pin_output(LAYER_1);
gpio_write_pin(LAYER_1, 0);
gpio_set_pin_input_high(LAYER_2);
gpio_set_pin_input_high(LAYER_3);
gpio_set_pin_input_high(LAYER_4);
gpio_set_pin_input_high(LAYER_5);
break;
case 1 :
setPinOutput(LAYER_2);
writePin(LAYER_2, 0);
setPinInputHigh(LAYER_1);
setPinInputHigh(LAYER_3);
setPinInputHigh(LAYER_4);
setPinInputHigh(LAYER_5);
gpio_set_pin_output(LAYER_2);
gpio_write_pin(LAYER_2, 0);
gpio_set_pin_input_high(LAYER_1);
gpio_set_pin_input_high(LAYER_3);
gpio_set_pin_input_high(LAYER_4);
gpio_set_pin_input_high(LAYER_5);
break;
case 2 :
setPinOutput(LAYER_3);
writePin(LAYER_3, 0);
setPinInputHigh(LAYER_1);
setPinInputHigh(LAYER_2);
setPinInputHigh(LAYER_4);
setPinInputHigh(LAYER_5);
gpio_set_pin_output(LAYER_3);
gpio_write_pin(LAYER_3, 0);
gpio_set_pin_input_high(LAYER_1);
gpio_set_pin_input_high(LAYER_2);
gpio_set_pin_input_high(LAYER_4);
gpio_set_pin_input_high(LAYER_5);
break;
case 3 :
writePin(LAYER_4, 0);
setPinInputHigh(LAYER_5);
setPinInputHigh(LAYER_1);
setPinInputHigh(LAYER_2);
setPinInputHigh(LAYER_3);
setPinOutput(LAYER_4);
gpio_write_pin(LAYER_4, 0);
gpio_set_pin_input_high(LAYER_5);
gpio_set_pin_input_high(LAYER_1);
gpio_set_pin_input_high(LAYER_2);
gpio_set_pin_input_high(LAYER_3);
gpio_set_pin_output(LAYER_4);
break;
case 4 :
setPinOutput(LAYER_5);
writePin(LAYER_5, 0);
setPinInputHigh(LAYER_1);
setPinInputHigh(LAYER_2);
setPinInputHigh(LAYER_3);
setPinInputHigh(LAYER_4);
gpio_set_pin_output(LAYER_5);
gpio_write_pin(LAYER_5, 0);
gpio_set_pin_input_high(LAYER_1);
gpio_set_pin_input_high(LAYER_2);
gpio_set_pin_input_high(LAYER_3);
gpio_set_pin_input_high(LAYER_4);
break;
default :
setPinInputHigh(LAYER_1);
setPinInputHigh(LAYER_2);
setPinInputHigh(LAYER_3);
setPinInputHigh(LAYER_4);
setPinInputHigh(LAYER_5);
gpio_set_pin_input_high(LAYER_1);
gpio_set_pin_input_high(LAYER_2);
gpio_set_pin_input_high(LAYER_3);
gpio_set_pin_input_high(LAYER_4);
gpio_set_pin_input_high(LAYER_5);
}
}
30 changes: 15 additions & 15 deletions keyboards/4pplet/eagle_viper_rep/rev_b/rev_b.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,11 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include "rev_b.h"

void keyboard_pre_init_kb(void) {
setPinOutput(LAYER_1);
setPinOutput(LAYER_2);
setPinOutput(LAYER_3);
setPinOutput(LAYER_4);
setPinOutput(LAYER_5);
gpio_set_pin_output(LAYER_1);
gpio_set_pin_output(LAYER_2);
gpio_set_pin_output(LAYER_3);
gpio_set_pin_output(LAYER_4);
gpio_set_pin_output(LAYER_5);
keyboard_pre_init_user();
}

Expand All @@ -32,26 +32,26 @@ layer_state_t layer_state_set_kb(layer_state_t state) {
}
/* Set indicator leds to indicate which layer is active */
void setLayerLed(layer_state_t state){
writePinLow(LAYER_1);
writePinLow(LAYER_2);
writePinLow(LAYER_3);
writePinLow(LAYER_4);
writePinLow(LAYER_5);
gpio_write_pin_low(LAYER_1);
gpio_write_pin_low(LAYER_2);
gpio_write_pin_low(LAYER_3);
gpio_write_pin_low(LAYER_4);
gpio_write_pin_low(LAYER_5);
switch (get_highest_layer(state)) {
case 0:
writePinHigh(LAYER_1);
gpio_write_pin_high(LAYER_1);
break;
case 1:
writePinHigh(LAYER_2);
gpio_write_pin_high(LAYER_2);
break;
case 2:
writePinHigh(LAYER_3);
gpio_write_pin_high(LAYER_3);
break;
case 3:
writePinHigh(LAYER_4);
gpio_write_pin_high(LAYER_4);
break;
case 4:
writePinHigh(LAYER_5);
gpio_write_pin_high(LAYER_5);
break;
}
}
Expand Down
4 changes: 2 additions & 2 deletions keyboards/acheron/apollo/87h/delta/delta.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include "quantum.h"

void board_init(void) {
setPinInput(B9);
setPinInput(B10);
gpio_set_pin_input(B9);
gpio_set_pin_input(B10);
}

led_config_t g_led_config = { {
Expand Down
4 changes: 2 additions & 2 deletions keyboards/acheron/apollo/87htsc/87htsc.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include "quantum.h"

void board_init(void) {
setPinInput(B9);
setPinInput(B10);
gpio_set_pin_input(B9);
gpio_set_pin_input(B10);
}

led_config_t g_led_config = { {
Expand Down
8 changes: 4 additions & 4 deletions keyboards/acheron/athena/alpha/alpha.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@
#include "quantum.h"

void board_init(void) {
setPinInput(B6);
setPinInput(B7);
gpio_set_pin_input(B6);
gpio_set_pin_input(B7);
}

void keyboard_post_init_kb(void){
Expand All @@ -34,10 +34,10 @@ bool led_update_kb(led_t led_state) {
bool res = led_update_user(led_state);
#ifdef CAPSLOCK_INDICATOR
if(res) {
writePin(LED_CAPS_LOCK_PIN, !led_state.caps_lock);
gpio_write_pin(LED_CAPS_LOCK_PIN, !led_state.caps_lock);
}
#else
writePin(LED_CAPS_LOCK_PIN, 0);
gpio_write_pin(LED_CAPS_LOCK_PIN, 0);
#endif
return res;
}
8 changes: 4 additions & 4 deletions keyboards/acheron/athena/beta/beta.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,18 +17,18 @@
#include "quantum.h"

void board_init(void) {
setPinInput(B6);
setPinInput(B7);
gpio_set_pin_input(B6);
gpio_set_pin_input(B7);
}

bool led_update_kb(led_t led_state) {
bool res = led_update_user(led_state);
#ifdef CAPSLOCK_INDICATOR
if(res) {
writePin(LED_CAPS_LOCK_PIN, led_state.caps_lock);
gpio_write_pin(LED_CAPS_LOCK_PIN, led_state.caps_lock);
}
#else
writePin(LED_CAPS_LOCK_PIN, 0);
gpio_write_pin(LED_CAPS_LOCK_PIN, 0);
#endif
return res;
}
12 changes: 6 additions & 6 deletions keyboards/acheron/austin/austin.c
View file
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
#include "quantum.h"

void keyboard_pre_init_kb(void) {
setPinOutput(A0);
setPinOutput(A1);
setPinOutput(A2);
gpio_set_pin_output(A0);
gpio_set_pin_output(A1);
gpio_set_pin_output(A2);

keyboard_pre_init_user();
}

bool led_update_kb(led_t led_state) {
if (led_update_user(led_state)) {
writePin(A2, led_state.num_lock);
writePin(A0, led_state.caps_lock);
writePin(A1, led_state.scroll_lock);
gpio_write_pin(A2, led_state.num_lock);
gpio_write_pin(A0, led_state.caps_lock);
gpio_write_pin(A1, led_state.scroll_lock);
}
return true;
}
Loading

0 comments on commit d09a06a

Please sign in to comment.