Fix after merge issues pt1

applications/main/archive/views/archive_browser_view.h

@@ -2,6 +2,7 @@
 
 #include "../helpers/archive_files.h"
 #include "../helpers/archive_favorites.h"
+#include "../helpers/archive_menu.h"
 
 #include <gui/gui_i.h>
 #include <gui/view.h>

firmware/targets/f7/api_symbols.csv

@@ -1,5 +1,5 @@
 entry,status,name,type,params
-Version,+,13.0,,
+Version,+,13.1,,
 Header,+,applications/services/bt/bt_service/bt.h,,
 Header,+,applications/services/cli/cli.h,,
 Header,+,applications/services/cli/cli_vcp.h,,
@@ -646,8 +646,8 @@ Function,+,canvas_invert_color,void,Canvas*
 Function,+,canvas_reset,void,Canvas*
 Function,+,canvas_set_bitmap_mode,void,"Canvas*, _Bool"
 Function,+,canvas_set_color,void,"Canvas*, Color"
-Function,+,canvas_set_font,void,"Canvas*, Font"
 Function,+,canvas_set_custom_u8g2_font,void,"Canvas*, const uint8_t*"
+Function,+,canvas_set_font,void,"Canvas*, Font"
 Function,+,canvas_set_font_direction,void,"Canvas*, CanvasDirection"
 Function,-,canvas_set_orientation,void,"Canvas*, CanvasOrientation"
 Function,+,canvas_string_width,uint16_t,"Canvas*, const char*"
@@ -1111,7 +1111,6 @@ Function,-,furi_hal_flash_write_dword,void,"size_t, uint64_t"
 Function,+,furi_hal_gpio_add_int_callback,void,"const GpioPin*, GpioExtiCallback, void*"
 Function,+,furi_hal_gpio_disable_int_callback,void,const GpioPin*
 Function,+,furi_hal_gpio_enable_int_callback,void,const GpioPin*
-Function,+,furi_hal_resources_get_ext_pin_number,int32_t,const GpioPin*
 Function,+,furi_hal_gpio_init,void,"const GpioPin*, const GpioMode, const GpioPull, const GpioSpeed"
 Function,+,furi_hal_gpio_init_ex,void,"const GpioPin*, const GpioMode, const GpioPull, const GpioSpeed, const GpioAltFn"
 Function,+,furi_hal_gpio_init_simple,void,"const GpioPin*, const GpioMode"
@@ -1264,6 +1263,7 @@ Function,+,furi_hal_region_is_frequency_allowed,_Bool,uint32_t
 Function,+,furi_hal_region_is_provisioned,_Bool,
 Function,+,furi_hal_region_set,void,FuriHalRegion*
 Function,-,furi_hal_resources_deinit_early,void,
+Function,+,furi_hal_resources_get_ext_pin_number,int32_t,const GpioPin*
 Function,-,furi_hal_resources_init,void,
 Function,-,furi_hal_resources_init_early,void,
 Function,+,furi_hal_rfid_change_read_config,void,"float, float"
@@ -2157,6 +2157,7 @@ Function,-,putchar_unlocked,int,int
 Function,-,putenv,int,char*
 Function,-,puts,int,const char*
 Function,-,putw,int,"int, FILE*"
+Function,-,pvPortCalloc,void*,"size_t, size_t"
 Function,-,pvPortMalloc,void*,size_t
 Function,-,pvTaskGetThreadLocalStoragePointer,void*,"TaskHandle_t, BaseType_t"
 Function,-,pvTaskIncrementMutexHeldCount,TaskHandle_t,
@@ -4323,8 +4324,8 @@ Function,-,uECC_verify,int,"const uint8_t*, const uint8_t*, unsigned, const uint
 Function,-,ucStreamBufferGetStreamBufferType,uint8_t,StreamBufferHandle_t
 Function,-,ulTaskGenericNotifyTake,uint32_t,"UBaseType_t, BaseType_t, TickType_t"
 Function,-,ulTaskGenericNotifyValueClear,uint32_t,"TaskHandle_t, UBaseType_t, uint32_t"
-Function,-,ulTaskGetIdleRunTimeCounter,configRUN_TIME_COUNTER_TYPE,
-Function,-,ulTaskGetIdleRunTimePercent,configRUN_TIME_COUNTER_TYPE,
+Function,-,ulTaskGetIdleRunTimeCounter,uint32_t,
+Function,-,ulTaskGetIdleRunTimePercent,uint32_t,
 Function,-,ungetc,int,"int, FILE*"
 Function,-,unsetenv,int,const char*
 Function,-,usbd_poll,void,usbd_device*
@@ -4335,7 +4336,7 @@ Function,-,uxStreamBufferGetStreamBufferNumber,UBaseType_t,StreamBufferHandle_t
 Function,-,uxTaskGetNumberOfTasks,UBaseType_t,
 Function,-,uxTaskGetStackHighWaterMark,UBaseType_t,TaskHandle_t
 Function,-,uxTaskGetStackHighWaterMark2,uint16_t,TaskHandle_t
-Function,-,uxTaskGetSystemState,UBaseType_t,"TaskStatus_t*, const UBaseType_t, configRUN_TIME_COUNTER_TYPE*"
+Function,-,uxTaskGetSystemState,UBaseType_t,"TaskStatus_t*, const UBaseType_t, uint32_t*"
 Function,-,uxTaskGetTaskNumber,UBaseType_t,TaskHandle_t
 Function,+,uxTaskPriorityGet,UBaseType_t,const TaskHandle_t
 Function,-,uxTaskPriorityGetFromISR,UBaseType_t,const TaskHandle_t

firmware/targets/f7/furi_hal/furi_hal_spi.c

@@ -3,7 +3,6 @@
 #include <furi_hal_resources.h>
 #include <furi_hal_power.h>
 #include <furi_hal_interrupt.h>
-#include <furi_hal_subghz.h>
 
 #include <stm32wbxx_ll_dma.h>
 #include <stm32wbxx_ll_spi.h>

firmware/targets/f7/furi_hal/furi_hal_spi_config.c

@@ -2,6 +2,7 @@
 #include <furi_hal_resources.h>
 #include <furi_hal_spi.h>
 #include <furi.h>
+#include <furi_hal_subghz.h>
 
 #define TAG "FuriHalSpiConfig"
 
@@ -89,7 +90,7 @@ void furi_hal_spi_config_deinit_early() {
 void furi_hal_spi_config_init() {
     furi_hal_spi_bus_init(&furi_hal_spi_bus_r);
 
-    furi_hal_spi_bus_handle_init(&furi_hal_spi_bus_handle_subghz);
+    furi_hal_spi_bus_handle_init(furi_hal_subghz.spi_bus_handle);
     furi_hal_spi_bus_handle_init(&furi_hal_spi_bus_handle_nfc);
     furi_hal_spi_bus_handle_init(&furi_hal_spi_bus_handle_sd_fast);
     furi_hal_spi_bus_handle_init(&furi_hal_spi_bus_handle_sd_slow);

firmware/targets/f7/furi_hal/furi_hal_subghz.c

@@ -31,13 +31,6 @@ static bool last_OTG_state = false;
 #define SUBGHZ_DMA_CH1_DEF SUBGHZ_DMA, SUBGHZ_DMA_CH1_CHANNEL
 #define SUBGHZ_DMA_CH2_DEF SUBGHZ_DMA, SUBGHZ_DMA_CH2_CHANNEL
 
-typedef struct {
-    volatile SubGhzState state;
-    volatile SubGhzRegulation regulation;
-    volatile FuriHalSubGhzPreset preset;
-    const GpioPin* async_mirror_pin;
-} FuriHalSubGhz;
-
 volatile FuriHalSubGhz furi_hal_subghz = {
     .state = SubGhzStateInit,
     .regulation = SubGhzRegulationTxRx,
@@ -785,20 +778,20 @@ bool furi_hal_subghz_start_async_tx(FuriHalSubGhzAsyncTxCallback callback, void*
     furi_hal_subghz_debug_gpio_buff[0] = (uint32_t)gpio->pin << GPIO_NUMBER;
     furi_hal_subghz_debug_gpio_buff[1] = gpio->pin;
 
-        dma_config.MemoryOrM2MDstAddress = (uint32_t)furi_hal_subghz_debug_gpio_buff;
-        dma_config.PeriphOrM2MSrcAddress = (uint32_t) & (gpio->port->BSRR);
-        dma_config.Direction = LL_DMA_DIRECTION_MEMORY_TO_PERIPH;
-        dma_config.Mode = LL_DMA_MODE_CIRCULAR;
-        dma_config.PeriphOrM2MSrcIncMode = LL_DMA_PERIPH_NOINCREMENT;
-        dma_config.MemoryOrM2MDstIncMode = LL_DMA_MEMORY_INCREMENT;
-        dma_config.PeriphOrM2MSrcDataSize = LL_DMA_PDATAALIGN_WORD;
-        dma_config.MemoryOrM2MDstDataSize = LL_DMA_MDATAALIGN_WORD;
-        dma_config.NbData = 2;
-        dma_config.PeriphRequest = LL_DMAMUX_REQ_TIM2_UP;
-        dma_config.Priority = LL_DMA_PRIORITY_VERYHIGH;
-        LL_DMA_Init(SUBGHZ_DMA_CH2_DEF, &dma_config);
-        LL_DMA_SetDataLength(SUBGHZ_DMA_CH2_DEF, 2);
-        LL_DMA_EnableChannel(SUBGHZ_DMA_CH2_DEF);
+    dma_config.MemoryOrM2MDstAddress = (uint32_t)furi_hal_subghz_debug_gpio_buff;
+    dma_config.PeriphOrM2MSrcAddress = (uint32_t) & (gpio->port->BSRR);
+    dma_config.Direction = LL_DMA_DIRECTION_MEMORY_TO_PERIPH;
+    dma_config.Mode = LL_DMA_MODE_CIRCULAR;
+    dma_config.PeriphOrM2MSrcIncMode = LL_DMA_PERIPH_NOINCREMENT;
+    dma_config.MemoryOrM2MDstIncMode = LL_DMA_MEMORY_INCREMENT;
+    dma_config.PeriphOrM2MSrcDataSize = LL_DMA_PDATAALIGN_WORD;
+    dma_config.MemoryOrM2MDstDataSize = LL_DMA_MDATAALIGN_WORD;
+    dma_config.NbData = 2;
+    dma_config.PeriphRequest = LL_DMAMUX_REQ_TIM2_UP;
+    dma_config.Priority = LL_DMA_PRIORITY_VERYHIGH;
+    LL_DMA_Init(SUBGHZ_DMA_CH2_DEF, &dma_config);
+    LL_DMA_SetDataLength(SUBGHZ_DMA_CH2_DEF, 2);
+    LL_DMA_EnableChannel(SUBGHZ_DMA_CH2_DEF);
 
     return true;
 }

lib/SConscript

@@ -42,6 +42,7 @@ env.Append(
                 "variant",
             )
         ),
+        File("u8g2/u8g2.h"),
     ],
     CPPDEFINES=[
         '"M_MEMORY_FULL(x)=abort()"',