arno/trezor-firmware
1
0
Fork 0
mirror of https://github.com/trezor/trezor-firmware.git synced 2025-05-17 06:18:48 +00:00
Code Issues Releases Wiki Activity

fix(nordic): fix signal names

Browse Source 
[no changelog]
This commit is contained in:
tychovrahe 2025-04-24 10:59:05 +02:00 committed by TychoVrahe
parent 83b5c16766
commit a8ed83b0a4
6 changed files with 10 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nordic/trezor/boards/arm/t3w1_d1_nrf52833/t3w1_d1_nrf52833.dts
View File

@ -29,7 +29,7 @@
compatible = "gpio-leds"; compatible = "gpio-leds";
led0: led_0 { led0: led_0 {
gpios = <&gpio0 22 GPIO_ACTIVE_LOW>; gpios = <&gpio0 22 GPIO_ACTIVE_LOW>;
label = "Wake up Trezor"; label = "Reserved";
}; };
led1: led_1 { led1: led_1 {
gpios = <&gpio0 24 GPIO_ACTIVE_LOW>; gpios = <&gpio0 24 GPIO_ACTIVE_LOW>;

2
nordic/trezor/boards/arm/t3w1_revA_nrf52832/t3w1_revA_nrf52832.dts
View File

@ -30,7 +30,7 @@
led0: led_0 { led0: led_0 {
gpios = <&gpio0 25 GPIO_ACTIVE_HIGH>; gpios = <&gpio0 25 GPIO_ACTIVE_HIGH>;
label = "Wake up Trezor"; label = "Reserved";
}; };
}; };

4
nordic/trezor/trezor-ble/src/management/management.c
View File

@ -57,9 +57,9 @@ static void send_info(void) {
data[2] = APP_VERSION_MINOR; data[2] = APP_VERSION_MINOR;
data[3] = APP_PATCHLEVEL; data[3] = APP_PATCHLEVEL;
data[4] = APP_TWEAK; data[4] = APP_TWEAK;
data[5] = signals_is_trz_ready(); data[5] = 0;
data[6] = signals_is_stay_in_bootloader(); data[6] = signals_is_stay_in_bootloader();
data[7] = signals_out_get_nrf_ready(); data[7] = 0;
data[8] = signals_out_get_reserved(); data[8] = signals_out_get_reserved();
trz_comm_send_msg(NRF_SERVICE_MANAGEMENT, data, sizeof(data)); trz_comm_send_msg(NRF_SERVICE_MANAGEMENT, data, sizeof(data));

2
nordic/trezor/trezor-ble/src/prodtest/prodtest.c
View File

@ -59,7 +59,7 @@ static void process_command(uint8_t *data, uint16_t len) {
trz_comm_send_msg(NRF_SERVICE_PRODTEST, resp_data, 64); trz_comm_send_msg(NRF_SERVICE_PRODTEST, resp_data, 64);
break; break;
case PRODTEST_CMD_SET_OUTPUT: case PRODTEST_CMD_SET_OUTPUT:
signals_wakeup(data[1]); signals_set_reserved(data[1]);
break; break;
default: default:
break; break;

10
nordic/trezor/trezor-ble/src/signals/inc/signals/signals.h
View File

@ -26,19 +26,13 @@ bool signals_init(void);
// INPUTS // INPUTS
// Checks if the TRZ is ready to communicate
bool signals_is_trz_ready(void);
// Checks if the device should stay in the bootloader // Checks if the device should stay in the bootloader
bool signals_is_stay_in_bootloader(void); bool signals_is_stay_in_bootloader(void);
// OUTPUTS // OUTPUTS
// Sets the reserved output // Set wake up signal
void signals_reserved(bool set); void signals_set_reserved(bool set);
// Reads the current output setting
bool signals_out_get_nrf_ready(void);
// Reads the current output setting // Reads the current output setting
bool signals_out_get_reserved(void); bool signals_out_get_reserved(void);

14
nordic/trezor/trezor-ble/src/signals/signals.c
View File

@ -31,11 +31,9 @@ LOG_MODULE_REGISTER(LOG_MODULE_NAME);
#define OUT_RESERVED DK_LED1 #define OUT_RESERVED DK_LED1
#define IN_STAY_IN_BOOTLOADER DK_BTN1_MSK #define IN_STAY_IN_BOOTLOADER DK_BTN1_MSK
#define IN_TRZ_READY DK_BTN2_MSK
static K_SEM_DEFINE(signals_ok, 0, 1); static K_SEM_DEFINE(signals_ok, 0, 1);
static bool out_nrf_ready = false;
static bool out_reserved = false; static bool out_reserved = false;
void button_changed(uint32_t button_state, uint32_t has_changed) {} 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); err = dk_buttons_init(button_changed);
if (err) { if (err) {
LOG_ERR("Cannot init buttons (err: %d)", err); LOG_ERR("Cannot init INPUT (err: %d)", err);
} }
err = dk_leds_init(); err = dk_leds_init();
if (err) { 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) { bool signals_is_stay_in_bootloader(void) {
return (dk_get_buttons() & IN_STAY_IN_BOOTLOADER) != 0; return (dk_get_buttons() & IN_STAY_IN_BOOTLOADER) != 0;
} }
@ -70,9 +64,7 @@ bool signals_init(void) {
return true; return true;
} }
bool signals_out_get_nrf_ready(void) { return out_nrf_ready; } void signals_set_reserved(bool set) {
void signals_reserved(bool set) {
out_reserved = set; out_reserved = set;
dk_set_led(OUT_RESERVED, set); dk_set_led(OUT_RESERVED, set);
} }