Mirror/Momentum-Firmware
1
0
Fork 0
mirror of https://github.com/Next-Flip/Momentum-Firmware.git synced 2026-05-10 05:59:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'OFW/dev' into dev

Browse Source
This commit is contained in:
MX
2024-05-16 23:37:03 +03:00
parent 0ae78dfcdd 63403bbae2
commit 7c5111e29f
6 changed files with 31 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
applications/main/nfc/plugins/supported_cards/skylanders.c
View File

@@ -92,6 +92,7 @@ static uint8_t fill_name(const uint16_t id, FuriString* name) {
furi_string_cat_printf(name, "Lightning Rod");
break;
case 0x0004:
case 0x0194:
furi_string_cat_printf(name, "Bash");
break;
case 0x0005:
@@ -128,6 +129,7 @@ static uint8_t fill_name(const uint16_t id, FuriString* name) {
furi_string_cat_printf(name, "Slam Bam");
break;
case 0x0010:
case 0x01A0:
furi_string_cat_printf(name, "Spyro");
break;
case 0x0011:
@@ -137,6 +139,7 @@ static uint8_t fill_name(const uint16_t id, FuriString* name) {
furi_string_cat_printf(name, "Double Trouble");
break;
case 0x0013:
case 0x01A3:
furi_string_cat_printf(name, "Trigger Happy");
break;
case 0x0014:
@@ -170,6 +173,7 @@ static uint8_t fill_name(const uint16_t id, FuriString* name) {
furi_string_cat_printf(name, "Hex");
break;
case 0x001E:
case 0x01AE:
furi_string_cat_printf(name, "Chop Chop");
break;
case 0x001F:
@@ -331,18 +335,6 @@ static uint8_t fill_name(const uint16_t id, FuriString* name) {
case 0x0134:
furi_string_cat_printf(name, "Midnight Museum");
break;
case 0x0194:
furi_string_cat_printf(name, "Bash");
break;
case 0x01A0:
furi_string_cat_printf(name, "Spyro");
break;
case 0x01A3:
furi_string_cat_printf(name, "Trigger Happy");
break;
case 0x01AE:
furi_string_cat_printf(name, "Chop Chop");
break;
case 0x01C2:
furi_string_cat_printf(name, "Gusto");
break;

1
applications/services/gui/application.fam
View File

@@ -16,6 +16,7 @@ App(
"elements.h",
"view_dispatcher.h",
"view_stack.h",
"view_holder.h",
"modules/button_menu.h",
"modules/byte_input.h",
"modules/popup.h",

2
applications/system/js_app/modules/js_submenu.c
View File

@@ -145,4 +145,4 @@ static const FlipperAppPluginDescriptor submenu_plugin_descriptor = {
const FlipperAppPluginDescriptor* js_submenu_ep(void) {
return &submenu_plugin_descriptor;
}
}