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

Revert hitag for now, need to cleanup more space

Browse Source
This commit is contained in:
MX
2023-05-17 23:06:41 +03:00
parent 51ba8b66b6
commit d539b948a0
20 changed files with 41 additions and 2882 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
applications/main/lfrfid/scenes/lfrfid_scene_extra_actions.c
View File

@@ -4,7 +4,6 @@
typedef enum {
SubmenuIndexASK,
SubmenuIndexPSK,
SubmenuIndexHitag,
SubmenuIndexClearT5577,
SubmenuIndexRAW,
SubmenuIndexRAWEmulate,
@@ -32,12 +31,6 @@ void lfrfid_scene_extra_actions_on_enter(void* context) {
SubmenuIndexPSK,
lfrfid_scene_extra_actions_submenu_callback,
app);
submenu_add_item(
submenu,
"Read RTF (Reader Talks First)",
SubmenuIndexHitag,
lfrfid_scene_extra_actions_submenu_callback,
app);
submenu_add_item(
submenu,
"Clear T5577 Password",
@@ -86,11 +79,6 @@ bool lfrfid_scene_extra_actions_on_event(void* context, SceneManagerEvent event)
scene_manager_next_scene(app->scene_manager, LfRfidSceneRead);
DOLPHIN_DEED(DolphinDeedRfidRead);
consumed = true;
} else if(event.event == SubmenuIndexHitag) {
app->read_type = LFRFIDWorkerReadTypeRTFOnly;
scene_manager_next_scene(app->scene_manager, LfRfidSceneRead);
DOLPHIN_DEED(DolphinDeedRfidRead);
consumed = true;
} else if(event.event == SubmenuIndexClearT5577) {
scene_manager_next_scene(app->scene_manager, LfRfidSceneClearT5577Confirm);
consumed = true;

18
applications/main/lfrfid/scenes/lfrfid_scene_read.c
View File

@@ -36,10 +36,6 @@ static void
event = LfRfidEventReadStartASK;
} else if(result == LFRFIDWorkerReadStartPSK) {
event = LfRfidEventReadStartPSK;
} else if(result == LFRFIDWorkerReadStartRTF) {
event = LfRfidEventReadStartRTF;
} else if(result == LFRFIDWorkerReadSenseHitag) { //TODO combine with sensecardstart?
event = LfRfidEventReadSenseHitag;
} else {
return;
}
@@ -54,9 +50,6 @@ void lfrfid_scene_read_on_enter(void* context) {
lfrfid_view_read_set_read_mode(app->read_view, LfRfidReadPskOnly);
} else if(app->read_type == LFRFIDWorkerReadTypeASKOnly) {
lfrfid_view_read_set_read_mode(app->read_view, LfRfidReadAskOnly);
} else if(app->read_type == LFRFIDWorkerReadTypeRTFOnly) {
lfrfid_view_read_set_read_state(app->read_view, LfRfidReadScanning);
lfrfid_view_read_set_read_mode(app->read_view, LfRfidReadRtfOnly);
}
lfrfid_worker_start_thread(app->lfworker);
@@ -100,17 +93,6 @@ bool lfrfid_scene_read_on_event(void* context, SceneManagerEvent event) {
lfrfid_view_read_set_read_mode(app->read_view, LfRfidReadAsk);
}
consumed = true;
} else if(event.event == LfRfidEventReadStartRTF) {
if(app->read_type == LFRFIDWorkerReadTypeAuto) {
lfrfid_view_read_set_read_state(app->read_view, LfRfidReadScanning);
lfrfid_view_read_set_read_mode(app->read_view, LfRfidReadHitag);
}
consumed = true;
} else if(event.event == LfRfidEventReadSenseHitag) { //TODO combine with sensecardstart?
if(app->read_type == LFRFIDWorkerReadTypeAuto ||
app->read_type == LFRFIDWorkerReadTypeRTFOnly) {
lfrfid_view_read_set_read_state(app->read_view, LfRfidReadTagDetected);
}
}
}

3
applications/main/lfrfid/scenes/lfrfid_scene_save_type.c
View File

@@ -17,9 +17,6 @@ void lfrfid_scene_save_type_on_enter(void* context) {
SaveTypeCtx* state = malloc(sizeof(SaveTypeCtx));
FuriString* protocol_string = furi_string_alloc();
for(uint8_t i = 0; i < LFRFIDProtocolMax; i++) {
if(i == LFRFIDProtocolHitag1) {
continue;
}
if((strcmp(
protocol_dict_get_manufacturer(app->dict, i),
protocol_dict_get_name(app->dict, i)) != 0) &&

12
applications/main/lfrfid/scenes/lfrfid_scene_saved_info.c
View File

@@ -17,15 +17,11 @@ void lfrfid_scene_saved_info_on_enter(void* context) {
uint8_t* data = (uint8_t*)malloc(size);
protocol_dict_get_data(app->dict, app->protocol_id, data, size);
for(uint8_t i = 0; i < size; i++) {
if(i >= 18) {
furi_string_cat_printf(tmp_string, "..");
break;
} else {
if(i != 0) {
furi_string_cat_printf(tmp_string, ":");
}
furi_string_cat_printf(tmp_string, "%02X", data[i]);
if(i != 0) {
furi_string_cat_printf(tmp_string, ":");
}
furi_string_cat_printf(tmp_string, "%02X", data[i]);
}
free(data);