diff options
58 files changed, 162 insertions, 562 deletions
| diff --git a/keyboards/40percentclub/ut47/config.h b/keyboards/40percentclub/ut47/config.h index 197d6cd181..9622f58bb3 100644 --- a/keyboards/40percentclub/ut47/config.h +++ b/keyboards/40percentclub/ut47/config.h @@ -54,25 +54,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.  /* Enable GNAP matrix serial output */  #define GNAP_ENABLE - -/* USART configuration */ -#ifdef __AVR_ATmega32U4__ -#      define SERIAL_UART_BAUD 9600 -#      define SERIAL_UART_DATA UDR1 -#      define SERIAL_UART_UBRR (F_CPU / (16UL * SERIAL_UART_BAUD) - 1) -#      define SERIAL_UART_RXD_VECT USART1_RX_vect -#      define SERIAL_UART_TXD_READY (UCSR1A & _BV(UDRE1)) -#      define SERIAL_UART_INIT() do { \ -            /* baud rate */ \ -            UBRR1L = SERIAL_UART_UBRR; \ -            /* baud rate */ \ -            UBRR1H = SERIAL_UART_UBRR >> 8; \ -            /* enable TX */ \ -            UCSR1B = _BV(TXEN1); \ -            /* 8-bit data */ \ -            UCSR1C = _BV(UCSZ11) | _BV(UCSZ10); \ -            sei(); \ -        } while(0) -#   else -#       error "USART configuration is needed." -#endif diff --git a/keyboards/centromere/centromere.c b/keyboards/centromere/centromere.c index 8800e2ce6a..269c60fd75 100644 --- a/keyboards/centromere/centromere.c +++ b/keyboards/centromere/centromere.c @@ -1,9 +1,5 @@  #include "centromere.h" -void uart_init(void) { -	SERIAL_UART_INIT(); -} -  void led_init(void) {  #if MCU == atmega32u2      setPinOutput(C4); // Set red LED pin as output @@ -32,7 +28,6 @@ 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();  } diff --git a/keyboards/centromere/config.h b/keyboards/centromere/config.h index 0a908f60f9..e502e2534b 100644 --- a/keyboards/centromere/config.h +++ b/keyboards/centromere/config.h @@ -59,17 +59,9 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.  //UART settings for communication with the RF microcontroller  #define SERIAL_UART_BAUD 500000 -#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); diff --git a/keyboards/centromere/matrix.c b/keyboards/centromere/matrix.c index c5fc8db6ce..5ca083b435 100644 --- a/keyboards/centromere/matrix.c +++ b/keyboards/centromere/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") @@ -79,12 +80,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 remote slave to send the matrix information diff --git a/keyboards/centromere/rules.mk b/keyboards/centromere/rules.mk index f08f6e6ebd..2469d244a6 100644 --- a/keyboards/centromere/rules.mk +++ b/keyboards/centromere/rules.mk @@ -31,14 +31,7 @@ MIDI_ENABLE = no 		# MIDI controls  UNICODE_ENABLE = yes 		# Unicode  BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID -USB = /dev/ttyACM0 - -# upload: build -# 	$(CENTROMERE_UPLOAD_COMMAND) - -OPT_DEFS += -DCENTROMERE_PROMICRO -  # # project specific files -SRC = matrix.c +SRC += matrix.c serial_uart.c  LAYOUTS = split_3x5_3 split_3x6_3 diff --git a/keyboards/chimera_ergo/chimera_ergo.c b/keyboards/chimera_ergo/chimera_ergo.c index 29470f9080..47653c2e4b 100644 --- a/keyboards/chimera_ergo/chimera_ergo.c +++ b/keyboards/chimera_ergo/chimera_ergo.c @@ -1,9 +1,5 @@  #include "chimera_ergo.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_ergo/config.h b/keyboards/chimera_ergo/config.h index 262f287a50..4021cdcd50 100644 --- a/keyboards/chimera_ergo/config.h +++ b/keyboards/chimera_ergo/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_ergo/matrix.c b/keyboards/chimera_ergo/matrix.c index d512a51d97..112b9a40d1 100644 --- a/keyboards/chimera_ergo/matrix.c +++ b/keyboards/chimera_ergo/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") @@ -88,12 +89,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_ergo/rules.mk b/keyboards/chimera_ergo/rules.mk index f37d14107b..01d5c3c70c 100644 --- a/keyboards/chimera_ergo/rules.mk +++ b/keyboards/chimera_ergo/rules.mk @@ -28,12 +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 - -OPT_DEFS += -DCHIMERA_ERGO_PROMICRO -CHIMERA_ERGO_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 - -USB = /dev/ttyACM0 +SRC += matrix.c serial_uart.c diff --git a/keyboards/chimera_ls/chimera_ls.c b/keyboards/chimera_ls/chimera_ls.c index 588b02b2d1..f88e9a4f12 100644 --- a/keyboards/chimera_ls/chimera_ls.c +++ b/keyboards/chimera_ls/chimera_ls.c @@ -1,9 +1,5 @@  #include "chimera_ls.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_ls/config.h b/keyboards/chimera_ls/config.h index 87e9196095..d9c14a3fce 100644 --- a/keyboards/chimera_ls/config.h +++ b/keyboards/chimera_ls/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_ls/matrix.c b/keyboards/chimera_ls/matrix.c index 72fe441370..7208d971e1 100644 --- a/keyboards/chimera_ls/matrix.c +++ b/keyboards/chimera_ls/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") @@ -92,12 +93,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_ls/rules.mk b/keyboards/chimera_ls/rules.mk index 162e06aaf7..536e6053a1 100644 --- a/keyboards/chimera_ls/rules.mk +++ b/keyboards/chimera_ls/rules.mk @@ -28,14 +28,8 @@ 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_LS_PROMICRO -CHIMERA_LS_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  LAYOUTS = ortho_4x12 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 diff --git a/keyboards/chimera_ortho_plus/chimera_ortho_plus.c b/keyboards/chimera_ortho_plus/chimera_ortho_plus.c index 1972f2a9c3..6d87ed7053 100644 --- a/keyboards/chimera_ortho_plus/chimera_ortho_plus.c +++ b/keyboards/chimera_ortho_plus/chimera_ortho_plus.c @@ -1,9 +1,5 @@  #include "chimera_ortho_plus.h" -void uart_init(void) { -	SERIAL_UART_INIT(); -} -  void led_init(void) {      setPinOutput(D1);      setPinOutput(F4); @@ -18,6 +14,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();  } diff --git a/keyboards/chimera_ortho_plus/config.h b/keyboards/chimera_ortho_plus/config.h index e060e196aa..4b12796e95 100644 --- a/keyboards/chimera_ortho_plus/config.h +++ b/keyboards/chimera_ortho_plus/config.h @@ -59,17 +59,9 @@ 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); diff --git a/keyboards/chimera_ortho_plus/matrix.c b/keyboards/chimera_ortho_plus/matrix.c index ed6eac2b09..2bdc97991c 100644 --- a/keyboards/chimera_ortho_plus/matrix.c +++ b/keyboards/chimera_ortho_plus/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_plus/rules.mk b/keyboards/chimera_ortho_plus/rules.mk index 2dd6c3e1f0..fec1bef730 100644 --- a/keyboards/chimera_ortho_plus/rules.mk +++ b/keyboards/chimera_ortho_plus/rules.mk @@ -33,4 +33,4 @@ UNICODE_ENABLE = yes  CUSTOM_MATRIX = yes  # project specific files -SRC = matrix.c +SRC += matrix.c serial_uart.c diff --git a/keyboards/comet46/comet46.c b/keyboards/comet46/comet46.c index 0710b8e330..7c7edba93e 100644 --- a/keyboards/comet46/comet46.c +++ b/keyboards/comet46/comet46.c @@ -1,22 +1 @@  #include "comet46.h" - -void uart_init(void) { -	SERIAL_UART_INIT(); -} - -void matrix_init_kb(void) { -	// put your keyboard start-up code here -	// runs once when the firmware starts up -	matrix_init_user(); -	uart_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/comet46/config.h b/keyboards/comet46/config.h index d50224eb60..5ae026f923 100644 --- a/keyboards/comet46/config.h +++ b/keyboards/comet46/config.h @@ -66,19 +66,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/comet46/matrix.c b/keyboards/comet46/matrix.c index dc38ba74f8..eb2f18473e 100644 --- a/keyboards/comet46/matrix.c +++ b/keyboards/comet46/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/comet46/rules.mk b/keyboards/comet46/rules.mk index 2aaa5483c8..1f22b7535e 100644 --- a/keyboards/comet46/rules.mk +++ b/keyboards/comet46/rules.mk @@ -28,8 +28,8 @@ 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  # project specific files  SRC += matrix.c \         i2c.c \ -       ssd1306.c +       ssd1306.c \ +       serial_uart.c diff --git a/keyboards/dichotomy/config.h b/keyboards/dichotomy/config.h index 05210198c8..0cdaf776b4 100644 --- a/keyboards/dichotomy/config.h +++ b/keyboards/dichotomy/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/dichotomy/dichotomy.c b/keyboards/dichotomy/dichotomy.c index b94030a376..967d7e603c 100755 --- a/keyboards/dichotomy/dichotomy.c +++ b/keyboards/dichotomy/dichotomy.c @@ -1,12 +1,7 @@  #include "dichotomy.h" -void uart_init(void) { -	SERIAL_UART_INIT(); -} -  void pointing_device_task(void){  	/*report_mouse_t currentReport = {}; -    SERIAL_UART_INIT();      uint32_t timeout = 0;      //the m character requests the RF slave to send the mouse report @@ -77,16 +72,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/dichotomy/matrix.c b/keyboards/dichotomy/matrix.c index d93889e6ad..2400753cc1 100755 --- a/keyboards/dichotomy/matrix.c +++ b/keyboards/dichotomy/matrix.c @@ -29,6 +29,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.  #include "dichotomy.h"  #include "pointing_device.h"  #include "report.h" +#include "protocol/serial.h"  #if (MATRIX_COLS <= 8)  #    define print_matrix_header()  print("\nr/c 01234567\n") @@ -93,11 +94,11 @@ uint8_t matrix_cols(void) {  void matrix_init(void) {      matrix_init_quantum(); +    serial_init();  }  uint8_t matrix_scan(void)  { -    SERIAL_UART_INIT();      //xprintf("\r\nTRYING TO SCAN");      uint32_t timeout = 0; diff --git a/keyboards/dichotomy/rules.mk b/keyboards/dichotomy/rules.mk index 14dc474359..d6f98125ee 100755 --- a/keyboards/dichotomy/rules.mk +++ b/keyboards/dichotomy/rules.mk @@ -29,14 +29,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 += -DDICHOTOMY_PROMICRO -DICHOTOMY_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 - -#upload: build -#	$(DICHOTOMY_UPLOAD_COMMAND) +SRC += matrix.c serial_uart.c diff --git a/keyboards/hhkb/ansi/config.h b/keyboards/hhkb/ansi/config.h index 5e4fece17d..78fe0c47ae 100644 --- a/keyboards/hhkb/ansi/config.h +++ b/keyboards/hhkb/ansi/config.h @@ -52,27 +52,20 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.  #define SUART_IN_PIN    PIND  #define SUART_IN_BIT    1 -#ifdef __AVR_ATmega32U4__ -    #define SERIAL_UART_BAUD        115200 -    #define SERIAL_UART_DATA        UDR1 -    #define SERIAL_UART_UBRR        ((F_CPU/(16.0*SERIAL_UART_BAUD)-1+0.5)) -    #define SERIAL_UART_RXD_VECT    USART1_RX_vect -    #define SERIAL_UART_TXD_READY   (UCSR1A&(1<<UDRE1)) -    #define SERIAL_UART_INIT()      do { \ -        UBRR1L = (uint8_t) SERIAL_UART_UBRR;       /* baud rate */ \ -        UBRR1H = ((uint16_t)SERIAL_UART_UBRR>>8);  /* baud rate */ \ -        UCSR1B |= (1<<RXCIE1) | (1<<RXEN1); /* RX interrupt, RX: enable */ \ -        UCSR1B |= (0<<TXCIE1) | (1<<TXEN1); /* TX interrupt, TX: enable */ \ -        UCSR1C |= (0<<UPM11) | (0<<UPM10);  /* parity: none(00), even(01), odd(11) */ \ -        UCSR1D |= (0<<RTSEN) | (0<<CTSEN);  /* RTS, CTS(no flow control by hardware) */ \ -        DDRD |= (1<<5); PORTD &= ~(1<<5);   /* RTS for flow control by firmware */ \ -        sei(); \ -    } while(0) -    #define SERIAL_UART_RTS_LO()    do { PORTD &= ~(1<<5); } while (0) -    #define SERIAL_UART_RTS_HI()    do { PORTD |=  (1<<5); } while (0) -#else -    #error "USART configuration is needed." -#endif +#define SERIAL_UART_BAUD 115200 +#define SERIAL_UART_INIT_CUSTOM                 \ +    /* RX interrupt, RX: enable */              \ +    UCSR1B |= (1<<RXCIE1) | (1<<RXEN1);         \ +    /* TX interrupt, TX: enable */              \ +    UCSR1B |= (0<<TXCIE1) | (1<<TXEN1);         \ +    /* parity: none(00), even(01), odd(11) */   \ +    UCSR1C |= (0<<UPM11) | (0<<UPM10);          \ +    /* RTS, CTS(no flow control by hardware) */ \ +    UCSR1D |= (0<<RTSEN) | (0<<CTSEN);          \ +    /* RTS for flow control by firmware */      \ +    DDRD |= (1<<5); PORTD &= ~(1<<5); +#define SERIAL_UART_RTS_LO() do { PORTD &= ~(1<<5); } while (0) +#define SERIAL_UART_RTS_HI() do { PORTD |=  (1<<5); } while (0)  /* power control of key switch board */  #define HHKB_POWER_SAVING diff --git a/keyboards/hhkb/jp/config.h b/keyboards/hhkb/jp/config.h index c06c554b2a..22ac6aa623 100644 --- a/keyboards/hhkb/jp/config.h +++ b/keyboards/hhkb/jp/config.h @@ -52,27 +52,20 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.  #define SUART_IN_PIN    PIND  #define SUART_IN_BIT    1 -#ifdef __AVR_ATmega32U4__ -    #define SERIAL_UART_BAUD        115200 -    #define SERIAL_UART_DATA        UDR1 -    #define SERIAL_UART_UBRR        ((F_CPU/(16.0*SERIAL_UART_BAUD)-1+0.5)) -    #define SERIAL_UART_RXD_VECT    USART1_RX_vect -    #define SERIAL_UART_TXD_READY   (UCSR1A&(1<<UDRE1)) -    #define SERIAL_UART_INIT()      do { \ -        UBRR1L = (uint8_t) SERIAL_UART_UBRR;       /* baud rate */ \ -        UBRR1H = ((uint16_t)SERIAL_UART_UBRR>>8);  /* baud rate */ \ -        UCSR1B |= (1<<RXCIE1) | (1<<RXEN1); /* RX interrupt, RX: enable */ \ -        UCSR1B |= (0<<TXCIE1) | (1<<TXEN1); /* TX interrupt, TX: enable */ \ -        UCSR1C |= (0<<UPM11) | (0<<UPM10);  /* parity: none(00), even(01), odd(11) */ \ -        UCSR1D |= (0<<RTSEN) | (0<<CTSEN);  /* RTS, CTS(no flow control by hardware) */ \ -        DDRD |= (1<<5); PORTD &= ~(1<<5);   /* RTS for flow control by firmware */ \ -        sei(); \ -    } while(0) -    #define SERIAL_UART_RTS_LO()    do { PORTD &= ~(1<<5); } while (0) -    #define SERIAL_UART_RTS_HI()    do { PORTD |=  (1<<5); } while (0) -#else -    #error "USART configuration is needed." -#endif +#define SERIAL_UART_BAUD 115200 +#define SERIAL_UART_INIT_CUSTOM                 \ +    /* RX interrupt, RX: enable */              \ +    UCSR1B |= (1<<RXCIE1) | (1<<RXEN1);         \ +    /* TX interrupt, TX: enable */              \ +    UCSR1B |= (0<<TXCIE1) | (1<<TXEN1);         \ +    /* parity: none(00), even(01), odd(11) */   \ +    UCSR1C |= (0<<UPM11) | (0<<UPM10);          \ +    /* RTS, CTS(no flow control by hardware) */ \ +    UCSR1D |= (0<<RTSEN) | (0<<CTSEN);          \ +    /* RTS for flow control by firmware */      \ +    DDRD |= (1<<5); PORTD &= ~(1<<5); +#define SERIAL_UART_RTS_LO() do { PORTD &= ~(1<<5); } while (0) +#define SERIAL_UART_RTS_HI() do { PORTD |=  (1<<5); } while (0)  /* power control of key switch board */  #define HHKB_POWER_SAVING diff --git a/keyboards/honeycomb/config.h b/keyboards/honeycomb/config.h index 4991c8a0ea..725f9490cb 100755 --- a/keyboards/honeycomb/config.h +++ b/keyboards/honeycomb/config.h @@ -48,17 +48,9 @@ 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); diff --git a/keyboards/honeycomb/honeycomb.c b/keyboards/honeycomb/honeycomb.c index add4af1536..1254196d39 100755 --- a/keyboards/honeycomb/honeycomb.c +++ b/keyboards/honeycomb/honeycomb.c @@ -2,13 +2,8 @@  #include "pointing_device.h"  #include "report.h" -void uart_init(void) { -	SERIAL_UART_INIT(); -} -  void pointing_device_task(void){  	/*report_mouse_t currentReport = {}; -    SERIAL_UART_INIT();      uint32_t timeout = 0;      //the m character requests the RF slave to send the mouse report @@ -77,16 +72,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/honeycomb/matrix.c b/keyboards/honeycomb/matrix.c index a06afb6d96..2bed690689 100755 --- a/keyboards/honeycomb/matrix.c +++ b/keyboards/honeycomb/matrix.c @@ -30,6 +30,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.  #include "honeycomb.h"  #include "pointing_device.h"  #include "report.h" +#include "protocol/serial.h"  #if (MATRIX_COLS <= 8)  # define print_matrix_header()  print("\nr/c 01234567\n") @@ -94,12 +95,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/honeycomb/rules.mk b/keyboards/honeycomb/rules.mk index 19852d7ec3..d6f98125ee 100755 --- a/keyboards/honeycomb/rules.mk +++ b/keyboards/honeycomb/rules.mk @@ -30,9 +30,4 @@ UNICODE_ENABLE = YES 		# Unicode  # BLUETOOTH_ENABLE = yes # Enable Bluetooth with the Adafruit EZ-Key HID  # # project specific files -SRC += matrix.c - -USB = /dev/ttyACM0 - -#upload: build -#	$(honeycomb_UPLOAD_COMMAND) +SRC += matrix.c serial_uart.c diff --git a/keyboards/mitosis/config.h b/keyboards/mitosis/config.h index b4499d0d6c..0e089269e8 100644 --- a/keyboards/mitosis/config.h +++ b/keyboards/mitosis/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/mitosis/matrix.c b/keyboards/mitosis/matrix.c index e149b68bd7..717a810678 100644 --- a/keyboards/mitosis/matrix.c +++ b/keyboards/mitosis/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") @@ -79,12 +80,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/mitosis/mitosis.c b/keyboards/mitosis/mitosis.c index 1ca7276e41..50b6d8452f 100644 --- a/keyboards/mitosis/mitosis.c +++ b/keyboards/mitosis/mitosis.c @@ -1,9 +1,5 @@  #include "mitosis.h" -void uart_init(void) { -	SERIAL_UART_INIT(); -} -  void led_init(void) {  	DDRD  |= (1<<1); // Pin to green, set as output  	PORTD |= (1<<1); // Turn it off @@ -15,7 +11,6 @@ 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();  } diff --git a/keyboards/mitosis/rules.mk b/keyboards/mitosis/rules.mk index 466987e8c1..4cb6d8c9b4 100644 --- a/keyboards/mitosis/rules.mk +++ b/keyboards/mitosis/rules.mk @@ -28,14 +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 - -# upload: build -# 	$(MITOSIS_UPLOAD_COMMAND) - -OPT_DEFS += -DMITOSIS_PROMICRO -MITOSIS_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 diff --git a/keyboards/planck/keymaps/thermal_printer/config.h b/keyboards/planck/keymaps/thermal_printer/config.h index 4460cdbbe2..4ae9ced258 100644 --- a/keyboards/planck/keymaps/thermal_printer/config.h +++ b/keyboards/planck/keymaps/thermal_printer/config.h @@ -3,22 +3,7 @@  #include "../../config.h" -#      define SERIAL_UART_BAUD 19200 -#      define SERIAL_UART_DATA UDR1 -#      define SERIAL_UART_UBRR (F_CPU / (16UL * SERIAL_UART_BAUD) - 1) -#      define SERIAL_UART_RXD_VECT USART1_RX_vect -#      define SERIAL_UART_TXD_READY (UCSR1A & _BV(UDRE1)) -#      define SERIAL_UART_INIT() do { \ -            /* baud rate */ \ -            UBRR1L = SERIAL_UART_UBRR; \ -            /* baud rate */ \ -            UBRR1H = SERIAL_UART_UBRR >> 8; \ -            /* enable TX */ \ -            UCSR1B = _BV(TXEN1); \ -            /* 8-bit data */ \ -            UCSR1C = _BV(UCSZ11) | _BV(UCSZ10); \ -            sei(); \ -        } while(0) +#define SERIAL_UART_BAUD 19200  /*   * MIDI options diff --git a/keyboards/redox_w/config.h b/keyboards/redox_w/config.h index 1f40a694da..b480b072f9 100644 --- a/keyboards/redox_w/config.h +++ b/keyboards/redox_w/config.h @@ -58,17 +58,9 @@  //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); diff --git a/keyboards/redox_w/matrix.c b/keyboards/redox_w/matrix.c index 31233af101..15ca66e34d 100644 --- a/keyboards/redox_w/matrix.c +++ b/keyboards/redox_w/matrix.c @@ -24,6 +24,7 @@  #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") @@ -86,12 +87,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/redox_w/redox_w.c b/keyboards/redox_w/redox_w.c index 75df91066c..05fa339571 100644 --- a/keyboards/redox_w/redox_w.c +++ b/keyboards/redox_w/redox_w.c @@ -1,9 +1,5 @@  #include "redox_w.h" -void uart_init(void) { -	SERIAL_UART_INIT(); -} -  void led_init(void) {  	DDRD  |= (1<<1);  	PORTD |= (1<<1); @@ -16,20 +12,9 @@ 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) { - -} -  #ifdef ONEHAND_ENABLE  __attribute__ ((weak))  const keypos_t hand_swap_config[MATRIX_ROWS][MATRIX_COLS] = { diff --git a/keyboards/redox_w/rules.mk b/keyboards/redox_w/rules.mk index 8b171f717b..01d5c3c70c 100644 --- a/keyboards/redox_w/rules.mk +++ b/keyboards/redox_w/rules.mk @@ -28,14 +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 += -DREDOX_W_PROMICRO -INTERPHASE_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 - -# upload: build -# 	$(REDOX_W_UPLOAD_COMMAND) +SRC += matrix.c serial_uart.c diff --git a/keyboards/sirius/uni660/rev1/config.h b/keyboards/sirius/uni660/rev1/config.h index 98269d4261..91d7c5d7a3 100644 --- a/keyboards/sirius/uni660/rev1/config.h +++ b/keyboards/sirius/uni660/rev1/config.h @@ -59,19 +59,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 */ \ +#define SERIAL_UART_INIT_CUSTOM       \ +    /* enable TX and RX */            \      UCSR1B = _BV(TXEN1) | _BV(RXEN1); \ -    /* 8-bit data */ \ -    UCSR1C = _BV(UCSZ11) | _BV(UCSZ10); \ -} while (0) +    /* 8-bit data */                  \ +    UCSR1C = _BV(UCSZ11) | _BV(UCSZ10);  #define DYNAMIC_KEYMAP_LAYER_COUNT 4 diff --git a/keyboards/sirius/uni660/rev1/matrix.c b/keyboards/sirius/uni660/rev1/matrix.c index 3e231b33bc..355fa7e5e9 100644 --- a/keyboards/sirius/uni660/rev1/matrix.c +++ b/keyboards/sirius/uni660/rev1/matrix.c @@ -27,6 +27,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.  #include "matrix.h"  #include "timer.h"  #include "debounce.h" +#include "protocol/serial.h"  #if (MATRIX_COLS <= 8)  #    define print_matrix_header()  print("\nr/c 01234567\n") @@ -80,14 +81,13 @@ uint8_t matrix_cols(void) {  void matrix_init(void) {      debounce_init(MATRIX_ROWS);      matrix_init_quantum(); +    serial_init();  }  uint8_t matrix_scan(void)  {      bool matrix_has_changed = false; -    SERIAL_UART_INIT(); -      uint32_t timeout = 0;      //the s character requests the RF slave to send the matrix diff --git a/keyboards/sirius/uni660/rev1/rev1.c b/keyboards/sirius/uni660/rev1/rev1.c index 872004355e..d4adac24b5 100644 --- a/keyboards/sirius/uni660/rev1/rev1.c +++ b/keyboards/sirius/uni660/rev1/rev1.c @@ -1,9 +1,5 @@  #include "rev1.h" -void uart_init(void) { -    SERIAL_UART_INIT(); -} -  void led_init(void) {      setPinOutput(D1); // Pin to green, set as output      writePinHigh(D1); // Turn it off @@ -17,7 +13,6 @@ 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();  } diff --git a/keyboards/sirius/uni660/rev2/ansi/config.h b/keyboards/sirius/uni660/rev2/ansi/config.h index 7bca743633..13e33ebf11 100644 --- a/keyboards/sirius/uni660/rev2/ansi/config.h +++ b/keyboards/sirius/uni660/rev2/ansi/config.h @@ -59,19 +59,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 */ \ +#define SERIAL_UART_INIT_CUSTOM       \ +    /* enable TX and RX */            \      UCSR1B = _BV(TXEN1) | _BV(RXEN1); \ -    /* 8-bit data */ \ -    UCSR1C = _BV(UCSZ11) | _BV(UCSZ10); \ -} while (0) +    /* 8-bit data */                  \ +    UCSR1C = _BV(UCSZ11) | _BV(UCSZ10);  #define DYNAMIC_KEYMAP_LAYER_COUNT 4 diff --git a/keyboards/sirius/uni660/rev2/iso/config.h b/keyboards/sirius/uni660/rev2/iso/config.h index 0cbbe0c5ba..3283f0cd67 100644 --- a/keyboards/sirius/uni660/rev2/iso/config.h +++ b/keyboards/sirius/uni660/rev2/iso/config.h @@ -59,19 +59,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 */ \ +#define SERIAL_UART_INIT_CUSTOM       \ +    /* enable TX and RX */            \      UCSR1B = _BV(TXEN1) | _BV(RXEN1); \ -    /* 8-bit data */ \ -    UCSR1C = _BV(UCSZ11) | _BV(UCSZ10); \ -} while (0) +    /* 8-bit data */                  \ +    UCSR1C = _BV(UCSZ11) | _BV(UCSZ10);  #define DYNAMIC_KEYMAP_LAYER_COUNT 4 diff --git a/keyboards/sirius/uni660/rev2/matrix.c b/keyboards/sirius/uni660/rev2/matrix.c index 3e231b33bc..355fa7e5e9 100644 --- a/keyboards/sirius/uni660/rev2/matrix.c +++ b/keyboards/sirius/uni660/rev2/matrix.c @@ -27,6 +27,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.  #include "matrix.h"  #include "timer.h"  #include "debounce.h" +#include "protocol/serial.h"  #if (MATRIX_COLS <= 8)  #    define print_matrix_header()  print("\nr/c 01234567\n") @@ -80,14 +81,13 @@ uint8_t matrix_cols(void) {  void matrix_init(void) {      debounce_init(MATRIX_ROWS);      matrix_init_quantum(); +    serial_init();  }  uint8_t matrix_scan(void)  {      bool matrix_has_changed = false; -    SERIAL_UART_INIT(); -      uint32_t timeout = 0;      //the s character requests the RF slave to send the matrix diff --git a/keyboards/sirius/uni660/rev2/rev2.c b/keyboards/sirius/uni660/rev2/rev2.c index e19240ccc3..048495b992 100644 --- a/keyboards/sirius/uni660/rev2/rev2.c +++ b/keyboards/sirius/uni660/rev2/rev2.c @@ -1,9 +1,5 @@  #include "rev2.h" -void uart_init(void) { -    SERIAL_UART_INIT(); -} -  void led_init(void) {      setPinOutput(D1); // Pin to green, set as output      writePinHigh(D1); // Turn it off @@ -17,7 +13,6 @@ 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();  } diff --git a/keyboards/telophase/config.h b/keyboards/telophase/config.h index e9329c5736..c67dd939bf 100644 --- a/keyboards/telophase/config.h +++ b/keyboards/telophase/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/telophase/matrix.c b/keyboards/telophase/matrix.c index c332eba556..8edfce62d2 100644 --- a/keyboards/telophase/matrix.c +++ b/keyboards/telophase/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") @@ -88,12 +89,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/telophase/rules.mk b/keyboards/telophase/rules.mk index f2ac0adb6c..65cac9364b 100644 --- a/keyboards/telophase/rules.mk +++ b/keyboards/telophase/rules.mk @@ -27,20 +27,13 @@ NKRO_ENABLE = yes		# USB Nkey Rollover - not yet supported in LUFA  # MIDI_ENABLE = YES 		# MIDI controls  UNICODE_ENABLE = YES 		# Unicode  # BLUETOOTH_ENABLE = yes # Enable Bluetooth with the Adafruit EZ-Key HID -LAYOUTS = ortho_4x12 -USB = /dev/ttyACM0 - -# upload: build -# 	$(MITOSIS_UPLOAD_COMMAND) - -OPT_DEFS += -DMITOSIS_PROMICRO -MITOSIS_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  # Disable unsupported hardware  RGBLIGHT_SUPPORTED = no  AUDIO_SUPPORTED = no  BACKLIGHT_SUPPORTED = no + +LAYOUTS = ortho_4x12 diff --git a/keyboards/telophase/telophase.c b/keyboards/telophase/telophase.c index c77a43389f..0e04debeb8 100644 --- a/keyboards/telophase/telophase.c +++ b/keyboards/telophase/telophase.c @@ -1,9 +1,5 @@  #include "telophase.h" -void uart_init(void) { -	SERIAL_UART_INIT(); -} -  void led_init(void) {  	DDRD  |= (1<<1);  	PORTD |= (1<<1); @@ -16,20 +12,9 @@ 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) { - -} -  #ifdef SWAP_HANDS_ENABLE  __attribute__ ((weak))  const keypos_t hand_swap_config[MATRIX_ROWS][MATRIX_COLS] = { diff --git a/quantum/config_common.h b/quantum/config_common.h index df3a6c5c54..bfaf7389e2 100644 --- a/quantum/config_common.h +++ b/quantum/config_common.h @@ -367,51 +367,6 @@  #    endif  #endif -/* USART configuration */ -#ifdef BLUETOOTH_ENABLE -#    ifdef __AVR_ATmega32U4__ -#        define SERIAL_UART_BAUD 9600 -#        define SERIAL_UART_DATA UDR1 -#        define SERIAL_UART_UBRR (F_CPU / (16UL * SERIAL_UART_BAUD) - 1) -#        define SERIAL_UART_RXD_VECT USART1_RX_vect -#        define SERIAL_UART_TXD_READY (UCSR1A & _BV(UDRE1)) -#        define SERIAL_UART_INIT()                  \ -            do {                                    \ -                /* baud rate */                     \ -                UBRR1L = SERIAL_UART_UBRR;          \ -                /* baud rate */                     \ -                UBRR1H = SERIAL_UART_UBRR >> 8;     \ -                /* enable TX */                     \ -                UCSR1B = _BV(TXEN1);                \ -                /* 8-bit data */                    \ -                UCSR1C = _BV(UCSZ11) | _BV(UCSZ10); \ -                sei();                              \ -            } while (0) -#    elif defined(__AVR_AT90USB646__) || defined(__AVR_AT90USB647__) || defined(__AVR_AT90USB1286__) || defined(__AVR_AT90USB1287__) -#        define SERIAL_UART_BAUD 115200 -#        define SERIAL_UART_DATA UDR1 -/* UBRR should result in ~16 and set UCSR1A = _BV(U2X1) as per rn42 documentation. HC05 needs baudrate configured accordingly */ -#        define SERIAL_UART_UBRR (F_CPU / (8UL * SERIAL_UART_BAUD) - 1) -#        define SERIAL_UART_RXD_VECT USART1_RX_vect -#        define SERIAL_UART_TXD_READY (UCSR1A & _BV(UDRE1)) -#        define SERIAL_UART_INIT()                  \ -            do {                                    \ -                UCSR1A = _BV(U2X1);                 \ -                /* baud rate */                     \ -                UBRR1L = SERIAL_UART_UBRR;          \ -                /* baud rate */                     \ -                UBRR1H = SERIAL_UART_UBRR >> 8;     \ -                /* enable TX */                     \ -                UCSR1B = _BV(TXEN1);                \ -                /* 8-bit data */                    \ -                UCSR1C = _BV(UCSZ11) | _BV(UCSZ10); \ -                sei();                              \ -            } while (0) -#    else -#        error "USART configuration is needed." -#    endif -#endif -  #define API_SYSEX_MAX_SIZE 32  #include "song_list.h" diff --git a/tmk_core/protocol/serial.h b/tmk_core/protocol/serial.h index b70d117d7c..0204b84a92 100644 --- a/tmk_core/protocol/serial.h +++ b/tmk_core/protocol/serial.h @@ -37,6 +37,8 @@ POSSIBILITY OF SUCH DAMAGE.  #pragma once +#define SERIAL_UART_DATA UDR1 +  /* host role */  void    serial_init(void);  uint8_t serial_recv(void); diff --git a/tmk_core/protocol/serial_uart.c b/tmk_core/protocol/serial_uart.c index a15124193a..4fe059e7d9 100644 --- a/tmk_core/protocol/serial_uart.c +++ b/tmk_core/protocol/serial_uart.c @@ -40,6 +40,22 @@ POSSIBILITY OF SUCH DAMAGE.  #include <avr/interrupt.h>  #include "serial.h" +#ifndef SERIAL_UART_BAUD +#    define SERIAL_UART_BAUD 9600 +#endif + +#define SERIAL_UART_UBRR (F_CPU / (16UL * SERIAL_UART_BAUD) - 1) +#define SERIAL_UART_TXD_READY (UCSR1A & _BV(UDRE1)) +#define SERIAL_UART_RXD_VECT USART1_RX_vect + +#ifndef SERIAL_UART_INIT_CUSTOM +#    define SERIAL_UART_INIT_CUSTOM \ +    /* enable TX */                 \ +    UCSR1B = _BV(TXEN1);            \ +    /* 8-bit data */                \ +    UCSR1C = _BV(UCSZ11) | _BV(UCSZ10); +#endif +  #if defined(SERIAL_UART_RTS_LO) && defined(SERIAL_UART_RTS_HI)  // Buffer state  //   Empty:           RBUF_SPACE == RBUF_SIZE(head==tail) @@ -61,7 +77,14 @@ POSSIBILITY OF SUCH DAMAGE.  #    define rbuf_check_rts_hi()  #endif -void serial_init(void) { SERIAL_UART_INIT(); } +void serial_init(void) { +    do { +        // Set baud rate +        UBRR1L = SERIAL_UART_UBRR; +        UBRR1L = SERIAL_UART_UBRR >> 8; +        SERIAL_UART_INIT_CUSTOM; +    } while (0); +}  // RX ring buffer  #define RBUF_SIZE 256 | 
