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

[FL-3174] Dolphin builder in ufbt; minor ufbt/fbt improvements (#2601)

* ufbt: added "dolphin_ext" target (expects "external" subfolder in cwd with dolphin assets); cleaned up unused code
* ufbt: codestyle fixes
* scripts: fixed style according to ruff linter
* scripts: additional cleanup & codestyle fixes
* github: pass target hw code when installing local SDK with ufbt
* ufbt: added error message for missing folder in dolphin builder
* scripts: more linter fixes
* sdk: added flipper_format_stream; ufbt: support for --extra-define
* fbt: reduced amount of global defines
* scripts, fbt: rearranged imports

Co-authored-by: Aleksandr Kutuzov <alleteam@gmail.com>
This commit is contained in:
hedger
2023-05-03 08:48:49 +03:00
committed by GitHub
parent 015ab4a024
commit c3ececcf96
73 changed files with 311 additions and 382 deletions

View File

@@ -1,13 +1,13 @@
#!/usr/bin/env python3
import typing
import subprocess
import logging
import time
import os
import socket
import subprocess
import time
import typing
from abc import ABC, abstractmethod
from dataclasses import dataclass
from flipper.app import App
@@ -223,7 +223,7 @@ class BlackmagicProgrammer(Programmer):
try:
socket.inet_aton(address)
return True
except:
except Exception:
return False
def set_serial(self, serial: str):
@@ -415,12 +415,12 @@ class Main(App):
if len(interfaces) == 0:
interfaces = [p for p in network_programmers if p.get_name() == i_name]
else:
self.logger.info(f"Probing for interfaces...")
self.logger.info("Probing for interfaces...")
interfaces = self._search_interface(self.args.serial)
if len(interfaces) == 0:
# Probe network blackmagic
self.logger.info(f"Probing for network interfaces...")
self.logger.info("Probing for network interfaces...")
interfaces = self._search_network_interface(self.args.serial)
if len(interfaces) == 0: