mirrors/unleashed-firmware
1
Fork 0
mirror of https://github.com/DarkFlippers/unleashed-firmware.git synced 2025-12-12 20:49:49 +04:00
Code Issues Activity

Merge branch 'fz-dev' into dev

Browse Source
This commit is contained in:
MX
2022-10-19 18:24:56 +03:00
parent 49ba5fc9f3 79c3040629
commit 328fbffb80
4 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
firmware.scons
View File

@@ -329,7 +329,7 @@ if fwenv["IS_BASE_FIRMWARE"]:
# AlwaysBuild(sdk_tree)
Alias("sdk_tree", sdk_tree)
sdk_apicheck = fwenv.SDKSymUpdater(fwenv.subst("$SDK_DEFINITION"), "sdk_origin")
sdk_apicheck = fwenv.SDKSymUpdater(fwenv["SDK_DEFINITION"], "sdk_origin")
Precious(sdk_apicheck)
NoClean(sdk_apicheck)
AlwaysBuild(sdk_apicheck)

4
firmware/SConscript
View File

@@ -10,8 +10,10 @@ env.Append(
File("#/firmware/targets/furi_hal_include/furi_hal_subghz.h"),
],
)
env.SetDefault(SDK_DEFINITION=env.File("./targets/f${TARGET_HW}/api_symbols.csv"))
env.SetDefault(
SDK_DEFINITION=env.File("./targets/f${TARGET_HW}/api_symbols.csv").srcnode()
)
libenv = env.Clone(FW_LIB_NAME="flipper${TARGET_HW}")
libenv.Append(

2
firmware/targets/f7/api_symbols.csv
View File

@@ -4042,7 +4042,7 @@ Function,+,variable_item_list_set_enter_callback,void,"VariableItemList*, Variab
Function,+,variable_item_list_set_selected_item,void,"VariableItemList*, uint8_t"
Function,+,variable_item_set_current_value_index,void,"VariableItem*, uint8_t"
Function,+,variable_item_set_current_value_text,void,"VariableItem*, const char*"
Function,-,variable_item_set_values_count,void,"VariableItem*, uint8_t"
Function,+,variable_item_set_values_count,void,"VariableItem*, uint8_t"
Function,-,vasiprintf,int,"char**, const char*, __gnuc_va_list"
Function,-,vasniprintf,char*,"char*, size_t*, const char*, __gnuc_va_list"
Function,-,vasnprintf,char*,"char*, size_t*, const char*, __gnuc_va_list"
1 entry status name type params
4042 Function + variable_item_list_set_selected_item void VariableItemList*, uint8_t
4043 Function + variable_item_set_current_value_index void VariableItem*, uint8_t
4044 Function + variable_item_set_current_value_text void VariableItem*, const char*
4045 Function - + variable_item_set_values_count void VariableItem*, uint8_t
4046 Function - vasiprintf int char**, const char*, __gnuc_va_list
4047 Function - vasniprintf char* char*, size_t*, const char*, __gnuc_va_list
4048 Function - vasnprintf char* char*, size_t*, const char*, __gnuc_va_list

4
scripts/fbt_tools/fbt_extapps.py
View File

@@ -145,7 +145,7 @@ def BuildAppElf(env, app):
def prepare_app_metadata(target, source, env):
sdk_cache = SdkCache(env.subst("$SDK_DEFINITION"), load_version_only=True)
sdk_cache = SdkCache(env["SDK_DEFINITION"].path, load_version_only=True)
if not sdk_cache.is_buildable():
raise UserError(
@@ -166,7 +166,7 @@ def prepare_app_metadata(target, source, env):
def validate_app_imports(target, source, env):
sdk_cache = SdkCache(env.subst("$SDK_DEFINITION"), load_version_only=False)
sdk_cache = SdkCache(env["SDK_DEFINITION"].path, load_version_only=False)
app_syms = set()
with open(target[0].path, "rt") as f:
for line in f: