ufbt format

This commit is contained in:
Eric Betts
2023-07-04 09:06:08 -07:00
parent 725ce52ea3
commit a27291631f
3 changed files with 13 additions and 13 deletions
+4 -2
View File
@@ -230,14 +230,16 @@ size_t processCCID(SeaderWorker* seader_worker, uint8_t* cmd, size_t cmd_len) {
hasSAM = true;
seader_worker_send_version(seader_worker);
if(seader_worker->callback) {
seader_worker->callback(SeaderWorkerEventSamPresent, seader_worker->context);
seader_worker->callback(
SeaderWorkerEventSamPresent, seader_worker->context);
}
} else if(memcmp(SAM_ATR2, message.payload, sizeof(SAM_ATR2)) == 0) {
FURI_LOG_I(TAG, "SAM ATR2!");
hasSAM = true;
seader_worker_send_version(seader_worker);
if(seader_worker->callback) {
seader_worker->callback(SeaderWorkerEventSamPresent, seader_worker->context);
seader_worker->callback(
SeaderWorkerEventSamPresent, seader_worker->context);
}
} else {
FURI_LOG_W(TAG, "Unknown ATR");
+4 -10
View File
@@ -3,10 +3,7 @@
#define TAG "SeaderSamInfoScene"
void seader_scene_sam_info_widget_callback(
GuiButtonType result,
InputType type,
void* context) {
void seader_scene_sam_info_widget_callback(GuiButtonType result, InputType type, void* context) {
Seader* seader = context;
if(type == InputTypeShort) {
view_dispatcher_send_custom_event(seader->view_dispatcher, result);
@@ -20,14 +17,11 @@ void seader_scene_sam_info_on_enter(void* context) {
FuriString* fw_str = furi_string_alloc();
furi_string_cat_printf(fw_str, "FW %d.%d", seader_worker->sam_version[0], seader_worker->sam_version[1]);
furi_string_cat_printf(
fw_str, "FW %d.%d", seader_worker->sam_version[0], seader_worker->sam_version[1]);
widget_add_button_element(
seader->widget,
GuiButtonTypeLeft,
"Back",
seader_scene_sam_info_widget_callback,
seader);
seader->widget, GuiButtonTypeLeft, "Back", seader_scene_sam_info_widget_callback, seader);
widget_add_string_element(
widget, 64, 5, AlignCenter, AlignCenter, FontSecondary, furi_string_get_cstr(fw_str));
+5 -1
View File
@@ -31,7 +31,11 @@ void seader_scene_sam_present_on_enter(void* context) {
submenu_add_item(
submenu, "Load", SubmenuIndexSaved, seader_scene_sam_present_submenu_callback, seader);
submenu_add_item(
submenu, "SAM Info", SubmenuIndexSamInfo, seader_scene_sam_present_submenu_callback, seader);
submenu,
"SAM Info",
SubmenuIndexSamInfo,
seader_scene_sam_present_submenu_callback,
seader);
submenu_set_selected_item(
submenu, scene_manager_get_scene_state(seader->scene_manager, SeaderSceneSamPresent));