Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Little changes #9

Closed
wants to merge 4 commits into from
Closed

Little changes #9

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
123d35b
Update flipper.c
grugnoymeme Mar 3, 2024
084cf05
Update loader.c
grugnoymeme Mar 3, 2024
a2f3558
Update mf_classic_dict.nfc
grugnoymeme Mar 3, 2024
01a1f0e
Merge branch 'Next-Flip:dev' into dev
grugnoymeme Mar 3, 2024
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
2 changes: 1 addition & 1 deletion applications/main/nfc/resources/nfc/assets/mf_classic_dict.nfc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4244,7 +4244,7 @@ FE98F38F3EE2
78DF1176C8FD
ADC169F922CB
# +------------------------------------------------------------------------------------------------------------------------+
# | https://github.com/Flipper-XFW/Xtreme-Firmware/blob/dev/applications/main/nfc/resources/nfc/assets/mf_classic_dict.nfc |
# | https://github.com/Next-Flip/Momentum-Firmware/blob/dev/applications/main/nfc/resources/nfc/assets/mf_classic_dict.nfc |
# +------------------------------------------------------------------------------------------------------------------------+
##############################################
# STB - keys from Bucharest Public Transport
Expand Down
4 changes: 2 additions & 2 deletions applications/services/loader/loader.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -217,12 +217,12 @@ static void loader_make_menu_file(Storage* storage) {
}
// Old additional external apps
Stream* old = file_stream_alloc(storage);
if(file_stream_open(old, CFG_PATH("xtreme_apps.txt"), FSAM_READ, FSOM_OPEN_EXISTING)) {
if(file_stream_open(old, CFG_PATH("momentum_apps.txt"), FSAM_READ, FSOM_OPEN_EXISTING)) {
stream_copy(old, new, stream_size(old));
}
file_stream_close(old);
stream_free(old);
storage_common_remove(storage, CFG_PATH("xtreme_apps.txt"));
storage_common_remove(storage, CFG_PATH("momentum_apps.txt"));
}
file_stream_close(new);
}
Expand Down
4 changes: 2 additions & 2 deletions furi/flipper.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,8 +62,8 @@ void flipper_migrate_files() {
// Renames on ext
{CFG_PATH("favorites.txt"), ARCHIVE_FAV_PATH, true}, // Adapt to OFW/UL
{CFG_PATH(".desktop.keybinds"), DESKTOP_KEYBINDS_PATH, true}, // Old naming
{CFG_PATH("xtreme_menu.txt"), MAINMENU_APPS_PATH, false}, // Keep both
{CFG_PATH("xtreme_settings.txt"), MOMENTUM_SETTINGS_PATH, false}, // Keep both
{CFG_PATH("momentum_menu.txt"), MAINMENU_APPS_PATH, false}, // Keep both
{CFG_PATH("momentum_settings.txt"), MOMENTUM_SETTINGS_PATH, false}, // Keep both
// Int -> Ext
{INT_PATH(".bt.settings"), BT_SETTINGS_PATH, true},
{INT_PATH(".dolphin.state"), DOLPHIN_STATE_PATH, true},
Expand Down