arno/trezor-firmware
1
0
Fork 0
mirror of https://github.com/trezor/trezor-firmware.git synced 2025-06-26 09:52:34 +00:00
Code Issues Releases Wiki Activity

fix spi and ble on zephyt

Browse Source
This commit is contained in:
tychovrahe 2024-04-18 16:45:10 +02:00
parent 6fd550c27d
commit 8354eab2a9
9 changed files with 27 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
core/embed/ble_zephyr_fw/boards/arm/t3w1_nrf52833/t3w1_nrf52833-pinctrl.dtsi
View File

@ -26,20 +26,19 @@
}; };
}; };
spi0_default: spi0_default { spi0_default: spi0_default {
group1 { group1 {
psels = <NRF_PSEL(SPIM_SCK, 0, 14)>, psels = <NRF_PSEL(SPIM_SCK, 1, 5)>,
<NRF_PSEL(SPIM_MOSI, 0, 16)>, <NRF_PSEL(SPIM_MOSI, 0, 19)>,
<NRF_PSEL(SPIM_MISO, 0, 15)>; <NRF_PSEL(SPIM_MISO, 1, 3)>;
}; };
}; };
spi0_sleep: spi0_sleep { spi0_sleep: spi0_sleep {
group1 { group1 {
psels = <NRF_PSEL(SPIM_SCK, 0, 14)>, psels = <NRF_PSEL(SPIM_SCK, 1, 5)>,
<NRF_PSEL(SPIM_MOSI, 0, 16)>, <NRF_PSEL(SPIM_MOSI, 0, 19)>,
<NRF_PSEL(SPIM_MISO, 0, 15)>; <NRF_PSEL(SPIM_MISO, 1, 3)>;
low-power-enable; low-power-enable;
}; };
}; };

2
core/embed/ble_zephyr_fw/boards/arm/t3w1_nrf52833/t3w1_nrf52833.dts
View File

@ -102,7 +102,7 @@
pinctrl-0 = <&spi0_default>; pinctrl-0 = <&spi0_default>;
pinctrl-1 = <&spi0_sleep>; pinctrl-1 = <&spi0_sleep>;
pinctrl-names = "default", "sleep"; pinctrl-names = "default", "sleep";
cs-gpios = <&gpio0 13 GPIO_ACTIVE_LOW>; cs-gpios = <&gpio0 23 GPIO_ACTIVE_LOW>;
reg_my_spi_master: spi-dev-a@0 { reg_my_spi_master: spi-dev-a@0 {
reg = <0>; reg = <0>;
}; };

6
core/embed/ble_zephyr_fw/prj.conf
View File

@ -37,8 +37,10 @@ CONFIG_BT_SMP_SC_ONLY=y
CONFIG_BT_FILTER_ACCEPT_LIST=y CONFIG_BT_FILTER_ACCEPT_LIST=y
CONFIG_BT_BONDING_REQUIRED=y CONFIG_BT_BONDING_REQUIRED=y
CONFIG_BT_PRIVACY=y CONFIG_BT_PRIVACY=y
#CONFIG_BT_TINYCRYPT_ECC=y CONFIG_BT_TINYCRYPT_ECC=y
#CONFIG_BT_LL_SW_SPLIT=y CONFIG_BT_LL_SW_SPLIT=y
#CONFIG_BT_DEBUG_SMP=y
#PHY update needed for updating PHY request #PHY update needed for updating PHY request
CONFIG_BT_USER_PHY_UPDATE=y CONFIG_BT_USER_PHY_UPDATE=y

5
core/embed/ble_zephyr_fw/src/connection.c
View File

@ -178,3 +178,8 @@ void pairing_failed(struct bt_conn *conn, enum bt_security_err reason)
LOG_INF("Pairing failed conn: %s, reason %d", addr, reason); LOG_INF("Pairing failed conn: %s, reason %d", addr, reason);
} }
struct bt_conn * conn_get_current(void){
return current_conn;
}

1
core/embed/ble_zephyr_fw/src/connection.h
View File

@ -27,3 +27,4 @@ void pairing_complete(struct bt_conn *conn, bool bonded);
void pairing_failed(struct bt_conn *conn, enum bt_security_err reason); void pairing_failed(struct bt_conn *conn, enum bt_security_err reason);
void num_comp_reply(bool accept); void num_comp_reply(bool accept);
struct bt_conn * conn_get_current(void);

4
core/embed/ble_zephyr_fw/src/main.c
View File

@ -236,8 +236,8 @@ void ble_write_thread(void)
/* Wait indefinitely for data to be sent over bluetooth */ /* Wait indefinitely for data to be sent over bluetooth */
uart_data_t *buf = uart_get_data_ext(); uart_data_t *buf = uart_get_data_ext();
if (bt_nus_send(NULL, buf->data, buf->len)) { if (bt_nus_send(conn_get_current(), buf->data, buf->len)) {
LOG_WRN("Failed to send data over BLE connection"); LOG_WRN("Failed to send data over BLE connection: %d", buf->len);
} }
k_free(buf); k_free(buf);

1
core/embed/ble_zephyr_fw/src/pb_comm.c
View File

@ -35,6 +35,7 @@ static K_FIFO_DEFINE(fifo_pb_tx_out); // data to send to host
void prepare_response_wait() { void prepare_response_wait() {
k_sem_reset(&pb_wait_for_ack); k_sem_reset(&pb_wait_for_ack);
uart_data_pb_flush();
} }

4
core/embed/ble_zephyr_fw/src/uart.c
View File

@ -311,6 +311,10 @@ uart_data_t *uart_get_data_pb(void)
return k_fifo_get(&fifo_uart_rx_data_pb, K_MSEC(100)); return k_fifo_get(&fifo_uart_rx_data_pb, K_MSEC(100));
} }
void uart_data_pb_flush(void){
while(uart_get_data_pb() != NULL);
}
void uart_send(uart_data_t *tx) void uart_send(uart_data_t *tx)
{ {
int err = uart_tx(uart, tx->data, tx->len, SYS_FOREVER_MS); int err = uart_tx(uart, tx->data, tx->len, SYS_FOREVER_MS);

2
core/embed/ble_zephyr_fw/src/uart.h
View File

@ -14,6 +14,8 @@ int uart_init(void);
uart_data_t * uart_get_data_ext(void); uart_data_t * uart_get_data_ext(void);
uart_data_t * uart_get_data_int(void); uart_data_t * uart_get_data_int(void);
uart_data_t * uart_get_data_pb(void); uart_data_t * uart_get_data_pb(void);
void uart_data_pb_flush(void);
void uart_send(uart_data_t *data); void uart_send(uart_data_t *data);
void uart_send_ext(uart_data_t *tx); void uart_send_ext(uart_data_t *tx);