Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ enum VarItemListIndex {
VarItemListIndexSubghzBypass,
VarItemListIndexSubghzExtend,
VarItemListIndexGpioPins,
VarItemListIndexNfcvTiming,
VarItemListIndexFileNamingPrefix,
};

Expand All @@ -31,6 +32,14 @@ static void momentum_app_scene_protocols_file_naming_prefix_changed(VariableItem
app->save_settings = true;
}

static void momentum_app_scene_protocols_nfcv_timing_changed(VariableItem* item) {
MomentumApp* app = variable_item_get_context(item);
bool value = variable_item_get_current_value_index(item);
variable_item_set_current_value_text(item, value ? "Fast" : "Compat");
momentum_settings.nfcv_fast_timing = value;
app->save_settings = true;
}

void momentum_app_scene_protocols_on_enter(void* context) {
MomentumApp* app = context;
VariableItemList* var_item_list = app->var_item_list;
Expand Down Expand Up @@ -61,6 +70,16 @@ void momentum_app_scene_protocols_on_enter(void* context) {
item = variable_item_list_add(var_item_list, "GPIO Pins", 0, NULL, app);
variable_item_set_current_value_text(item, ">");

item = variable_item_list_add(
var_item_list,
"NFC-V Timing",
2,
momentum_app_scene_protocols_nfcv_timing_changed,
app);
variable_item_set_current_value_index(item, momentum_settings.nfcv_fast_timing);
variable_item_set_current_value_text(
item, momentum_settings.nfcv_fast_timing ? "Fast" : "Compat");

item = variable_item_list_add(
var_item_list,
"File Naming Prefix",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -83,9 +83,24 @@ static NfcCommand
NfcApp* instance = context;
Iso15693_3ListenerEvent* iso15693_3_event = event.event_data;

if(iso15693_3_event->type == Iso15693_3ListenerEventTypeCustomCommand) {
if(furi_string_size(instance->text_box_store) < NFC_LOG_SIZE_MAX) {
furi_string_cat_printf(instance->text_box_store, "R:");
if(furi_string_size(instance->text_box_store) < NFC_LOG_SIZE_MAX) {
if(iso15693_3_event->type == Iso15693_3ListenerEventTypeFieldOn) {
furi_string_cat_str(instance->text_box_store, "FIELD ON\n");
view_dispatcher_send_custom_event(
instance->view_dispatcher, NfcCustomEventListenerUpdate);
} else if(iso15693_3_event->type == Iso15693_3ListenerEventTypeFieldOff) {
furi_string_cat_str(instance->text_box_store, "FIELD OFF\n");
view_dispatcher_send_custom_event(
instance->view_dispatcher, NfcCustomEventListenerUpdate);
} else if(
iso15693_3_event->type == Iso15693_3ListenerEventTypeRequest ||
iso15693_3_event->type == Iso15693_3ListenerEventTypeRequestError ||
iso15693_3_event->type == Iso15693_3ListenerEventTypeResponse) {
furi_string_cat_printf(
instance->text_box_store,
iso15693_3_event->type == Iso15693_3ListenerEventTypeRequest ? "R:" :
iso15693_3_event->type == Iso15693_3ListenerEventTypeRequestError ? "E:" :
"T:");
for(size_t i = 0; i < bit_buffer_get_size_bytes(iso15693_3_event->data->buffer); i++) {
furi_string_cat_printf(
instance->text_box_store,
Expand Down
21 changes: 18 additions & 3 deletions applications/main/nfc/helpers/protocol_support/slix/slix.c
Original file line number Diff line number Diff line change
Expand Up @@ -85,9 +85,24 @@ static NfcCommand nfc_scene_emulate_listener_callback_slix(NfcGenericEvent event
NfcApp* instance = context;
SlixListenerEvent* slix_event = event.event_data;

if(slix_event->type == SlixListenerEventTypeCustomCommand) {
if(furi_string_size(instance->text_box_store) < NFC_LOG_SIZE_MAX) {
furi_string_cat_printf(instance->text_box_store, "R:");
if(furi_string_size(instance->text_box_store) < NFC_LOG_SIZE_MAX) {
if(slix_event->type == SlixListenerEventTypeFieldOn) {
furi_string_cat_str(instance->text_box_store, "FIELD ON\n");
view_dispatcher_send_custom_event(
instance->view_dispatcher, NfcCustomEventListenerUpdate);
} else if(slix_event->type == SlixListenerEventTypeFieldOff) {
furi_string_cat_str(instance->text_box_store, "FIELD OFF\n");
view_dispatcher_send_custom_event(
instance->view_dispatcher, NfcCustomEventListenerUpdate);
} else if(
slix_event->type == SlixListenerEventTypeRequest ||
slix_event->type == SlixListenerEventTypeRequestError ||
slix_event->type == SlixListenerEventTypeResponse) {
furi_string_cat_printf(
instance->text_box_store,
slix_event->type == SlixListenerEventTypeRequest ? "R:" :
slix_event->type == SlixListenerEventTypeRequestError ? "E:" :
"T:");
for(size_t i = 0; i < bit_buffer_get_size_bytes(slix_event->data->buffer); i++) {
furi_string_cat_printf(
instance->text_box_store,
Expand Down
Loading