1
mirror of https://github.com/DarkFlippers/unleashed-firmware.git synced 2025-12-12 04:34:43 +04:00

Merge branch 'ofw_dev' into dev

This commit is contained in:
MX
2023-10-09 22:21:49 +03:00
49 changed files with 333 additions and 273 deletions

View File

@@ -267,7 +267,7 @@ class DolphinManifest:
# Load animation data
while True:
try:
# Read animation spcification
# Read animation specification
name = file.readKey("Name")
min_butthurt = file.readKeyInt("Min butthurt")
max_butthurt = file.readKeyInt("Max butthurt")

View File

@@ -462,7 +462,7 @@ class Main(App):
available_interfaces = self._search_interface(network_flash_interfaces)
if not available_interfaces:
self.logger.error("No availiable interfaces")
self.logger.error("No available interfaces")
return 1
elif len(available_interfaces) > 1:
self.logger.error("Multiple interfaces found:")

View File

@@ -72,10 +72,10 @@ def get_details(event, args):
def add_env(name, value, file):
delimeter = id_gen()
print(f"{name}<<{delimeter}", file=file)
delimiter = id_gen()
print(f"{name}<<{delimiter}", file=file)
print(f"{value}", file=file)
print(f"{delimeter}", file=file)
print(f"{delimiter}", file=file)
def add_set_output_var(name, value, file):

View File

@@ -89,7 +89,7 @@ fbtenv_check_sourced()
setopt +o nomatch; # disabling 'no match found' warning in zsh
return 0;;
esac
if [ ${0##*/} = "fbtenv.sh" ]; then # exluding script itself
if [ ${0##*/} = "fbtenv.sh" ]; then # excluding script itself
fbtenv_show_usage;
return 1;
fi
@@ -173,7 +173,7 @@ fbtenv_check_rosetta()
if [ "$ARCH_TYPE" = "arm64" ]; then
if ! pgrep -q oahd; then
echo "Flipper Zero Toolchain needs Rosetta2 to run under Apple Silicon";
echo "Please instal it by typing 'softwareupdate --install-rosetta --agree-to-license'";
echo "Please install it by typing 'softwareupdate --install-rosetta --agree-to-license'";
return 1;
fi
fi

View File

@@ -5,7 +5,7 @@ name: "FAP: Build for multiple SDK sources"
on:
push:
## put your main branch name under "braches"
## put your main branch name under "branches"
#branches:
# - master
pull_request: