mawei/sunnypilot
1
0
Fork 0
mirror of https://github.com/sunnypilot/sunnypilot.git synced 2026-07-25 11:52:20 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master-priv' into master-dev-c3

Browse Source
This commit is contained in:
Jaosn Wen
2024-07-16 23:27:48 -04:00
parent d367b346a0 0ca98a8379
commit a05db5dcc7
4 changed files with 95 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.gitlab-ci.yml
+2
View File
@@ -129,6 +129,8 @@ build:
--exclude='**/selfdrive/ui/**/*.h'
--exclude='**/selfdrive/ui/qt/offroad/sunnypilot/'
--exclude='**/.git/'
--exclude='**/SConstruct'
--exclude='**/SConscript'
--delete-excluded
--chown=comma:comma
${BUILD_DIR}/ ${OUTPUT_DIR}/
SConstruct
+47
View File
@@ -7,6 +7,8 @@ import numpy as np
import SCons.Errors
from openpilot.common.basedir import BASEDIR
SCons.Warnings.warningAsException(True)
# pending upstream fix - https://github.com/SCons/scons/issues/4461
@@ -16,6 +18,45 @@ TICI = os.path.isfile('/TICI')
AGNOS = TICI
UBUNTU_FOCAL = int(subprocess.check_output('[ -f /etc/os-release ] && . /etc/os-release && [ "$ID" = "ubuntu" ] && [ "$VERSION_ID" = "20.04" ] && echo 1 || echo 0', shell=True, encoding='utf-8').rstrip())
Export('UBUNTU_FOCAL')
_DEBUG = False
def is_internal_developer(debug=False):
def collect_required_gpg_key_ids(keys_dir):
try:
key_ids = [f.split('.')[0] for f in os.listdir(keys_dir) if f.endswith(".gpg")]
if debug:
print(f"SP: Required GPG key IDs: {key_ids}")
return key_ids
except OSError as e:
if debug:
print(f"SP: Failed to read GPG key IDs from {keys_dir}. Error: {e}")
return []
def is_key_available(required_gpg_key_ids):
for key_id in required_gpg_key_ids:
try:
result = subprocess.check_output(['gpg', '--list-keys', key_id], stderr=subprocess.STDOUT)
if key_id in result.decode():
if debug:
print(f"SP: GPG key {key_id} is available.")
return True
except subprocess.CalledProcessError as e:
if debug:
print(f"SP: Failed to list GPG key {key_id}. Error:", e.output.decode().strip())
return False
keys_dir = os.path.join(BASEDIR, ".git-crypt/keys/default/0")
required_gpg_key_ids = collect_required_gpg_key_ids(keys_dir)
sunnypilot = is_key_available(required_gpg_key_ids)
if sunnypilot:
print("SP: Confirmed sunnypilot internal developer.")
print("SP: Loading sunnypilot elements ...")
elif debug:
print("SP: None of the required GPG keys are available.")
return sunnypilot
Decider('MD5-timestamp')
@@ -72,6 +113,12 @@ AddOption('--minimal',
default=os.path.exists(File('#.lfsconfig').abspath), # minimal by default on release branch (where there's no LFS)
help='the minimum build to run openpilot. no tests, tools, etc.')
AddOption('--sunnypilot',
action='store_true',
dest='sunnypilot',
default=is_internal_developer(_DEBUG), # check if the current user is a sunnypilot developer
help='build sunnypilot elements and other sunnypilot-specific items that are meant for internal development')
## Architecture name breakdown (arch)
## - larch64: linux tici aarch64
## - aarch64: linux pc aarch64
selfdrive/ui/SConscript
+10 -18
View File
@@ -1,6 +1,6 @@
import os
import json
Import('qt_env', 'arch', 'common', 'messaging', 'visionipc', 'transformations', 'UBUNTU_FOCAL')
Import('qt_env', 'arch', 'common', 'messaging', 'visionipc', 'transformations')
base_libs = [common, messaging, visionipc, transformations,
'm', 'OpenCL', 'ssl', 'crypto', 'pthread'] + qt_env["LIBS"]
@@ -17,27 +17,20 @@ if arch == "Darwin":
# FIXME: remove this once we're on 5.15 (24.04)
qt_env['CXXFLAGS'] += ["-Wno-deprecated-declarations"]
sp_widgets_src = []
sp_qt_src = []
if GetOption('sunnypilot'):
SConscript(['sunnypilot/SConscript'])
Import('sp_widgets_src', 'sp_qt_src')
qt_util = qt_env.Library("qt_util", ["#selfdrive/ui/qt/api.cc", "#selfdrive/ui/qt/util.cc"], LIBS=base_libs)
widgets_src = ["ui.cc", "qt/widgets/input.cc", "qt/widgets/wifi.cc",
"qt/widgets/ssh_keys.cc", "qt/widgets/toggle.cc", "qt/widgets/controls.cc",
"qt/widgets/offroad_alerts.cc", "qt/widgets/prime.cc", "qt/widgets/keyboard.cc",
"qt/widgets/scrollview.cc", "qt/widgets/cameraview.cc", "#third_party/qrcode/QrCode.cc",
"qt/request_repeater.cc", "qt/qt_window.cc", "qt/network/networking.cc", "qt/network/wifi_manager.cc"]
"qt/request_repeater.cc", "qt/qt_window.cc", "qt/network/networking.cc", "qt/network/wifi_manager.cc"] + sp_widgets_src
widgets_src += ["qt/offroad/sunnypilot/display_settings.cc", "qt/offroad/sunnypilot/sunnypilot_settings.cc",
"qt/offroad/sunnypilot/vehicle_settings.cc", "qt/offroad/sunnypilot/visuals_settings.cc",
"qt/offroad/sunnypilot/trips_settings.cc", "qt/offroad/sunnypilot/mads_settings.cc",
"qt/offroad/sunnypilot/lane_change_settings.cc", "qt/offroad/sunnypilot/speed_limit_control_settings.cc",
"qt/offroad/sunnypilot/monitoring_settings.cc", "qt/offroad/sunnypilot/osm_settings.cc",
"qt/offroad/sunnypilot/custom_offsets_settings.cc", "qt/widgets/sunnypilot/drive_stats.cc",
"qt/offroad/sunnypilot/software_settings_sp.cc", "qt/offroad/sunnypilot/models_fetcher.cc",
"qt/offroad/sunnypilot/speed_limit_warning_settings.cc", "qt/offroad/sunnypilot/speed_limit_policy_settings.cc",
"qt/offroad/sunnypilot/sunnylink_settings.cc"]
widgets_src += ["qt/network/sunnylink/sunnylink_client.cc", "qt/network/sunnylink/services/base_device_service.cc",
"qt/network/sunnylink/services/role_service.cc", "qt/network/sunnylink/services/user_service.cc"]
qt_env['CPPDEFINES'] = []
qt_env['CPPDEFINES'] = ["SUNNYPILOT"] if GetOption('sunnypilot') else []
if maps:
base_libs += ['QMapLibre']
widgets_src += ["qt/maps/map_helpers.cc", "qt/maps/map_settings.cc", "qt/maps/map.cc", "qt/maps/map_panel.cc",
@@ -53,8 +46,7 @@ qt_src = ["main.cc", "qt/sidebar.cc", "qt/body.cc",
"qt/offroad/software_settings.cc", "qt/offroad/onboarding.cc",
"qt/offroad/driverview.cc", "qt/offroad/experimental_mode.cc",
"qt/onroad/onroad_home.cc", "qt/onroad/annotated_camera.cc",
"qt/onroad/buttons.cc", "qt/onroad/alerts.cc",
"qt/onroad_settings.cc", "qt/onroad_settings_panel.cc"]
"qt/onroad/buttons.cc", "qt/onroad/alerts.cc"] + sp_qt_src
# build translation files
with open(File("translations/languages.json").abspath) as f:
selfdrive/ui/sunnypilot/SConscript
+36
View File
@@ -0,0 +1,36 @@
widgets_src = [
"qt/offroad/sunnypilot/custom_offsets_settings.cc",
"qt/offroad/sunnypilot/display_settings.cc",
"qt/offroad/sunnypilot/lane_change_settings.cc",
"qt/offroad/sunnypilot/mads_settings.cc",
"qt/offroad/sunnypilot/models_fetcher.cc",
"qt/offroad/sunnypilot/monitoring_settings.cc",
"qt/offroad/sunnypilot/osm_settings.cc",
"qt/offroad/sunnypilot/software_settings_sp.cc",
"qt/offroad/sunnypilot/speed_limit_control_settings.cc",
"qt/offroad/sunnypilot/speed_limit_policy_settings.cc",
"qt/offroad/sunnypilot/speed_limit_warning_settings.cc",
"qt/offroad/sunnypilot/sunnypilot_settings.cc",
"qt/offroad/sunnypilot/sunnylink_settings.cc",
"qt/offroad/sunnypilot/trips_settings.cc",
"qt/offroad/sunnypilot/vehicle_settings.cc",
"qt/offroad/sunnypilot/visuals_settings.cc",
"qt/widgets/sunnypilot/drive_stats.cc"
]
network_src = [
"qt/network/sunnylink/services/base_device_service.cc",
"qt/network/sunnylink/services/role_service.cc",
"qt/network/sunnylink/services/user_service.cc",
"qt/network/sunnylink/sunnylink_client.cc"
]
qt_src = [
"qt/onroad_settings.cc",
"qt/onroad_settings_panel.cc"
]
sp_widgets_src = widgets_src + network_src
sp_qt_src = qt_src
Export('sp_widgets_src', 'sp_qt_src')