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

Merge branch 'dev' of https://github.com/DarkFlippers/unleashed-firmware into xfw-dev

Browse Source
This commit is contained in:
Willy-JL
2023-02-24 01:05:31 +00:00
parent fd7620202a c230d09dad
commit d3f3bf1e11
96 changed files with 8015 additions and 129 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
scripts/fbt_tools/fbt_dist.py
View File

@@ -4,7 +4,7 @@ from SCons.Script import Mkdir
from SCons.Defaults import Touch
def GetProjetDirName(env, project=None):
def GetProjectDirName(env, project=None):
parts = [f"f{env['TARGET_HW']}"]
if project:
parts.append(project)
@@ -21,7 +21,7 @@ def GetProjetDirName(env, project=None):
def create_fw_build_targets(env, configuration_name):
flavor = GetProjetDirName(env, configuration_name)
flavor = GetProjectDirName(env, configuration_name)
build_dir = env.Dir("build").Dir(flavor)
return env.SConscript(
"firmware.scons",
@@ -49,7 +49,7 @@ def AddFwProject(env, base_env, fw_type, fw_env_key):
],
)
env.Replace(DIST_DIR=env.GetProjetDirName())
env.Replace(DIST_DIR=env.GetProjectDirName())
return project_env
@@ -115,7 +115,7 @@ def generate(env):
env.AddMethod(AddFwProject)
env.AddMethod(DistCommand)
env.AddMethod(AddOpenOCDFlashTarget)
env.AddMethod(GetProjetDirName)
env.AddMethod(GetProjectDirName)
env.AddMethod(AddJFlashTarget)
env.AddMethod(AddUsbFlashTarget)

2
scripts/fbt_tools/fbt_help.py
View File

@@ -26,7 +26,7 @@ Other:
cli:
Open a Flipper CLI session over USB
firmware_cdb, updater_cdb:
Generate сompilation_database.json
Generate compilation_database.json
lint, lint_py:
run linters
format, format_py:

2
scripts/fbt_tools/fbt_hwtarget.py
View File

@@ -93,7 +93,7 @@ class HardwareTargetLoader:
sdk_headers = []
seen_sdk_headers = set(self.excluded_headers)
for sdk_path in self.sdk_header_paths:
# dirty, but fast - exclude headers from overlayed targets by name
# dirty, but fast - exclude headers from overlaid targets by name
# proper way would be to use relative paths, but names will do for now
for header in self.env.GlobRecursive("*.h", sdk_path, "*_i.h"):
if header.name not in seen_sdk_headers:

2
scripts/toolchain/fbtenv.cmd
View File

@@ -13,7 +13,7 @@ if not ["%FBT_NOENV%"] == [""] (
exit /b 0
)
set "FLIPPER_TOOLCHAIN_VERSION=19"
set "FLIPPER_TOOLCHAIN_VERSION=21"
if ["%FBT_TOOLCHAIN_ROOT%"] == [""] (
set "FBT_TOOLCHAIN_ROOT=%FBT_ROOT%\toolchain\x86_64-windows"

15
scripts/toolchain/fbtenv.sh
View File

@@ -5,7 +5,7 @@
# public variables
DEFAULT_SCRIPT_PATH="$(pwd -P)";
SCRIPT_PATH="${SCRIPT_PATH:-$DEFAULT_SCRIPT_PATH}";
FBT_TOOLCHAIN_VERSION="${FBT_TOOLCHAIN_VERSION:-"19"}";
FBT_TOOLCHAIN_VERSION="${FBT_TOOLCHAIN_VERSION:-"21"}";
FBT_TOOLCHAIN_PATH="${FBT_TOOLCHAIN_PATH:-$SCRIPT_PATH}";
FBT_VERBOSE="${FBT_VERBOSE:-""}";
@@ -43,10 +43,19 @@ fbtenv_restore_env()
PROMPT="$(echo "$PROMPT" | sed 's/\[fbt\]//g')";
fi
if [ -n "$SAVED_SSL_CERT_FILE" ]; then
export SSL_CERT_FILE="$SAVED_SSL_CERT_FILE";
export REQUESTS_CA_BUNDLE="$SAVED_REQUESTS_CA_BUNDLE";
else
unset SSL_CERT_FILE;
unset REQUESTS_CA_BUNDLE;
fi
export PYTHONNOUSERSITE="$SAVED_PYTHONNOUSERSITE";
export PYTHONPATH="$SAVED_PYTHONPATH";
export PYTHONHOME="$SAVED_PYTHONHOME";
unset SAVED_SSL_CERT_FILE;
unset SAVED_REQUESTS_CA_BUNDLE;
unset SAVED_PYTHONNOUSERSITE;
unset SAVED_PYTHONPATH;
unset SAVED_PYTHONHOME;
@@ -309,10 +318,14 @@ fbtenv_main()
PATH="$TOOLCHAIN_ARCH_DIR/openssl/bin:$PATH";
export PATH;
export SAVED_SSL_CERT_FILE="${SSL_CERT_FILE:-""}";
export SAVED_REQUESTS_CA_BUNDLE="${REQUESTS_CA_BUNDLE:-""}";
export SAVED_PYTHONNOUSERSITE="${PYTHONNOUSERSITE:-""}";
export SAVED_PYTHONPATH="${PYTHONPATH:-""}";
export SAVED_PYTHONHOME="${PYTHONHOME:-""}";
export SSL_CERT_FILE="$TOOLCHAIN_ARCH_DIR/python/lib/python3.11/site-packages/certifi/cacert.pem";
export REQUESTS_CA_BUNDLE="$SSL_CERT_FILE";
export PYTHONNOUSERSITE=1;
export PYTHONPATH=;
export PYTHONHOME=;