remove some outdated changes

* Migrate some tmk_core files to quantum

* Fix build errors

.github/workflows/format.yaml

@@ -28,10 +28,16 @@ jobs:
         bin/qmk pyformat
         bin/qmk fileformat
 
-    - name: Commit files
-      uses: stefanzweifel/git-auto-commit-action@v4
+    - name: Become QMK Bot
+      run: |
+        git config user.name 'QMK Bot'
+        git config user.email 'hello@qmk.fm'
+
+    - name: Create Pull Request
+      uses: peter-evans/create-pull-request@v3
       with:
-        commit_message: Format code according to conventions for $GITHUB_SHA
-        commit_user_name: QMK Bot
-        commit_user_email: hello@qmk.fm
-        commit_author: QMK Bot <hello@qmk.fm>
+        delete-branch: true
+        author: QMK Bot <hello@qmk.fm>
+        committer: QMK Bot <hello@qmk.fm>
+        commit-message: Format code according to conventions
+        title: '[CI] Format code according to conventions'

common_features.mk

@@ -17,10 +17,16 @@ SERIAL_PATH := $(QUANTUM_PATH)/serial_link
 
 QUANTUM_SRC += \
     $(QUANTUM_DIR)/quantum.c \
+    $(QUANTUM_DIR)/bitwise.c \
     $(QUANTUM_DIR)/led.c \
     $(QUANTUM_DIR)/keymap_common.c \
     $(QUANTUM_DIR)/keycode_config.c
 
+KEYBOARD_ENABLE ?= yes
+ifeq ($(strip $(KEYBOARD_ENABLE)), yes)
+    OPT_DEFS += -DKEYBOARD_ENABLE
+endif
+
 ifeq ($(strip $(DEBUG_MATRIX_SCAN_RATE_ENABLE)), yes)
     OPT_DEFS += -DDEBUG_MATRIX_SCAN_RATE
     CONSOLE_ENABLE = yes
@@ -36,6 +42,11 @@ ifeq ($(strip $(API_SYSEX_ENABLE)), yes)
     SRC += $(QUANTUM_DIR)/api.c
 endif
 
+ifeq ($(strip $(COMMAND_ENABLE)), yes)
+    SRC += $(QUANTUM_DIR)/command.c
+    OPT_DEFS += -DCOMMAND_ENABLE
+endif
+
 ifeq ($(strip $(AUDIO_ENABLE)), yes)
     OPT_DEFS += -DAUDIO_ENABLE
     MUSIC_ENABLE = yes
@@ -594,3 +605,8 @@ endif
 ifeq ($(strip $(JOYSTICK_ENABLE)), digital)
     OPT_DEFS += -DDIGITAL_JOYSTICK_ENABLE
 endif
+
+ifeq ($(strip $(SWITCH_CONTROLLER_ENABLE)), yes)
+    OPT_DEFS += -DSWITCH_CONTROLLER_ENABLE
+    OPT_DEFS += -DGAMEPAD_ENABLE
+endif

docs/isp_flashing_guide.md

@@ -45,6 +45,7 @@ You'll need one of the following to actually perform the ISP flashing (followed
 
 * [SparkFun PocketAVR](https://www.sparkfun.com/products/9825) - (USB Tiny)
 * [USBtinyISP AVR Programmer Kit](https://www.adafruit.com/product/46) - (USB Tiny)
+* [USBasp](https://www.fischl.de/usbasp/) - (usbasp)
 * [Teensy 2.0](https://www.pjrc.com/store/teensy.html) - (avrisp)
 * [Pro Micro](https://www.sparkfun.com/products/12640)  - (avrisp)
 * [Bus Pirate](https://www.adafruit.com/product/237) - (buspirate)
@@ -82,6 +83,15 @@ This is pretty straight-forward - we'll be connecting like-things to like-things
     PocketAVR VCC  <-> Keyboard VCC
     PocketAVR GND  <-> Keyboard GND
 
+### USBasp
+
+    USBasp RST  <-> Keyboard RESET
+    USBasp SCLK <-> Keyboard B1 (SCLK)
+    USBasp MOSI <-> Keyboard B2 (MOSI)
+    USBasp MISO <-> Keyboard B3 (MISO)
+    USBasp VCC  <-> Keyboard VCC
+    USBasp GND  <-> Keyboard GND
+
 ### Teensy 2.0
 
     Teensy B0  <-> Keyboard RESET

docs/spi_driver.md

@@ -8,7 +8,7 @@ No special setup is required - just connect the `SS`, `SCK`, `MOSI` and `MISO` p
 
 |MCU            |`SS`|`SCK`|`MOSI`|`MISO`|
 |---------------|----|-----|------|------|
-|ATMega16/32U2/4|`B0`|`B1` |`B2`  |`B3`  |
+|ATmega16/32U2/4|`B0`|`B1` |`B2`  |`B3`  |
 |AT90USB64/128  |`B0`|`B1` |`B2`  |`B3`  |
 |ATmega32A      |`B4`|`B7` |`B5`  |`B6`  |
 |ATmega328/P    |`B2`|`B5` |`B3`  |`B4`  |
@@ -20,22 +20,34 @@ You may use more than one slave select pin, not just the `SS` pin. This is usefu
 
 You'll need to determine which pins can be used for SPI -- as an example, STM32 parts generally have multiple SPI peripherals, labeled SPI1, SPI2, SPI3 etc.
 
-To enable SPI, modify your board's `halconf.h` to enable SPI - both `HAL_USE_SPI` and `SPI_USE_WAIT` should be `TRUE`, and `SPI_SELECT_MODE` should be `SPI_SELECT_MODE_PAD`.
-Then, modify your board's `mcuconf.h` to enable the SPI peripheral you've chosen -- in the case of using SPI2, modify `STM32_SPI_USE_SPI2` to be `TRUE`.
+To enable SPI, modify your board's `halconf.h` to enable SPI:
 
-As per the AVR configuration, you may select any other standard GPIO as a slave select pin, and can be supplied to `spi_start()`.
+```c
+#define HAL_USE_SPI TRUE
+#define SPI_USE_WAIT TRUE
+#define SPI_SELECT_MODE SPI_SELECT_MODE_PAD
+```
+
+Then, modify your board's `mcuconf.h` to enable the peripheral you've chosen, for example:
+
+```c
+#undef STM32_SPI_USE_SPI2
+#define STM32_SPI_USE_SPI2 TRUE
+```
 
 Configuration-wise, you'll need to set up the peripheral as per your MCU's datasheet -- the defaults match the pins for a Proton-C, i.e. STM32F303.
 
-`config.h` override         | Description                                                   | Default Value
-----------------------------|---------------------------------------------------------------|--------------
-`#define SPI_DRIVER`        | SPI peripheral to use - SPI1 => `SPID1`, SPI2 => `SPID2` etc. | `SPID2`
-`#define SPI_SCK_PIN`       | The pin to use for the SCK                                    | `B13`
-`#define SPI_SCK_PAL_MODE`  | The alternate function mode for the SCK pin                   | `5`
-`#define SPI_MOSI_PIN`      | The pin to use for the MOSI                                   | `B15`
-`#define SPI_MOSI_PAL_MODE` | The alternate function mode for the MOSI pin                  | `5`
-`#define SPI_MISO_PIN`      | The pin to use for the MISO                                   | `B14`
-`#define SPI_MISO_PAL_MODE` | The alternate function mode for the MISO pin                  | `5`
+|`config.h` Override|Description                                                  |Default|
+|-------------------|-------------------------------------------------------------|-------|
+|`SPI_DRIVER`       |SPI peripheral to use - SPI1 -> `SPID1`, SPI2 -> `SPID2` etc.|`SPID2`|
+|`SPI_SCK_PIN`      |The pin to use for SCK                                       |`B13`  |
+|`SPI_SCK_PAL_MODE` |The alternate function mode for SCK                          |`5`    |
+|`SPI_MOSI_PIN`     |The pin to use for MOSI                                      |`B15`  |
+|`SPI_MOSI_PAL_MODE`|The alternate function mode for MOSI                         |`5`    |
+|`SPI_MISO_PIN`     |The pin to use for MISO                                      |`B14`  |
+|`SPI_MISO_PAL_MODE`|The alternate function mode for MISO                         |`5`    |
+
+As per the AVR configuration, you may choose any other standard GPIO as a slave select pin, which should be supplied to `spi_start()`.
 
 ## Functions
 
@@ -112,7 +124,7 @@ Send multiple bytes to the selected SPI device.
 
 #### Return Value
 
-`SPI_STATUS_TIMEOUT` if the timeout period elapses, `SPI_STATUS_SUCCESS` on success, or `SPI_STATUS_ERROR` otherwise.
+`SPI_STATUS_TIMEOUT` if the timeout period elapses, `SPI_STATUS_ERROR` if some other error occurs, otherwise `SPI_STATUS_SUCCESS`.
 
 ---
 
@@ -129,7 +141,7 @@ Receive multiple bytes from the selected SPI device.
 
 #### Return Value
 
-`SPI_STATUS_TIMEOUT` if the internal transmission timeout period elapses, `SPI_STATUS_SUCCESS` on success, or `SPI_STATUS_ERROR` otherwise.
+`SPI_STATUS_TIMEOUT` if the timeout period elapses, `SPI_STATUS_ERROR` if some other error occurs, otherwise `SPI_STATUS_SUCCESS`.
 
 ---
 

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

keyboards/ai03/orbit/matrix.h

@@ -1,3 +0,0 @@
-#pragma once
-
-#include "common/matrix.h"

keyboards/ai03/orbit/transport.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "common/matrix.h"
+#include "matrix.h"
 
 #define ROWS_PER_HAND (MATRIX_ROWS/2)
 

keyboards/bat43/config.h

@@ -20,8 +20,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include "config_common.h"
 
 /* USB Device descriptor parameter */
-#define VENDOR_ID 0xFEED
-#define PRODUCT_ID 0x1070
+#define VENDOR_ID 0x5946 // YF
+#define PRODUCT_ID 0x0002
 #define DEVICE_VER 0x0001
 #define MANUFACTURER yfuku
 #define PRODUCT bat43

keyboards/bat43/keymaps/via/keymap.c

@@ -0,0 +1,58 @@
+/* Copyright 2020 yfuku
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#include QMK_KEYBOARD_H
+
+// Defines names for use in layer keycodes and the keymap
+enum layer_names {
+    _BASE,
+    _LOWER,
+    _RAISE,
+    _ADJUST
+};
+
+#define L_SPC LT(_LOWER, KC_SPC)
+#define R_ENT LT(_RAISE, KC_ENT)
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [_BASE] = LAYOUT(
+        KC_ESC,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,             KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_MINS,
+        KC_TAB,  KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_BSPC, KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_RSFT,
+        KC_LCTL, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,             KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RCTL,
+                                   KC_LGUI, KC_LANG2,L_SPC,            R_ENT,   KC_LANG1,KC_RALT,
+                                            KC_A,    KC_B,             KC_C,    KC_D,    KC_E
+    ),
+    [_LOWER] = LAYOUT(
+        _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,          XXXXXXX, KC_EQL,  KC_PLUS, KC_ASTR, KC_PERC, _______,
+        _______, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    _______, KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    _______,
+        _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,          XXXXXXX, XXXXXXX, _______, _______, _______, _______,
+                                   _______, _______, _______,          KC_DEL,  _______, _______,
+                                            _______, _______,          _______, _______, _______
+    ),
+    [_RAISE] = LAYOUT(
+        _______, KC_BSLS, KC_EXLM, KC_AMPR, KC_PIPE, XXXXXXX,          XXXXXXX, KC_EQL,  KC_PLUS, KC_ASTR, KC_PERC, _______,
+        _______, KC_HASH, KC_GRV,  KC_DQT,  KC_QUOT, KC_TILD, _______, KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT, KC_DLR,  _______,
+        _______, XXXXXXX, XXXXXXX, KC_LCBR, KC_LBRC, KC_LPRN,          KC_RPRN, KC_RBRC, KC_RCBR, KC_AT,   KC_CIRC, _______,
+                                   _______, _______, KC_BSPC,          _______, _______, _______,
+                                            _______, _______,          _______, _______, _______
+    ),
+    [_ADJUST] = LAYOUT(
+        _______, _______, _______, _______, _______, _______,          _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______,          _______, _______, _______, _______, _______, _______,
+                                   _______, _______, _______,          _______, _______, _______,
+                                            _______, _______,          _______, _______, _______
+    ),
+};

keyboards/bat43/keymaps/via/readme.md

@@ -0,0 +1 @@
+# The default keymap for bat43

keyboards/bat43/keymaps/via/rules.mk

@@ -0,0 +1 @@
+VIA_ENABLE = yes

keyboards/boardsource/the_mark/keymaps/stanrc85/keymap.c

@@ -0,0 +1,100 @@
+/* Copyright 2020 Stanrc85
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#include QMK_KEYBOARD_H
+#include "stanrc85.h"
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+/* Base */
+[_QWERTY] = LAYOUT_all(
+  KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_BSPC, KC_MPLY, 
+  KC_TAB,           KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS, CA_SCLN, 
+  KC_CTLE,          KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,  CA_QUOT, 
+  KC_LSFT, KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,          KC_UP,   
+  KC_LCTL, KC_LGUI, KC_LALT,          LT_SPCF,           LT_SPCF,         LT_SPCF,        TD_TWIN, MO(_FN2_60), KC_GRV,  KC_LEFT, KC_DOWN, KC_RGHT
+),
+[_DEFAULT] = LAYOUT_all(
+  KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_BSPC, KC_MPLY, 
+  KC_TAB,           KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS, CA_SCLN, 
+  KC_CTLE,          KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,  CA_QUOT, 
+  KC_LSFT, KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,          KC_UP,   
+  KC_LCTL, KC_LGUI, KC_LALT,          LT_SPCF,           LT_SPCF,         LT_SPCF,        TD_TWIN, MO(_FN2_60), KC_GRV,  KC_LEFT, KC_DOWN, KC_RGHT
+),
+[_FN1_60] = LAYOUT_all(
+  KC_TILD,    KC_F1,      KC_F2,      KC_F3,      KC_F4,      KC_F5,      KC_F6,      KC_F7,      KC_F8,      KC_F9,      KC_F10,     KC_F11,     KC_F12,     KC_DEL,     KC_DEL,    _______,
+  _______,                _______,    CA_QUOT,    KC_VOLU,    CA_SCLN,    _______,    _______,    KC_HOME,    KC_UP,      KC_END,     KC_PSCR,    _______,    _______,    KC_INS,    _______,
+  KC_CAPS,                _______,    KC_MUTE,    KC_VOLD,    KC_MPLY,    _______,    _______,    KC_LEFT,    KC_DOWN,    KC_RGHT,    _______,    _______,                _______,   _______,
+  _______,    _______,    KC_RDP,     _______,    _______,    _______,    _______,    _______,    KC_WBAK,    KC_WFWD,    _______,    _______,    _______,                _______,
+  _______,    _______,    _______,                _______,                _______,                _______,                _______,    _______,    _______,    _______,    _______,    _______
+),
+[_FN2_60] = LAYOUT_all(
+  RGB_TOG,   RGB_MOD,     RGB_VAD,    RGB_VAI,    RGB_SAI,    RGB_HUD,    RGB_HUI,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,
+  _______,                _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    RESET,      _______,
+  _______,                _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,                KC_MAKE,    _______,
+  _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,                _______,    
+  _______,    _______,    _______,                _______,                _______,                _______,                _______,    _______,    _______,    _______,    _______,    TG(_DEFAULT)
+)
+
+};
+
+
+void rgb_matrix_indicators_user(void) {
+  uint8_t layer = get_highest_layer(layer_state);
+  switch (layer) {
+    case _QWERTY:
+      rgb_matrix_set_color(10, 0, 0, 0); 
+      break;
+    case _FN1_60:
+      rgb_matrix_set_color(10, 0, 0, 255); 
+      break;
+    case _FN2_60:
+      rgb_matrix_set_color(10, 255, 255, 255); 
+      break;
+    case _DEFAULT:
+      rgb_matrix_set_color(10, 0, 255, 0); 
+      break;
+    default:
+      break;
+  }
+  if (host_keyboard_led_state().caps_lock) {
+        rgb_matrix_set_color(10, 255, 0, 0);
+  }
+}
+
+void matrix_init_kb(void){
+
+#ifdef RGB_MATRIX_ENABLE
+
+  g_led_config = (led_config_t){ {
+    // Key Matrix to LED Index
+    { 10    , 10    , 9     , 9     , 8     , 7     , 7     , 6     , 5     , 5     , 4     , 3     , 3     , 2     , 1     , 1      },
+    { NO_LED, 11    , NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, 0     , 1      },
+    { NO_LED, 12    , NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, 23    , 1      },
+    { NO_LED, 13    , 14    , NO_LED, 15    , 16    , NO_LED, 17    , 18    , NO_LED, 19    , 20    , NO_LED, 21    , 22    , NO_LED },
+    { NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED },
+  }, {
+    // LED Index to Physical Position
+    {224, 42}, {224, 21}, {209, 21}, {179, 21}, {164, 21}, {134, 21}, {119, 21}, {89, 21}, {74, 21}, {45, 21}, {30, 21}, {30, 42},
+    {30, 64}, {30, 85}, {45, 85}, {74, 85}, {89, 85}, {119, 85}, {134, 85}, {164, 85}, {179, 85}, {209, 85}, {224, 85}, {224, 64}
+  }, {
+    // LED Index to Flag
+    LED_FLAG_ALL, LED_FLAG_ALL, LED_FLAG_ALL, LED_FLAG_ALL, LED_FLAG_ALL, LED_FLAG_ALL, LED_FLAG_ALL, LED_FLAG_ALL,
+    LED_FLAG_ALL, LED_FLAG_ALL, LED_FLAG_ALL, LED_FLAG_ALL, LED_FLAG_ALL, LED_FLAG_ALL, LED_FLAG_ALL, LED_FLAG_ALL,
+    LED_FLAG_ALL, LED_FLAG_ALL, LED_FLAG_ALL, LED_FLAG_ALL, LED_FLAG_ALL, LED_FLAG_ALL, LED_FLAG_ALL, LED_FLAG_ALL
+  } };
+
+#endif
+  matrix_init_user();
+}

keyboards/boardsource/the_mark/keymaps/stanrc85/rules.mk

@@ -0,0 +1 @@
+VIA_ENABLE = yes

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();
 }
 

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);

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

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

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) {
-
-}

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

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

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

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) {
-
-}

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

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

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
 

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) {
-
-}

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

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

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