Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Migrate serial_uart usages to UART driver #15479

Merged
merged 16 commits into from
Dec 15, 2021
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Migrate Telophase to UART driver
  • Loading branch information
fauxpark committed Dec 15, 2021
commit 4ed0eaa40a106c7fbe7d37dce2feb6aafacb979a
9 changes: 0 additions & 9 deletions keyboards/telophase/config.h
Original file line number Diff line number Diff line change
Expand Up @@ -72,12 +72,3 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
/* disable these deprecated features by default */
#define NO_ACTION_MACRO
#define NO_ACTION_FUNCTION

// UART settings for communication with the RF microcontroller
#define SERIAL_UART_BAUD 1000000
#define SERIAL_UART_RXD_PRESENT (UCSR1A & _BV(RXC1))
#define SERIAL_UART_INIT_CUSTOM \
/* enable TX and RX */ \
UCSR1B = _BV(TXEN1) | _BV(RXEN1); \
/* 8-bit data */ \
UCSR1C = _BV(UCSZ11) | _BV(UCSZ10);
10 changes: 5 additions & 5 deletions keyboards/telophase/matrix.c
Original file line number Diff line number Diff line change
Expand Up @@ -18,18 +18,18 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.

#include "quantum.h"
#include "matrix.h"
#include "protocol/serial.h"
#include "uart.h"

void matrix_init_custom(void) {
serial_init();
uart_init(1000000);
}

bool matrix_scan_custom(matrix_row_t current_matrix[]) {
uint32_t timeout = 0;
bool changed = false;

//the s character requests the RF slave to send the matrix
SERIAL_UART_DATA = 's';
uart_write('s');

//trust the external keystates entirely, erase the last data
uint8_t uart_data[13] = {0};
Expand All @@ -39,13 +39,13 @@ bool matrix_scan_custom(matrix_row_t current_matrix[]) {
//wait for the serial data, timeout if it's been too long
//this only happened in testing with a loose wire, but does no
//harm to leave it in here
while (!SERIAL_UART_RXD_PRESENT) {
while (!uart_available()) {
timeout++;
if (timeout > 10000) {
break;
}
}
uart_data[i] = SERIAL_UART_DATA;
uart_data[i] = uart_read();
}

//check for the end packet, the key state bytes use the LSBs, so 0xE0
Expand Down
3 changes: 2 additions & 1 deletion keyboards/telophase/rules.mk
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,8 @@ AUDIO_ENABLE = no # Audio output
CUSTOM_MATRIX = lite

# project specific files
SRC += matrix.c serial_uart.c
SRC += matrix.c
QUANTUM_LIB_SRC += uart.c

# Disable unsupported hardware
RGBLIGHT_SUPPORTED = no
Expand Down