From a8ed83b0a4a776a430a12c06f4f670b04ea581ef Mon Sep 17 00:00:00 2001 From: tychovrahe Date: Thu, 24 Apr 2025 10:59:05 +0200 Subject: [PATCH] fix(nordic): fix signal names [no changelog] --- .../arm/t3w1_d1_nrf52833/t3w1_d1_nrf52833.dts | 2 +- .../arm/t3w1_revA_nrf52832/t3w1_revA_nrf52832.dts | 2 +- .../trezor/trezor-ble/src/management/management.c | 4 ++-- nordic/trezor/trezor-ble/src/prodtest/prodtest.c | 2 +- .../trezor-ble/src/signals/inc/signals/signals.h | 10 ++-------- nordic/trezor/trezor-ble/src/signals/signals.c | 14 +++----------- 6 files changed, 10 insertions(+), 24 deletions(-) diff --git a/nordic/trezor/boards/arm/t3w1_d1_nrf52833/t3w1_d1_nrf52833.dts b/nordic/trezor/boards/arm/t3w1_d1_nrf52833/t3w1_d1_nrf52833.dts index 45ea697a71..b63621e29d 100644 --- a/nordic/trezor/boards/arm/t3w1_d1_nrf52833/t3w1_d1_nrf52833.dts +++ b/nordic/trezor/boards/arm/t3w1_d1_nrf52833/t3w1_d1_nrf52833.dts @@ -29,7 +29,7 @@ compatible = "gpio-leds"; led0: led_0 { gpios = <&gpio0 22 GPIO_ACTIVE_LOW>; - label = "Wake up Trezor"; + label = "Reserved"; }; led1: led_1 { gpios = <&gpio0 24 GPIO_ACTIVE_LOW>; diff --git a/nordic/trezor/boards/arm/t3w1_revA_nrf52832/t3w1_revA_nrf52832.dts b/nordic/trezor/boards/arm/t3w1_revA_nrf52832/t3w1_revA_nrf52832.dts index bbf1768d58..8f2fbffc38 100644 --- a/nordic/trezor/boards/arm/t3w1_revA_nrf52832/t3w1_revA_nrf52832.dts +++ b/nordic/trezor/boards/arm/t3w1_revA_nrf52832/t3w1_revA_nrf52832.dts @@ -30,7 +30,7 @@ led0: led_0 { gpios = <&gpio0 25 GPIO_ACTIVE_HIGH>; - label = "Wake up Trezor"; + label = "Reserved"; }; }; diff --git a/nordic/trezor/trezor-ble/src/management/management.c b/nordic/trezor/trezor-ble/src/management/management.c index d53c369a6e..4cc70b2669 100644 --- a/nordic/trezor/trezor-ble/src/management/management.c +++ b/nordic/trezor/trezor-ble/src/management/management.c @@ -57,9 +57,9 @@ static void send_info(void) { data[2] = APP_VERSION_MINOR; data[3] = APP_PATCHLEVEL; data[4] = APP_TWEAK; - data[5] = signals_is_trz_ready(); + data[5] = 0; data[6] = signals_is_stay_in_bootloader(); - data[7] = signals_out_get_nrf_ready(); + data[7] = 0; data[8] = signals_out_get_reserved(); trz_comm_send_msg(NRF_SERVICE_MANAGEMENT, data, sizeof(data)); diff --git a/nordic/trezor/trezor-ble/src/prodtest/prodtest.c b/nordic/trezor/trezor-ble/src/prodtest/prodtest.c index 77fd2d56bd..95a19e6236 100644 --- a/nordic/trezor/trezor-ble/src/prodtest/prodtest.c +++ b/nordic/trezor/trezor-ble/src/prodtest/prodtest.c @@ -59,7 +59,7 @@ static void process_command(uint8_t *data, uint16_t len) { trz_comm_send_msg(NRF_SERVICE_PRODTEST, resp_data, 64); break; case PRODTEST_CMD_SET_OUTPUT: - signals_wakeup(data[1]); + signals_set_reserved(data[1]); break; default: break; diff --git a/nordic/trezor/trezor-ble/src/signals/inc/signals/signals.h b/nordic/trezor/trezor-ble/src/signals/inc/signals/signals.h index b323a4b839..44220bf8ff 100644 --- a/nordic/trezor/trezor-ble/src/signals/inc/signals/signals.h +++ b/nordic/trezor/trezor-ble/src/signals/inc/signals/signals.h @@ -26,19 +26,13 @@ bool signals_init(void); // INPUTS -// Checks if the TRZ is ready to communicate -bool signals_is_trz_ready(void); - // Checks if the device should stay in the bootloader bool signals_is_stay_in_bootloader(void); // OUTPUTS -// Sets the reserved output -void signals_reserved(bool set); - -// Reads the current output setting -bool signals_out_get_nrf_ready(void); +// Set wake up signal +void signals_set_reserved(bool set); // Reads the current output setting bool signals_out_get_reserved(void); diff --git a/nordic/trezor/trezor-ble/src/signals/signals.c b/nordic/trezor/trezor-ble/src/signals/signals.c index c4914a14e3..e4d76c4361 100644 --- a/nordic/trezor/trezor-ble/src/signals/signals.c +++ b/nordic/trezor/trezor-ble/src/signals/signals.c @@ -31,11 +31,9 @@ LOG_MODULE_REGISTER(LOG_MODULE_NAME); #define OUT_RESERVED DK_LED1 #define IN_STAY_IN_BOOTLOADER DK_BTN1_MSK -#define IN_TRZ_READY DK_BTN2_MSK static K_SEM_DEFINE(signals_ok, 0, 1); -static bool out_nrf_ready = false; static bool out_reserved = false; void button_changed(uint32_t button_state, uint32_t has_changed) {} @@ -45,19 +43,15 @@ static void configure_gpio(void) { err = dk_buttons_init(button_changed); if (err) { - LOG_ERR("Cannot init buttons (err: %d)", err); + LOG_ERR("Cannot init INPUT (err: %d)", err); } err = dk_leds_init(); if (err) { - LOG_ERR("Cannot init LEDs (err: %d)", err); + LOG_ERR("Cannot init OUTPUT (err: %d)", err); } } -bool signals_is_trz_ready(void) { - return (dk_get_buttons() & IN_TRZ_READY) != 0; -} - bool signals_is_stay_in_bootloader(void) { return (dk_get_buttons() & IN_STAY_IN_BOOTLOADER) != 0; } @@ -70,9 +64,7 @@ bool signals_init(void) { return true; } -bool signals_out_get_nrf_ready(void) { return out_nrf_ready; } - -void signals_reserved(bool set) { +void signals_set_reserved(bool set) { out_reserved = set; dk_set_led(OUT_RESERVED, set); }