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

scripts/fbt_tools/fbt_dist.py

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

scripts/fbt_tools/fbt_help.py

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

scripts/fbt_tools/fbt_hwtarget.py

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