mirror of
https://github.com/qmk/qmk_firmware.git
synced 2025-04-20 14:15:40 +00:00
Fix outdated GPIO control function usage (#25060)
This commit is contained in:
parent
558b074c93
commit
86c22a15ab
@ -75,9 +75,9 @@ static void qp_comms_spi_dc_reset_send_command_odd_cs_pulse(painter_device_t dev
|
|||||||
painter_driver_t * driver = (painter_driver_t *)device;
|
painter_driver_t * driver = (painter_driver_t *)device;
|
||||||
qp_comms_spi_dc_reset_config_t *comms_config = (qp_comms_spi_dc_reset_config_t *)driver->comms_config;
|
qp_comms_spi_dc_reset_config_t *comms_config = (qp_comms_spi_dc_reset_config_t *)driver->comms_config;
|
||||||
|
|
||||||
writePinLow(comms_config->spi_config.chip_select_pin);
|
gpio_write_pin_low(comms_config->spi_config.chip_select_pin);
|
||||||
qp_comms_spi_dc_reset_send_command(device, cmd);
|
qp_comms_spi_dc_reset_send_command(device, cmd);
|
||||||
writePinHigh(comms_config->spi_config.chip_select_pin);
|
gpio_write_pin_high(comms_config->spi_config.chip_select_pin);
|
||||||
}
|
}
|
||||||
|
|
||||||
static uint32_t qp_comms_spi_send_data_odd_cs_pulse(painter_device_t device, const void *data, uint32_t byte_count) {
|
static uint32_t qp_comms_spi_send_data_odd_cs_pulse(painter_device_t device, const void *data, uint32_t byte_count) {
|
||||||
@ -88,20 +88,20 @@ static uint32_t qp_comms_spi_send_data_odd_cs_pulse(painter_device_t device, con
|
|||||||
const uint8_t *p = (const uint8_t *)data;
|
const uint8_t *p = (const uint8_t *)data;
|
||||||
uint32_t max_msg_length = 1024;
|
uint32_t max_msg_length = 1024;
|
||||||
|
|
||||||
writePinHigh(comms_config->dc_pin);
|
gpio_write_pin_high(comms_config->dc_pin);
|
||||||
while (bytes_remaining > 0) {
|
while (bytes_remaining > 0) {
|
||||||
uint32_t bytes_this_loop = QP_MIN(bytes_remaining, max_msg_length);
|
uint32_t bytes_this_loop = QP_MIN(bytes_remaining, max_msg_length);
|
||||||
bool odd_bytes = bytes_this_loop & 1;
|
bool odd_bytes = bytes_this_loop & 1;
|
||||||
|
|
||||||
// send data
|
// send data
|
||||||
writePinLow(comms_config->spi_config.chip_select_pin);
|
gpio_write_pin_low(comms_config->spi_config.chip_select_pin);
|
||||||
spi_transmit(p, bytes_this_loop);
|
spi_transmit(p, bytes_this_loop);
|
||||||
p += bytes_this_loop;
|
p += bytes_this_loop;
|
||||||
|
|
||||||
// extra CS toggle, for alignment
|
// extra CS toggle, for alignment
|
||||||
if (odd_bytes) {
|
if (odd_bytes) {
|
||||||
writePinHigh(comms_config->spi_config.chip_select_pin);
|
gpio_write_pin_high(comms_config->spi_config.chip_select_pin);
|
||||||
writePinLow(comms_config->spi_config.chip_select_pin);
|
gpio_write_pin_low(comms_config->spi_config.chip_select_pin);
|
||||||
}
|
}
|
||||||
|
|
||||||
bytes_remaining -= bytes_this_loop;
|
bytes_remaining -= bytes_this_loop;
|
||||||
@ -116,9 +116,9 @@ static uint32_t qp_ili9486_send_data_toggling(painter_device_t device, const uin
|
|||||||
|
|
||||||
uint32_t ret;
|
uint32_t ret;
|
||||||
for (uint8_t j = 0; j < byte_count; ++j) {
|
for (uint8_t j = 0; j < byte_count; ++j) {
|
||||||
writePinLow(comms_config->spi_config.chip_select_pin);
|
gpio_write_pin_low(comms_config->spi_config.chip_select_pin);
|
||||||
ret = qp_comms_spi_dc_reset_send_data(device, &data[j], 1);
|
ret = qp_comms_spi_dc_reset_send_data(device, &data[j], 1);
|
||||||
writePinHigh(comms_config->spi_config.chip_select_pin);
|
gpio_write_pin_high(comms_config->spi_config.chip_select_pin);
|
||||||
}
|
}
|
||||||
|
|
||||||
return ret;
|
return ret;
|
||||||
|
@ -127,7 +127,7 @@ bool matrix_scan_custom(matrix_row_t current_matrix[]) {
|
|||||||
matrix_io_delay();
|
matrix_io_delay();
|
||||||
}
|
}
|
||||||
// read col data
|
// read col data
|
||||||
data = ((readPin(A0) << 0) | (readPin(A1) << 1) | (readPin(A2) << 2) | (readPin(A3) << 3) | (readPin(A6) << 4) | (readPin(A7) << 5) | (readPin(B0) << 6));
|
data = ((gpio_read_pin(A0) << 0) | (gpio_read_pin(A1) << 1) | (gpio_read_pin(A2) << 2) | (gpio_read_pin(A3) << 3) | (gpio_read_pin(A6) << 4) | (gpio_read_pin(A7) << 5) | (gpio_read_pin(B0) << 6));
|
||||||
// unstrobe row
|
// unstrobe row
|
||||||
switch (row) {
|
switch (row) {
|
||||||
case 0:
|
case 0:
|
||||||
|
Loading…
Reference in New Issue
Block a user