mirror of
https://github.com/qmk/qmk_firmware.git
synced 2026-10-24 09:51:54 +02:00
Merge remote-tracking branch 'origin/develop' into xap
This commit is contained in:
@@ -167,5 +167,5 @@ static void ap2_ble_extra(report_extra_t *report) {
|
||||
static void ap2_ble_keyboard(report_keyboard_t *report) {
|
||||
sdPut(&SD1, 0x0);
|
||||
sdWrite(&SD1, ble_mcu_send_report, sizeof(ble_mcu_send_report));
|
||||
sdWrite(&SD1, &report->raw[0], KEYBOARD_REPORT_SIZE);
|
||||
sdWrite(&SD1, (uint8_t *)report, KEYBOARD_REPORT_SIZE);
|
||||
}
|
||||
|
||||
@@ -86,13 +86,12 @@ void bluetooth_send_keyboard(report_keyboard_t *report)
|
||||
|
||||
send_str(PSTR("AT+BLEKEYBOARDCODE="));
|
||||
|
||||
for (uint8_t i = 0; i < KEYBOARD_EPSIZE; i++)
|
||||
{
|
||||
send_bytes(report->raw[i]);
|
||||
if (i < (KEYBOARD_EPSIZE - 1))
|
||||
{
|
||||
send_str(PSTR("-"));
|
||||
}
|
||||
send_bytes(report->mods);
|
||||
send_str(PSTR("-"));
|
||||
send_bytes(0);
|
||||
for (uint8_t i = 0; i < KEYBOARD_REPORT_KEYS; i++) {
|
||||
send_str(PSTR("-"));
|
||||
send_bytes(report->keys[i]);
|
||||
}
|
||||
|
||||
send_str(PSTR("\r\n"));
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
// SPDX-License-Identifier: GPL-2.0-or-later
|
||||
#pragma once
|
||||
|
||||
#define WS2812_SPI SPID1
|
||||
#define WS2812_SPI_DRIVER SPID1
|
||||
#define WS2812_SPI_MOSI_PAL_MODE 5
|
||||
#define WS2812_SPI_SCK_PIN B13
|
||||
#define WS2812_SPI_SCK_PAL_MODE 5
|
||||
@@ -2,7 +2,7 @@
|
||||
// SPDX-License-Identifier: GPL-2.0-or-later
|
||||
#pragma once
|
||||
|
||||
#define WS2812_SPI SPID2
|
||||
#define WS2812_SPI_DRIVER SPID2
|
||||
#define WS2812_SPI_MOSI_PAL_MODE 5
|
||||
#define WS2812_SPI_SCK_PIN B13
|
||||
#define WS2812_SPI_SCK_PAL_MODE 5
|
||||
@@ -2,7 +2,7 @@
|
||||
// SPDX-License-Identifier: GPL-2.0-or-later
|
||||
#pragma once
|
||||
|
||||
#define WS2812_SPI SPID1
|
||||
#define WS2812_SPI_DRIVER SPID1
|
||||
#define WS2812_SPI_MOSI_PAL_MODE 5
|
||||
#define WS2812_SPI_SCK_PIN B13
|
||||
#define WS2812_SPI_SCK_PAL_MODE 5
|
||||
Reference in New Issue
Block a user