Mirror/Momentum-Firmware
1
0
Fork 0
mirror of https://github.com/Next-Flip/Momentum-Firmware.git synced 2026-04-24 03:29:57 -07:00
Code Issues Packages Projects Releases Wiki Activity

Format

Browse Source
This commit is contained in:
Willy-JL
2023-05-02 14:29:30 +01:00
parent 74a30f919d
commit 2fcc3d1ae2
3 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
applications/main/nfc/scenes/nfc_scene_nfc_data_info.c
View File

@@ -204,7 +204,7 @@ void nfc_scene_nfc_data_info_on_enter(void* context) {
furi_string_cat_printf(temp_str, "\e#ISO15693 (unknown)\n"); furi_string_cat_printf(temp_str, "\e#ISO15693 (unknown)\n");
break; break;
} }
// Set tag general data // Set tag general data
} else if(type == FuriHalNfcTypeF) { } else if(type == FuriHalNfcTypeF) {
// Set NFC-F data // Set NFC-F data
furi_string_cat_printf(temp_str, "ISO 18092 (NFC-F)\n"); furi_string_cat_printf(temp_str, "ISO 18092 (NFC-F)\n");

7
applications/main/subghz/scenes/subghz_scene_transmitter.c
View File

@@ -84,12 +84,11 @@ void subghz_scene_transmitter_on_enter(void* context) {
with_view_model( with_view_model(
subghz->subghz_transmitter->view, subghz->subghz_transmitter->view,
SubGhzViewTransmitterModel * model, SubGhzViewTransmitterModel * model,
{ { model->show_button = false; },
model->show_button = false;
},
true); true);
fav_timer = furi_timer_alloc(fav_timer_callback, FuriTimerTypeOnce, subghz); fav_timer = furi_timer_alloc(fav_timer_callback, FuriTimerTypeOnce, subghz);
furi_timer_start(fav_timer, XTREME_SETTINGS()->favorite_timeout * furi_kernel_get_tick_frequency()); furi_timer_start(
fav_timer, XTREME_SETTINGS()->favorite_timeout * furi_kernel_get_tick_frequency());
subghz->state_notifications = SubGhzNotificationStateTx; subghz->state_notifications = SubGhzNotificationStateTx;
} }
} }

2
lib/nfc/protocols/nfcv.c
View File

@@ -1310,7 +1310,6 @@ bool nfcv_emu_loop(
} }
nfcv_data->emu_protocol_handler(tx_rx, nfc_data, nfcv_data); nfcv_data->emu_protocol_handler(tx_rx, nfc_data, nfcv_data);
/* determine readers fc by analyzing transmission duration */ /* determine readers fc by analyzing transmission duration */
uint32_t duration = eof_timestamp - sof_timestamp; uint32_t duration = eof_timestamp - sof_timestamp;
float fc_1024 = (4.0f * duration) / (4 * (frame_pos * 4 + 1) + 1); float fc_1024 = (4.0f * duration) / (4 * (frame_pos * 4 + 1) + 1);
@@ -1346,4 +1345,3 @@ bool nfcv_emu_loop(
return ret; return ret;
} }