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

applications/main/nfc/plugins/supported_cards/skylanders.c

@@ -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;

applications/services/gui/application.fam

@@ -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",

applications/system/js_app/modules/js_submenu.c

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

furi/core/memmgr_heap.c

@@ -243,7 +243,7 @@ size_t memmgr_heap_get_max_free_block(void) {
 
 void memmgr_heap_printf_free_blocks(void) {
     BlockLink_t* pxBlock;
-    //TODO enable when we can do printf with a locked scheduler
+    //can be enabled once we can do printf with a locked scheduler
     //vTaskSuspendAll();
 
     pxBlock = xStart.pxNextFreeBlock;

targets/f18/api_symbols.csv

@@ -1,5 +1,5 @@
 entry,status,name,type,params
-Version,+,61.3,,
+Version,+,61.4,,
 Header,+,applications/services/bt/bt_service/bt.h,,
 Header,+,applications/services/cli/cli.h,,
 Header,+,applications/services/cli/cli_vcp.h,,
@@ -27,6 +27,7 @@ Header,+,applications/services/gui/modules/variable_item_list.h,,
 Header,+,applications/services/gui/modules/widget.h,,
 Header,+,applications/services/gui/modules/widget_elements/widget_element.h,,
 Header,+,applications/services/gui/view_dispatcher.h,,
+Header,+,applications/services/gui/view_holder.h,,
 Header,+,applications/services/gui/view_stack.h,,
 Header,+,applications/services/input/input.h,,
 Header,+,applications/services/loader/firmware_api/firmware_api.h,,
@@ -2683,6 +2684,16 @@ Function,+,view_dispatcher_switch_to_view,void,"ViewDispatcher*, uint32_t"
 Function,+,view_free,void,View*
 Function,+,view_free_model,void,View*
 Function,+,view_get_model,void*,View*
+Function,+,view_holder_alloc,ViewHolder*,
+Function,+,view_holder_attach_to_gui,void,"ViewHolder*, Gui*"
+Function,+,view_holder_free,void,ViewHolder*
+Function,+,view_holder_get_free_context,void*,ViewHolder*
+Function,+,view_holder_set_back_callback,void,"ViewHolder*, BackCallback, void*"
+Function,+,view_holder_set_free_callback,void,"ViewHolder*, FreeCallback, void*"
+Function,+,view_holder_set_view,void,"ViewHolder*, View*"
+Function,+,view_holder_start,void,ViewHolder*
+Function,+,view_holder_stop,void,ViewHolder*
+Function,+,view_holder_update,void,"View*, void*"
 Function,+,view_port_alloc,ViewPort*,
 Function,+,view_port_draw_callback_set,void,"ViewPort*, ViewPortDrawCallback, void*"
 Function,+,view_port_enabled_set,void,"ViewPort*, _Bool"

targets/f7/api_symbols.csv

@@ -1,5 +1,5 @@
 entry,status,name,type,params
-Version,+,61.3,,
+Version,+,61.4,,
 Header,+,applications/drivers/subghz/cc1101_ext/cc1101_ext_interconnect.h,,
 Header,+,applications/services/bt/bt_service/bt.h,,
 Header,+,applications/services/cli/cli.h,,
@@ -28,6 +28,7 @@ Header,+,applications/services/gui/modules/variable_item_list.h,,
 Header,+,applications/services/gui/modules/widget.h,,
 Header,+,applications/services/gui/modules/widget_elements/widget_element.h,,
 Header,+,applications/services/gui/view_dispatcher.h,,
+Header,+,applications/services/gui/view_holder.h,,
 Header,+,applications/services/gui/view_stack.h,,
 Header,+,applications/services/input/input.h,,
 Header,+,applications/services/loader/firmware_api/firmware_api.h,,
@@ -3564,6 +3565,16 @@ Function,+,view_dispatcher_switch_to_view,void,"ViewDispatcher*, uint32_t"
 Function,+,view_free,void,View*
 Function,+,view_free_model,void,View*
 Function,+,view_get_model,void*,View*
+Function,+,view_holder_alloc,ViewHolder*,
+Function,+,view_holder_attach_to_gui,void,"ViewHolder*, Gui*"
+Function,+,view_holder_free,void,ViewHolder*
+Function,+,view_holder_get_free_context,void*,ViewHolder*
+Function,+,view_holder_set_back_callback,void,"ViewHolder*, BackCallback, void*"
+Function,+,view_holder_set_free_callback,void,"ViewHolder*, FreeCallback, void*"
+Function,+,view_holder_set_view,void,"ViewHolder*, View*"
+Function,+,view_holder_start,void,ViewHolder*
+Function,+,view_holder_stop,void,ViewHolder*
+Function,+,view_holder_update,void,"View*, void*"
 Function,+,view_port_alloc,ViewPort*,
 Function,+,view_port_draw_callback_set,void,"ViewPort*, ViewPortDrawCallback, void*"
 Function,+,view_port_enabled_set,void,"ViewPort*, _Bool"