From 8a11c9fe57d033b5d9450736c1387cbd8bf39229 Mon Sep 17 00:00:00 2001 From: Alisue Date: Sun, 1 May 2022 18:33:10 +0900 Subject: [PATCH] Follow the origin changes https://github.com/qmk/qmk_firmware/pull/14839 --- .../keyboard_quantizer/keyboard_quantizer.c | 2 +- .../keymaps/bootloader/keymap.c | 2 +- .../keymaps/default/keymap.c | 2 +- .../keyboard_quantizer/keymaps/fixed/keymap.c | 2 +- keyboards/keyboard_quantizer/rev3/rev3.c | 28 +++++++++---------- keyboards/keyboard_quantizer/rules.mk | 3 +- .../squishytkl/keymaps/jis/keymap.c | 2 +- 7 files changed, 21 insertions(+), 20 deletions(-) diff --git a/keyboards/keyboard_quantizer/keyboard_quantizer.c b/keyboards/keyboard_quantizer/keyboard_quantizer.c index 74337cc5b748..d2c25f85444a 100644 --- a/keyboards/keyboard_quantizer/keyboard_quantizer.c +++ b/keyboards/keyboard_quantizer/keyboard_quantizer.c @@ -290,7 +290,7 @@ bool process_packet(matrix_row_t current_matrix[]) { // process all available packet while (uart_available()) { while (uart_available()) { - uint8_t c = uart_getchar(); + uint8_t c = uart_read(); // process SLIP if (c == SLIP_END) { diff --git a/keyboards/keyboard_quantizer/keymaps/bootloader/keymap.c b/keyboards/keyboard_quantizer/keymaps/bootloader/keymap.c index c6745a7ef709..57a18870df7a 100644 --- a/keyboards/keyboard_quantizer/keymaps/bootloader/keymap.c +++ b/keyboards/keyboard_quantizer/keymaps/bootloader/keymap.c @@ -36,7 +36,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { /* Base */ [_BASE] = LAYOUT( KC_ESC, 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_PSCR, KC_SCROLLLOCK, KC_PAUS, - JP_ZHTG, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, JP_MINS, JP_CIRC, JP_YEN, KC_BSPACE, KC_INSERT, KC_HOME, KC_PGUP, KC_NUMLOCK, KC_KP_SLASH, KC_KP_ASTERISK, KC_KP_MINUS, + JP_ZKHK, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, JP_MINS, JP_CIRC, JP_YEN, KC_BSPACE, KC_INSERT, KC_HOME, KC_PGUP, KC_NUMLOCK, KC_KP_SLASH, KC_KP_ASTERISK, KC_KP_MINUS, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, JP_AT, JP_LBRC, KC_ENT, KC_DEL, KC_END, KC_PGDN, KC_KP_7, KC_KP_8, KC_KP_9, KC_KP_PLUS, KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, JP_SCLN, JP_COLN, JP_RBRC, KC_KP_4, KC_KP_5, KC_KP_6, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, JP_SLSH, JP_BSLS, KC_RSFT, KC_UP, KC_KP_1, KC_KP_2, KC_KP_3, KC_KP_ENTER, diff --git a/keyboards/keyboard_quantizer/keymaps/default/keymap.c b/keyboards/keyboard_quantizer/keymaps/default/keymap.c index 9baa11f6d721..e2e650b57ae0 100644 --- a/keyboards/keyboard_quantizer/keymaps/default/keymap.c +++ b/keyboards/keyboard_quantizer/keymaps/default/keymap.c @@ -36,7 +36,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { /* Base */ [_BASE] = LAYOUT( KC_ESC, 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_PSCR, KC_SCROLLLOCK, KC_PAUS, - JP_ZHTG, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, JP_MINS, JP_CIRC, JP_YEN, KC_BSPACE, KC_INSERT, KC_HOME, KC_PGUP, KC_NUMLOCK, KC_KP_SLASH, KC_KP_ASTERISK, KC_KP_MINUS, + JP_ZKHK, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, JP_MINS, JP_CIRC, JP_YEN, KC_BSPACE, KC_INSERT, KC_HOME, KC_PGUP, KC_NUMLOCK, KC_KP_SLASH, KC_KP_ASTERISK, KC_KP_MINUS, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, JP_AT, JP_LBRC, KC_ENT, KC_DEL, KC_END, KC_PGDN, KC_KP_7, KC_KP_8, KC_KP_9, KC_KP_PLUS, KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, JP_SCLN, JP_COLN, JP_RBRC, KC_KP_4, KC_KP_5, KC_KP_6, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, JP_SLSH, JP_BSLS, KC_RSFT, KC_UP, KC_KP_1, KC_KP_2, KC_KP_3, KC_KP_ENTER, diff --git a/keyboards/keyboard_quantizer/keymaps/fixed/keymap.c b/keyboards/keyboard_quantizer/keymaps/fixed/keymap.c index 9baa11f6d721..e2e650b57ae0 100644 --- a/keyboards/keyboard_quantizer/keymaps/fixed/keymap.c +++ b/keyboards/keyboard_quantizer/keymaps/fixed/keymap.c @@ -36,7 +36,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { /* Base */ [_BASE] = LAYOUT( KC_ESC, 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_PSCR, KC_SCROLLLOCK, KC_PAUS, - JP_ZHTG, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, JP_MINS, JP_CIRC, JP_YEN, KC_BSPACE, KC_INSERT, KC_HOME, KC_PGUP, KC_NUMLOCK, KC_KP_SLASH, KC_KP_ASTERISK, KC_KP_MINUS, + JP_ZKHK, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, JP_MINS, JP_CIRC, JP_YEN, KC_BSPACE, KC_INSERT, KC_HOME, KC_PGUP, KC_NUMLOCK, KC_KP_SLASH, KC_KP_ASTERISK, KC_KP_MINUS, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, JP_AT, JP_LBRC, KC_ENT, KC_DEL, KC_END, KC_PGDN, KC_KP_7, KC_KP_8, KC_KP_9, KC_KP_PLUS, KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, JP_SCLN, JP_COLN, JP_RBRC, KC_KP_4, KC_KP_5, KC_KP_6, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, JP_SLSH, JP_BSLS, KC_RSFT, KC_UP, KC_KP_1, KC_KP_2, KC_KP_3, KC_KP_ENTER, diff --git a/keyboards/keyboard_quantizer/rev3/rev3.c b/keyboards/keyboard_quantizer/rev3/rev3.c index cfeaa9b7b84e..7a5b29fa6301 100644 --- a/keyboards/keyboard_quantizer/rev3/rev3.c +++ b/keyboards/keyboard_quantizer/rev3/rev3.c @@ -60,11 +60,11 @@ void send_reset_cmd(void) { hid_info_cnt = 0; device_cnt = 0; - uart_putchar('\n'); + uart_write('\n'); _delay_ms(10); - uart_putchar('k'); - uart_putchar('r'); - uart_putchar('\n'); + uart_write('k'); + uart_write('r'); + uart_write('\n'); } #ifdef CH559_BOOTLOADER_ENABLE @@ -73,11 +73,11 @@ static void send_bootloader_cmd(void) { hid_info_cnt = 0; device_cnt = 0; - uart_putchar('\n'); + uart_write('\n'); _delay_ms(100); - uart_putchar('k'); - uart_putchar('b'); - uart_putchar('\n'); + uart_write('k'); + uart_write('b'); + uart_write('\n'); } #endif @@ -109,11 +109,11 @@ __attribute__((weak)) uint8_t update_indicator_led(void) { static void blink_indicator_led(uint8_t led) { - uart_putchar('\n'); + uart_write('\n'); _delay_us(50); - uart_putchar(0x80 | (led & 0x07)); + uart_write(0x80 | (led & 0x07)); _delay_us(50); - uart_putchar('\n'); + uart_write('\n'); } #endif @@ -170,13 +170,13 @@ void virtser_recv(const uint8_t ch) { uart_init(57600); // send dummy byte - uart_putchar(0); + uart_write(0); } #endif if (ch559_update_mode) { // pass through received virtser data to uart - uart_putchar(ch); + uart_write(ch); } else { // process received data for simple console process_char(ch); @@ -187,7 +187,7 @@ void matrix_scan_kb() { if (ch559_update_mode) { // pass through received uart data to virtser while (uart_available()) { - virtser_send(uart_getchar()); + virtser_send(uart_read()); } } else { #ifdef QUANTIZER_INDICATOR_ENABLE diff --git a/keyboards/keyboard_quantizer/rules.mk b/keyboards/keyboard_quantizer/rules.mk index ed151595e6a3..19948cc1a58c 100644 --- a/keyboards/keyboard_quantizer/rules.mk +++ b/keyboards/keyboard_quantizer/rules.mk @@ -7,11 +7,12 @@ BOOTLOADER = caterina # Build Options # change yes to no to disable # -BOOTMAGIC_ENABLE = lite # Virtual DIP switch configuration +BOOTMAGIC_ENABLE = yes # Virtual DIP switch configuration MOUSEKEY_ENABLE = yes # Mouse keys EXTRAKEY_ENABLE = yes # Audio control and System control CONSOLE_ENABLE = yes # Console for debug POINTING_DEVICE_ENABLE = yes +POINTING_DEVICE_DRIVER = custom OLED_DRIVER_ENABLE = no COMMAND_ENABLE = no # Commands for debug and configuration # Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE diff --git a/keyboards/ramonimbao/squishytkl/keymaps/jis/keymap.c b/keyboards/ramonimbao/squishytkl/keymaps/jis/keymap.c index d8debc9cc04a..0ced7149b15b 100644 --- a/keyboards/ramonimbao/squishytkl/keymaps/jis/keymap.c +++ b/keyboards/ramonimbao/squishytkl/keymaps/jis/keymap.c @@ -20,7 +20,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [0] = LAYOUT_jis( KC_ESC, 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_MUTE, KC_PSCR, KC_SLCK, KC_PAUS, - JP_ZHTG, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, JP_MINS, JP_CIRC, JP_YEN, KC_BSPC, KC_INS, KC_HOME, KC_PGUP, + JP_ZKHK, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, JP_MINS, JP_CIRC, JP_YEN, KC_BSPC, KC_INS, KC_HOME, KC_PGUP, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, JP_AT, JP_LBRC, KC_DEL, KC_END, KC_PGDN, KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, JP_SCLN, JP_COLN, JP_RBRC, KC_ENT, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, JP_COMM, JP_DOT, JP_SLSH, JP_BSLS, KC_RSFT, KC_UP,