summaryrefslogtreecommitdiff
path: root/keyboards/chimera_ortho
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/chimera_ortho')
-rw-r--r--keyboards/chimera_ortho/chimera_ortho.c15
-rw-r--r--keyboards/chimera_ortho/config.h18
-rw-r--r--keyboards/chimera_ortho/matrix.c4
-rw-r--r--keyboards/chimera_ortho/rules.mk8
4 files changed, 8 insertions, 37 deletions
diff --git a/keyboards/chimera_ortho/chimera_ortho.c b/keyboards/chimera_ortho/chimera_ortho.c
index 2a602cf2f7..2cdc3d9331 100644
--- a/keyboards/chimera_ortho/chimera_ortho.c
+++ b/keyboards/chimera_ortho/chimera_ortho.c
@@ -1,9 +1,5 @@
#include "chimera_ortho.h"
-void uart_init(void) {
- SERIAL_UART_INIT();
-}
-
void led_init(void) {
DDRD |= (1<<1);
PORTD |= (1<<1);
@@ -16,16 +12,5 @@ void matrix_init_kb(void) {
// put your keyboard start-up code here
// runs once when the firmware starts up
matrix_init_user();
- uart_init();
led_init();
}
-
-void matrix_scan_kb(void) {
- // put your looping keyboard code here
- // runs every cycle (a lot)
- matrix_scan_user();
-}
-
-void led_set_kb(uint8_t usb_led) {
-
-}
diff --git a/keyboards/chimera_ortho/config.h b/keyboards/chimera_ortho/config.h
index 4ce70e68ba..b103589879 100644
--- a/keyboards/chimera_ortho/config.h
+++ b/keyboards/chimera_ortho/config.h
@@ -60,19 +60,11 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
//UART settings for communication with the RF microcontroller
#define SERIAL_UART_BAUD 1000000
-#define SERIAL_UART_DATA UDR1
-#define SERIAL_UART_UBRR (F_CPU / (16UL * SERIAL_UART_BAUD) - 1)
-#define SERIAL_UART_TXD_READY (UCSR1A & _BV(UDRE1))
#define SERIAL_UART_RXD_PRESENT (UCSR1A & _BV(RXC1))
-#define SERIAL_UART_INIT() do { \
- /* baud rate */ \
- UBRR1L = SERIAL_UART_UBRR; \
- /* baud rate */ \
- UBRR1H = SERIAL_UART_UBRR >> 8; \
- /* enable TX and RX */ \
- UCSR1B = _BV(TXEN1) | _BV(RXEN1); \
- /* 8-bit data */ \
- UCSR1C = _BV(UCSZ11) | _BV(UCSZ10); \
- } while(0)
+#define SERIAL_UART_INIT_CUSTOM \
+ /* enable TX and RX */ \
+ UCSR1B = _BV(TXEN1) | _BV(RXEN1); \
+ /* 8-bit data */ \
+ UCSR1C = _BV(UCSZ11) | _BV(UCSZ10);
#endif
diff --git a/keyboards/chimera_ortho/matrix.c b/keyboards/chimera_ortho/matrix.c
index dc38ba74f8..eb2f18473e 100644
--- a/keyboards/chimera_ortho/matrix.c
+++ b/keyboards/chimera_ortho/matrix.c
@@ -26,6 +26,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include "util.h"
#include "matrix.h"
#include "timer.h"
+#include "protocol/serial.h"
#if (MATRIX_COLS <= 8)
# define print_matrix_header() print("\nr/c 01234567\n")
@@ -78,12 +79,11 @@ uint8_t matrix_cols(void) {
void matrix_init(void) {
matrix_init_quantum();
+ serial_init();
}
uint8_t matrix_scan(void)
{
- SERIAL_UART_INIT();
-
uint32_t timeout = 0;
//the s character requests the RF slave to send the matrix
diff --git a/keyboards/chimera_ortho/rules.mk b/keyboards/chimera_ortho/rules.mk
index bf341ab5dd..e3bbaa39d4 100644
--- a/keyboards/chimera_ortho/rules.mk
+++ b/keyboards/chimera_ortho/rules.mk
@@ -28,11 +28,5 @@ NKRO_ENABLE = yes # USB Nkey Rollover - not yet supported in LUFA
UNICODE_ENABLE = YES # Unicode
# BLUETOOTH_ENABLE = yes # Enable Bluetooth with the Adafruit EZ-Key HID
-USB = /dev/ttyACM0
-
-OPT_DEFS += -DCHIMERA_ORTHO_PROMICRO
-CHIMERA_ORTHO_UPLOAD_COMMAND = while [ ! -r $(USB) ]; do sleep 1; done; \
- avrdude -p $(MCU) -c avr109 -U flash:w:$(TARGET).hex -P $(USB)
-
# project specific files
-SRC = matrix.c
+SRC += matrix.c serial_uart.c