Skip to content

Commit 2d52c78

Browse files
akopachovakopachov
authored
Xtreme firmware build (#114)
1 parent 16ba603 commit 2d52c78

File tree

4 files changed

+80
-9
lines changed

4 files changed

+80
-9
lines changed

‎features_config.h

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,14 @@
1+
// Include Bluetooth token input automation
12
#define TOTP_BADBT_TYPE_ENABLED
2-
#define TOTP_AUTOMATION_ICONS_ENABLED
3+
4+
// Include token input automation icons on the main screen
5+
#define TOTP_AUTOMATION_ICONS_ENABLED
6+
7+
// List of compatible firmwares
8+
#define TOTP_FIRMWARE_OFFICIAL_STABLE 1
9+
#define TOTP_FIRMWARE_OFFICIAL_DEV 2
10+
#define TOTP_FIRMWARE_XTREME 3
11+
// End of list
12+
13+
// Target firmware to build for
14+
#define TOTP_TARGET_FIRMWARE TOTP_FIRMWARE_XTREME

‎workers/bt_type_code/bt_type_code.c

Lines changed: 53 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
#include "bt_type_code.h"
22
#include <furi_hal_bt_hid.h>
3+
#include <bt/bt_service/bt_i.h>
34
#include <storage/storage.h>
45
#include "../../types/common.h"
56
#include "../../types/token_info.h"
@@ -11,6 +12,26 @@ static inline bool totp_type_code_worker_stop_requested() {
1112
return furi_thread_flags_get() & TotpBtTypeCodeWorkerEventStop;
1213
}
1314

15+
#if TOTP_TARGET_FIRMWARE == TOTP_FIRMWARE_XTREME
16+
static void totp_type_code_worker_bt_set_app_mac(uint8_t* mac) {
17+
uint8_t max_i;
18+
size_t uid_size = furi_hal_version_uid_size();
19+
if(uid_size < 6) {
20+
max_i = uid_size;
21+
} else {
22+
max_i = 6;
23+
}
24+
25+
const uint8_t* uid = furi_hal_version_uid();
26+
memcpy(mac, uid, max_i);
27+
for(uint8_t i = max_i; i < 6; i++) {
28+
mac[i] = 0;
29+
}
30+
31+
mac[0] = 0b10;
32+
}
33+
#endif
34+
1435
static void totp_type_code_worker_type_code(TotpBtTypeCodeWorkerContext* context) {
1536
uint8_t i = 0;
1637
do {
@@ -30,7 +51,7 @@ static void totp_type_code_worker_type_code(TotpBtTypeCodeWorkerContext* context
3051
}
3152

3253
static int32_t totp_type_code_worker_callback(void* context) {
33-
furi_assert(context);
54+
furi_check(context);
3455
FuriMutex* context_mutex = furi_mutex_alloc(FuriMutexTypeNormal);
3556
if(context_mutex == NULL) {
3657
return 251;
@@ -74,7 +95,7 @@ void totp_bt_type_code_worker_start(
7495
char* code_buf,
7596
uint8_t code_buf_length,
7697
FuriMutex* code_buf_update_sync) {
77-
furi_assert(context != NULL);
98+
furi_check(context != NULL);
7899
context->string = code_buf;
79100
context->string_length = code_buf_length;
80101
context->string_sync = code_buf_update_sync;
@@ -87,7 +108,7 @@ void totp_bt_type_code_worker_start(
87108
}
88109

89110
void totp_bt_type_code_worker_stop(TotpBtTypeCodeWorkerContext* context) {
90-
furi_assert(context != NULL);
111+
furi_check(context != NULL);
91112
furi_thread_flags_set(furi_thread_get_id(context->thread), TotpBtTypeCodeWorkerEventStop);
92113
furi_thread_join(context->thread);
93114
furi_thread_free(context->thread);
@@ -98,7 +119,7 @@ void totp_bt_type_code_worker_notify(
98119
TotpBtTypeCodeWorkerContext* context,
99120
TotpBtTypeCodeWorkerEvent event,
100121
uint8_t flags) {
101-
furi_assert(context != NULL);
122+
furi_check(context != NULL);
102123
context->flags = flags;
103124
furi_thread_flags_set(furi_thread_get_id(context->thread), event);
104125
}
@@ -114,19 +135,41 @@ TotpBtTypeCodeWorkerContext* totp_bt_type_code_worker_init() {
114135
furi_hal_bt_reinit();
115136
furi_delay_ms(200);
116137
bt_keys_storage_set_storage_path(context->bt, HID_BT_KEYS_STORAGE_PATH);
138+
139+
#if TOTP_TARGET_FIRMWARE == TOTP_FIRMWARE_XTREME
140+
totp_type_code_worker_bt_set_app_mac(&context->bt_mac[0]);
141+
memcpy(
142+
&context->previous_bt_name[0],
143+
furi_hal_bt_get_profile_adv_name(FuriHalBtProfileHidKeyboard),
144+
TOTP_BT_WORKER_BT_ADV_NAME_MAX_LEN);
145+
memcpy(
146+
&context->previous_bt_mac[0],
147+
furi_hal_bt_get_profile_mac_addr(FuriHalBtProfileHidKeyboard),
148+
TOTP_BT_WORKER_BT_MAC_ADDRESS_LEN);
149+
char new_name[TOTP_BT_WORKER_BT_ADV_NAME_MAX_LEN];
150+
snprintf(new_name, sizeof(new_name), "%s TOTP Auth", furi_hal_version_get_name_ptr());
151+
furi_hal_bt_set_profile_adv_name(FuriHalBtProfileHidKeyboard, new_name);
152+
furi_hal_bt_set_profile_mac_addr(FuriHalBtProfileHidKeyboard, context->bt_mac);
153+
#endif
154+
117155
if(!bt_set_profile(context->bt, BtProfileHidKeyboard)) {
118156
FURI_LOG_E(LOGGING_TAG, "Failed to switch BT to keyboard HID profile");
119157
}
120158

121159
furi_hal_bt_start_advertising();
160+
161+
#if TOTP_TARGET_FIRMWARE == TOTP_FIRMWARE_XTREME
162+
bt_enable_peer_key_update(context->bt);
163+
#endif
164+
122165
context->is_advertising = true;
123166
bt_set_status_changed_callback(context->bt, connection_status_changed_callback, context);
124167

125168
return context;
126169
}
127170

128171
void totp_bt_type_code_worker_free(TotpBtTypeCodeWorkerContext* context) {
129-
furi_assert(context != NULL);
172+
furi_check(context != NULL);
130173

131174
if(context->thread != NULL) {
132175
totp_bt_type_code_worker_stop(context);
@@ -142,6 +185,11 @@ void totp_bt_type_code_worker_free(TotpBtTypeCodeWorkerContext* context) {
142185
furi_delay_ms(200);
143186
bt_keys_storage_set_default_path(context->bt);
144187

188+
#if TOTP_TARGET_FIRMWARE == TOTP_FIRMWARE_XTREME
189+
furi_hal_bt_set_profile_adv_name(FuriHalBtProfileHidKeyboard, context->previous_bt_name);
190+
furi_hal_bt_set_profile_mac_addr(FuriHalBtProfileHidKeyboard, context->previous_bt_mac);
191+
#endif
192+
145193
if(!bt_set_profile(context->bt, BtProfileSerial)) {
146194
FURI_LOG_E(LOGGING_TAG, "Failed to switch BT to Serial profile");
147195
}

‎workers/bt_type_code/bt_type_code.h

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,12 @@
44
#include <furi/furi.h>
55
#include <furi_hal.h>
66
#include <bt/bt_service/bt.h>
7+
#include "../../features_config.h"
8+
9+
#if TOTP_TARGET_FIRMWARE == TOTP_FIRMWARE_XTREME
10+
#define TOTP_BT_WORKER_BT_ADV_NAME_MAX_LEN 18
11+
#define TOTP_BT_WORKER_BT_MAC_ADDRESS_LEN GAP_MAC_ADDR_SIZE
12+
#endif
713

814
typedef uint8_t TotpBtTypeCodeWorkerEvent;
915

@@ -16,6 +22,11 @@ typedef struct {
1622
Bt* bt;
1723
bool is_advertising;
1824
bool is_connected;
25+
#if TOTP_TARGET_FIRMWARE == TOTP_FIRMWARE_XTREME
26+
uint8_t bt_mac[TOTP_BT_WORKER_BT_MAC_ADDRESS_LEN];
27+
char previous_bt_name[TOTP_BT_WORKER_BT_ADV_NAME_MAX_LEN + 1];
28+
uint8_t previous_bt_mac[TOTP_BT_WORKER_BT_MAC_ADDRESS_LEN];
29+
#endif
1930
} TotpBtTypeCodeWorkerContext;
2031

2132
enum TotpBtTypeCodeWorkerEvents {

‎workers/usb_type_code/usb_type_code.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ static void totp_type_code_worker_type_code(TotpUsbTypeCodeWorkerContext* contex
4141
}
4242

4343
static int32_t totp_type_code_worker_callback(void* context) {
44-
furi_assert(context);
44+
furi_check(context);
4545
FuriMutex* context_mutex = furi_mutex_alloc(FuriMutexTypeNormal);
4646
if(context_mutex == NULL) {
4747
return 251;
@@ -89,7 +89,7 @@ TotpUsbTypeCodeWorkerContext* totp_usb_type_code_worker_start(
8989
}
9090

9191
void totp_usb_type_code_worker_stop(TotpUsbTypeCodeWorkerContext* context) {
92-
furi_assert(context != NULL);
92+
furi_check(context != NULL);
9393
furi_thread_flags_set(furi_thread_get_id(context->thread), TotpUsbTypeCodeWorkerEventStop);
9494
furi_thread_join(context->thread);
9595
furi_thread_free(context->thread);
@@ -101,7 +101,7 @@ void totp_usb_type_code_worker_notify(
101101
TotpUsbTypeCodeWorkerContext* context,
102102
TotpUsbTypeCodeWorkerEvent event,
103103
uint8_t flags) {
104-
furi_assert(context != NULL);
104+
furi_check(context != NULL);
105105
context->flags = flags;
106106
furi_thread_flags_set(furi_thread_get_id(context->thread), event);
107107
}

0 commit comments

Comments
 (0)