mirror of
https://github.com/sunnypilot/sunnypilot.git
synced 2026-06-08 12:34:59 +08:00
Compare commits
3 Commits
master-dev
...
fix-sim
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
13c07838e4 | ||
|
|
23ac14d802 | ||
|
|
bb0f0c9c69 |
@@ -65,7 +65,10 @@ DEVICE_CAMERAS = {
|
||||
("unknown", "ox03c10"): _ar_ox_config,
|
||||
|
||||
# simulator (emulates a tici)
|
||||
("pc", "unknown"): _ar_ox_config,
|
||||
("pc", "unknown"): _os_config,
|
||||
# ("pc", "ar0231"): _ar_ox_config,
|
||||
# ("pc", "ox03c10"): _ar_ox_config,
|
||||
# ("pc", "os04c10"): _os_config,
|
||||
}
|
||||
prods = itertools.product(('tici', 'tizi', 'mici'), (('ar0231', _ar_ox_config), ('ox03c10', _ar_ox_config), ('os04c10', _os_config)))
|
||||
DEVICE_CAMERAS.update({(d, c[0]): c[1] for d, c in prods})
|
||||
|
||||
@@ -29,6 +29,9 @@ lenv = env.Clone()
|
||||
# ekf filter libraries need to be linked, even if no symbols are used
|
||||
if arch != "Darwin":
|
||||
lenv["LINKFLAGS"] += ["-Wl,--no-as-needed"]
|
||||
else:
|
||||
# On macOS, point the executable at the generated filter dylibs next to it.
|
||||
lenv["LINKFLAGS"] += ["-Wl,-rpath,@loader_path/models/generated"]
|
||||
|
||||
lenv["LIBPATH"].append(Dir(rednose_gen_dir).abspath)
|
||||
lenv["RPATH"].append(Dir(rednose_gen_dir).abspath)
|
||||
|
||||
@@ -227,7 +227,7 @@ def main() -> None:
|
||||
|
||||
|
||||
if __name__ == "__main__":
|
||||
unblock_stdout()
|
||||
# unblock_stdout()
|
||||
|
||||
try:
|
||||
main()
|
||||
|
||||
@@ -457,6 +457,10 @@ class GuiApplication(GuiApplicationExt):
|
||||
|
||||
def texture(self, asset_path: str, width: int | None = None, height: int | None = None,
|
||||
alpha_premultiply=False, keep_aspect_ratio=True, flip_x: bool = False) -> rl.Texture:
|
||||
if width is not None:
|
||||
width = int(width)
|
||||
if height is not None:
|
||||
height = int(height)
|
||||
cache_key = f"{asset_path}_{width}_{height}_{alpha_premultiply}_{keep_aspect_ratio}_{flip_x}"
|
||||
if cache_key in self._textures:
|
||||
return self._textures[cache_key]
|
||||
|
||||
@@ -69,7 +69,7 @@ base_frameworks = qt_env['FRAMEWORKS']
|
||||
base_libs = [common, messaging, cereal, visionipc, 'm', 'pthread'] + qt_env["LIBS"]
|
||||
|
||||
if arch == "Darwin":
|
||||
base_frameworks.append('QtCharts')
|
||||
base_frameworks += ['QtCharts', 'CoreFoundation', 'IOKit', 'Security']
|
||||
else:
|
||||
base_libs.append('Qt5Charts')
|
||||
|
||||
|
||||
Reference in New Issue
Block a user