mawei/dragonpilot
1
0
Fork 0
mirror of https://github.com/dragonpilot/dragonpilot.git synced 2026-08-08 01:35:40 +08:00
Code Issues Packages Projects Releases Wiki Activity

dragonpilot 2023-04-01T09:36:15 for EON/C2

Browse Source 
version: dragonpilot v0.9.2 beta for EON/C2
date: 2023-04-01T09:36:15
dp-dev(priv2) master commit: 29bbbec9ef69d7527f4715114749c18d4e22768c
This commit is contained in:
Dragonpilot Team
2023-04-01 09:33:48 +00:00
parent d244592a40
commit ca1186a7bf
45 changed files with 200 additions and 135 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.gitignore
+1 -1
View File
@@ -82,7 +82,7 @@ build/
poetry.toml
selfdrive/ui/_ui_nonav
*events.po~
*.po~
selfdrive/loggerd/bootlog
selfdrive/loggerd/loggerd
selfdrive/proclogd/proclogd
CHANGELOGS_c2.md
+2
View File
@@ -16,7 +16,9 @@ dragonpilot [Latest] - EON/C2 Release
* TWEAK: e2e Lateral will display lanelines in white.
* TWEAK: Updated VisionIPC to match current version.
* TWEAK: DM reverted to 0.8.13 model and algorithm.
* TWEAK: E2E Initial speed matches ACC initial speed. (105 -> 40)
* FIXED: Fixed Reverse message not showing issue.
* FIXED: Honda ALKA not working. @loveloveses
dragonpilot 2023.02.08 - EON/C2 Release
========================
cereal/visionipc/visionipc_pyx.so
BIN
View File
Binary file not shown.
common/dp_conf.py
+1 -1
View File
@@ -197,7 +197,7 @@ confs = [
# {'name': 'dp_ftpd', 'default': False, 'type': 'Bool', 'conf_type': ['param']},
{'name': 'dp_lateral_version', 'default': 0, 'min': 0, 'max': 2, 'type': 'UInt8', 'conf_type': ['param']},
{'name': 'dp_lateral_steer_rate_cost', 'default': 1.0, 'min': 0.5, 'max': 2.0, 'type': 'Float32', 'conf_type': ['param']},
{'name': 'dp_upload_ignored', 'default': False, 'type': 'Bool', 'conf_type': ['param']},
{'name': 'dp_upload_ignored', 'default': True, 'type': 'Bool', 'conf_type': ['param']},
{'name': 'local_trip_count_total', 'default': 0.0, 'type': 'Float32', 'conf_type': ['param']},
{'name': 'local_trip_meter_total', 'default': 0.0, 'type': 'Float32', 'conf_type': ['param']},
{'name': 'local_trip_min_total', 'default': 0.0, 'type': 'Float32', 'conf_type': ['param']},
common/params_pyx.so
BIN
View File
Binary file not shown.
common/version.h
+1 -1
View File
@@ -1 +1 @@
#define COMMA_VERSION "2023.03.30"
#define COMMA_VERSION "2023.04.01"
opendbc/can/libdbc.so
BIN
View File
Binary file not shown.
panda/board/obj/bootstub.panda.bin
BIN
View File
Binary file not shown.
panda/board/obj/panda.bin.signed
BIN
View File
Binary file not shown.
rednose/helpers/ekf_sym_pyx.so
BIN
View File
Binary file not shown.
selfdrive/assets/locales/ja-JP/LC_MESSAGES/events.mo
BIN
View File
Binary file not shown.
selfdrive/assets/locales/zh-CN/LC_MESSAGES/events.mo
BIN
View File
Binary file not shown.
selfdrive/assets/locales/zh-TW/LC_MESSAGES/events.mo
BIN
View File
Binary file not shown.
selfdrive/boardd/boardd
BIN
View File
Binary file not shown.
selfdrive/car/honda/carcontroller.py
+4 -1
View File
@@ -205,7 +205,10 @@ class CarController:
if pcm_cancel_cmd:
can_sends.append(hondacan.spam_buttons_command(self.packer, CruiseButtons.CANCEL, self.CP.carFingerprint))
elif CC.cruiseControl.resume:
can_sends.append(hondacan.spam_buttons_command(self.packer, CruiseButtons.RES_ACCEL, self.CP.carFingerprint))
if CS.CP.carFingerprint in (CAR.CIVIC_BOSCH, CAR.CRV_HYBRID_BSM) and CS.hud_lead == 1:
can_sends.append(hondacan.spam_buttons_command(self.packer, CruiseButtons.RES_ACCEL, CS.CP.carFingerprint))
else:
can_sends.append(hondacan.spam_buttons_command(self.packer, CruiseButtons.RES_ACCEL, self.CP.carFingerprint))
else:
# Send gas and brake commands.
selfdrive/car/honda/carstate.py
+10 -5
View File
@@ -44,6 +44,7 @@ def get_can_signals(CP, gearbox_msg, main_on_sig_msg):
("MAIN_ON", main_on_sig_msg),
#dp
("ENGINE_RPM", "POWERTRAIN_DATA"),
("HUD_LEAD", "ACC_HUD"),
]
checks = [
@@ -70,7 +71,7 @@ def get_can_signals(CP, gearbox_msg, main_on_sig_msg):
("SCM_BUTTONS", 25),
]
if CP.carFingerprint in (CAR.CRV_HYBRID, CAR.CIVIC_BOSCH_DIESEL, CAR.ACURA_RDX_3G, CAR.HONDA_E):
if CP.carFingerprint in (CAR.CRV_HYBRID, CAR.CIVIC_BOSCH_DIESEL, CAR.ACURA_RDX_3G, CAR.HONDA_E, CAR.CRV_HYBRID_BSM):
checks.append((gearbox_msg, 50))
else:
checks.append((gearbox_msg, 100))
@@ -107,7 +108,7 @@ def get_can_signals(CP, gearbox_msg, main_on_sig_msg):
else:
checks.append(("CRUISE_PARAMS", 50))
if CP.carFingerprint in (CAR.ACCORD, CAR.ACCORDH, CAR.CIVIC_BOSCH, CAR.CIVIC_BOSCH_DIESEL, CAR.CRV_HYBRID, CAR.INSIGHT, CAR.ACURA_RDX_3G, CAR.HONDA_E, CAR.CIVIC_2022):
if CP.carFingerprint in (CAR.ACCORD, CAR.ACCORDH, CAR.CIVIC_BOSCH, CAR.CIVIC_BOSCH_DIESEL, CAR.CRV_HYBRID, CAR.INSIGHT, CAR.ACURA_RDX_3G, CAR.HONDA_E, CAR.CIVIC_2022, CAR.CRV_HYBRID_BSM):
signals.append(("DRIVERS_DOOR_OPEN", "SCM_FEEDBACK"))
elif CP.carFingerprint in (CAR.ODYSSEY_CHN, CAR.FREED, CAR.HRV):
signals.append(("DRIVERS_DOOR_OPEN", "SCM_BUTTONS"))
@@ -162,6 +163,7 @@ class CarState(CarStateBase):
self.cruise_setting = 0
self.v_cruise_pcm_prev = 0
self.engineRPM = 0
self.hud_lead = 0
# When available we use cp.vl["CAR_SPEED"]["ROUGH_CAR_SPEED_2"] to populate vEgoCluster
# However, on cars without a digital speedometer this is not always present (HRV, FIT, CRV 2016, ILX and RDX)
@@ -188,7 +190,7 @@ class CarState(CarStateBase):
# panda checks if the signal is non-zero
ret.standstill = cp.vl["ENGINE_DATA"]["XMISSION_SPEED"] < 1e-5
# TODO: find a common signal across all cars
if self.CP.carFingerprint in (CAR.ACCORD, CAR.ACCORDH, CAR.CIVIC_BOSCH, CAR.CIVIC_BOSCH_DIESEL, CAR.CRV_HYBRID, CAR.INSIGHT, CAR.ACURA_RDX_3G, CAR.HONDA_E, CAR.CIVIC_2022):
if self.CP.carFingerprint in (CAR.ACCORD, CAR.ACCORDH, CAR.CIVIC_BOSCH, CAR.CIVIC_BOSCH_DIESEL, CAR.CRV_HYBRID, CAR.INSIGHT, CAR.ACURA_RDX_3G, CAR.HONDA_E, CAR.CIVIC_2022, CAR.CRV_HYBRID_BSM):
ret.doorOpen = bool(cp.vl["SCM_FEEDBACK"]["DRIVERS_DOOR_OPEN"])
elif self.CP.carFingerprint in (CAR.ODYSSEY_CHN, CAR.FREED, CAR.HRV):
ret.doorOpen = bool(cp.vl["SCM_BUTTONS"]["DRIVERS_DOOR_OPEN"])
@@ -290,6 +292,9 @@ class CarState(CarStateBase):
ret.cruiseState.enabled = cp.vl["POWERTRAIN_DATA"]["ACC_STATUS"] != 0
ret.cruiseState.available = bool(cp.vl[self.main_on_sig_msg]["MAIN_ON"])
# afa feature
self.hud_lead = cp.vl["ACC_HUD"]['HUD_LEAD']
# Gets rid of Pedal Grinding noise when brake is pressed at slow speeds for some models
if self.CP.carFingerprint in (CAR.PILOT, CAR.RIDGELINE):
if ret.brake > 0.1:
@@ -318,7 +323,7 @@ class CarState(CarStateBase):
if self.CP.carFingerprint in HONDA_BOSCH_RADARLESS:
self.lkas_hud = cp_cam.vl["LKAS_HUD"]
if self.CP.enableBsm and self.CP.carFingerprint in (CAR.CRV_5G, ):
if self.CP.enableBsm and self.CP.carFingerprint in (CAR.CRV_5G, CAR.CRV_HYBRID_BSM,):
# BSM messages are on B-CAN, requires a panda forwarding B-CAN messages to CAN 0
# more info here: https://github.com/commaai/openpilot/pull/1867
ret.leftBlindspot = cp_body.vl["BSM_STATUS_LEFT"]["BSM_ALERT"] == 1
@@ -365,7 +370,7 @@ class CarState(CarStateBase):
@staticmethod
def get_body_can_parser(CP):
if CP.enableBsm and CP.carFingerprint == CAR.CRV_5G:
if CP.enableBsm and CP.carFingerprint in (CAR.CRV_5G, CAR.CRV_HYBRID_BSM,):
signals = [("BSM_ALERT", "BSM_STATUS_RIGHT"),
("BSM_ALERT", "BSM_STATUS_LEFT")]
selfdrive/car/honda/interface.py
+3 -3
View File
@@ -61,7 +61,7 @@ class CarInterface(CarInterfaceBase):
if candidate in HONDA_BOSCH:
ret.pcmCruise = True
if candidate == CAR.CRV_5G:
if candidate in (CAR.CRV_5G, CAR.CRV_HYBRID_BSM):
ret.enableBsm = 0x12f8bfa7 in fingerprint[0]
# Detect Bosch cars with new HUD msgs
@@ -173,7 +173,7 @@ class CarInterface(CarInterfaceBase):
tire_stiffness_factor = 0.677
ret.wheelSpeedFactor = 1.025
elif candidate == CAR.CRV_HYBRID:
elif candidate in (CAR.CRV_HYBRID, CAR.CRV_HYBRID_BSM):
ret.mass = 1667. + STD_CARGO_KG # mean of 4 models in kg
ret.wheelbase = 2.66
ret.centerToFront = ret.wheelbase * 0.41
@@ -322,7 +322,7 @@ class CarInterface(CarInterfaceBase):
elif candidate == CAR.CRV_5G:
ret.lateralParams.torqueBP, ret.lateralParams.torqueV = [[0, 2560, 10000], [0, 2560, 3840]] #tuned by Titanminer (8000)
ret.lateralTuning.pid.kpV, ret.lateralTuning.pid.kiV = [[0.21], [0.07]]
elif candidate == CAR.CRV_HYBRID:
elif candidate in (CAR.CRV_HYBRID, CAR.CRV_HYBRID_BSM):
ret.lateralParams.torqueBP, ret.lateralParams.torqueV = [[0x0, 0xB5, 0x161, 0x2D6, 0x4C0, 0x70D, 0xC42, 0x1058, 0x2C00], [0x0, 0x160, 0x1F0, 0x2E0, 0x378, 0x4A0, 0x5F0, 0x804, 0xF00]]
ret.lateralTuning.pid.kpV, ret.lateralTuning.pid.kiV = [[0.21], [0.07]] #still needs to finish tuning for the new car
ret.lateralTuning.pid.kf = 0.00004
selfdrive/car/honda/values.py
+4 -1
View File
@@ -84,6 +84,7 @@ class CAR:
CRV_5G = "HONDA CR-V 2017"
CRV_EU = "HONDA CR-V EU 2016"
CRV_HYBRID = "HONDA CR-V HYBRID 2019"
CRV_HYBRID_BSM = "HONDA CR-V HYBRID 2019 w/ BSM"
FIT = "HONDA FIT 2018"
FREED = "HONDA FREED 2020"
HRV = "HONDA HRV 2019"
@@ -198,6 +199,7 @@ FW_QUERY_CONFIG = FwQueryConfig(
)
FW_VERSIONS = {
CAR.CRV_HYBRID_BSM: {(Ecu.vsa, 0xfff, None): [b'\x00']},
CAR.ODYSSEY_HYBRID: {(Ecu.vsa, 0xfff, None): [b'\x00']},
CAR.ACCORD: {
(Ecu.programmedFuelInjection, 0x18da10f1, None): [
@@ -1526,6 +1528,7 @@ DBC = {
CAR.CRV_5G: dbc_dict('honda_crv_ex_2017_can_generated', None, body_dbc='honda_crv_ex_2017_body_generated'),
CAR.CRV_EU: dbc_dict('honda_crv_executive_2016_can_generated', 'acura_ilx_2016_nidec'),
CAR.CRV_HYBRID: dbc_dict('honda_accord_2018_can_generated', None),
CAR.CRV_HYBRID_BSM: dbc_dict('honda_accord_2018_can_generated', None, body_dbc='honda_crv_ex_2017_body_generated'),
CAR.FIT: dbc_dict('honda_fit_ex_2018_can_generated', 'acura_ilx_2016_nidec'),
CAR.FREED: dbc_dict('honda_fit_ex_2018_can_generated', 'acura_ilx_2016_nidec'),
CAR.HRV: dbc_dict('honda_fit_ex_2018_can_generated', 'acura_ilx_2016_nidec'),
@@ -1549,6 +1552,6 @@ HONDA_NIDEC_ALT_PCM_ACCEL = {CAR.ODYSSEY}
HONDA_NIDEC_ALT_SCM_MESSAGES = {CAR.ACURA_ILX, CAR.ACURA_RDX, CAR.CRV, CAR.CRV_EU, CAR.FIT, CAR.FREED, CAR.HRV, CAR.ODYSSEY_CHN,
CAR.ODYSSEY_HYBRID, CAR.PILOT, CAR.RIDGELINE}
HONDA_BOSCH = {CAR.ACCORD, CAR.ACCORDH, CAR.CIVIC_BOSCH, CAR.CIVIC_BOSCH_DIESEL, CAR.CRV_5G,
CAR.CRV_HYBRID, CAR.INSIGHT, CAR.ACURA_RDX_3G, CAR.HONDA_E, CAR.CIVIC_2022}
CAR.CRV_HYBRID, CAR.INSIGHT, CAR.ACURA_RDX_3G, CAR.HONDA_E, CAR.CIVIC_2022, CAR.CRV_HYBRID_BSM}
HONDA_BOSCH_ALT_BRAKE_SIGNAL = {CAR.ACCORD, CAR.CRV_5G, CAR.ACURA_RDX_3G}
HONDA_BOSCH_RADARLESS = {CAR.CIVIC_2022}
selfdrive/controls/controlsd.py
+1 -1
View File
@@ -550,7 +550,7 @@ class Controls:
# dp - local trip log
self.local_trip_meter_total += CS.vEgo * DT_CTRL
if not self.local_trip_count_added:
if self.distance_traveled > 0:
if self.local_trip_meter_total > 0:
put_nonblocking("local_trip_count_total", str(float(self.params.get("local_trip_count_total").decode('utf-8')) + 1))
self.local_trip_count_added = True
# every 30 secs
selfdrive/controls/lib/drive_helpers.py
+2 -1
View File
@@ -5,6 +5,7 @@ from common.conversions import Conversions as CV
from common.numpy_fast import clip, interp
from common.realtime import DT_MDL
from selfdrive.modeld.constants import T_IDXS
from system.hardware import TICI
# WARNING: this value was determined based on the model's training distribution,
# model predictions above this speed can be unpredictable
@@ -13,7 +14,7 @@ V_CRUISE_MIN = 8
V_CRUISE_MAX = 145
V_CRUISE_UNSET = 255
V_CRUISE_INITIAL = 40
V_CRUISE_INITIAL_EXPERIMENTAL_MODE = 105
V_CRUISE_INITIAL_EXPERIMENTAL_MODE = V_CRUISE_INITIAL if not TICI else 105
IMPERIAL_INCREMENT = 1.6 # should be CV.MPH_TO_KPH, but this causes rounding errors
MIN_SPEED = 1.0
selfdrive/controls/lib/vision_turn_controller.py
+1
View File
@@ -252,6 +252,7 @@ class VisionTurnController():
self.state = VisionTurnControllerState.disabled
def _update_solution(self):
a_target = self._a_ego
# DISABLED
if self.state == VisionTurnControllerState.disabled:
# when not overshooting, calculate v_turn as the speed at the prediction horizon when following
selfdrive/locationd/locationd
BIN
View File
Binary file not shown.
selfdrive/loggerd/bootlog
BIN
View File
Binary file not shown.
selfdrive/loggerd/loggerd
BIN
View File
Binary file not shown.
selfdrive/modeld/_dmonitoringmodeld
BIN
View File
Binary file not shown.
selfdrive/modeld/_modeld
BIN
View File
Binary file not shown.
selfdrive/proclogd/proclogd
BIN
View File
Binary file not shown.
selfdrive/ui/_ui
BIN
View File
Binary file not shown.
selfdrive/ui/_ui_nonav
BIN
View File
Binary file not shown.
selfdrive/ui/qt/spinner
BIN
View File
Binary file not shown.
selfdrive/ui/qt/text
BIN
View File
Binary file not shown.
selfdrive/ui/soundd/_soundd
BIN
View File
Binary file not shown.
selfdrive/ui/translations/main_de.ts
+17 -7
View File
@@ -455,13 +455,6 @@ More linear steering experience.</source>
<source>Always On Lateral</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Use at your own risk! Your drive will not upload but you can find them under /data/media/0/fakedata you will not be ban but we just don&apos;t upload since comma does not use data from fork but it will be stored locally.
1 = Stock Long
2 = OP Long
Reboot required.</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>OFF</source>
<translation type="unfinished"></translation>
@@ -547,6 +540,23 @@ Your Vehicle may not support all the options, YMMV.</source>
<source>This feature will let you use alternative lateral controller at higher set speed.</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Use at your own risk!
1 = Stock Long
2 = OP Long
Reboot required.</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Manual Lane Change</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Enabling this will allow lane change manually when blinker is on.
NOTES: Once LCA/ALCA is enabled, those settings will override manual lane change.
e.g. If you have this option on and LCA at 20km/hr, ALCA at 40km/hr, speed below 20km/hr will be manual lane change.<byte value="x8"/> If you disable LCA/ALCA and have this option on, manual lane change will apply to ALL SPEED.</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>DPGeneralPanel</name>
selfdrive/ui/translations/main_ja.ts
+17 -7
View File
@@ -455,13 +455,6 @@ More linear steering experience.</source>
<source>Enable Max Ctrl Speed Check</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Use at your own risk! Your drive will not upload but you can find them under /data/media/0/fakedata you will not be ban but we just don&apos;t upload since comma does not use data from fork but it will be stored locally.
1 = Stock Long
2 = OP Long
Reboot required.</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Enable this if you wish to use following dist. mode in DE2E.</source>
<translation type="unfinished"></translation>
@@ -547,6 +540,23 @@ Your Vehicle may not support all the options, YMMV.</source>
<source>This feature will let you use alternative lateral controller at higher set speed.</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Use at your own risk!
1 = Stock Long
2 = OP Long
Reboot required.</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Manual Lane Change</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Enabling this will allow lane change manually when blinker is on.
NOTES: Once LCA/ALCA is enabled, those settings will override manual lane change.
e.g. If you have this option on and LCA at 20km/hr, ALCA at 40km/hr, speed below 20km/hr will be manual lane change.<byte value="x8"/> If you disable LCA/ALCA and have this option on, manual lane change will apply to ALL SPEED.</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>DPGeneralPanel</name>
selfdrive/ui/translations/main_ko.ts
+17 -7
View File
@@ -455,13 +455,6 @@ More linear steering experience.</source>
<source>Enable Max Ctrl Speed Check</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Use at your own risk! Your drive will not upload but you can find them under /data/media/0/fakedata you will not be ban but we just don&apos;t upload since comma does not use data from fork but it will be stored locally.
1 = Stock Long
2 = OP Long
Reboot required.</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Enable this if you wish to use following dist. mode in DE2E.</source>
<translation type="unfinished"></translation>
@@ -547,6 +540,23 @@ Your Vehicle may not support all the options, YMMV.</source>
<source>This feature will let you use alternative lateral controller at higher set speed.</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Use at your own risk!
1 = Stock Long
2 = OP Long
Reboot required.</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Manual Lane Change</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Enabling this will allow lane change manually when blinker is on.
NOTES: Once LCA/ALCA is enabled, those settings will override manual lane change.
e.g. If you have this option on and LCA at 20km/hr, ALCA at 40km/hr, speed below 20km/hr will be manual lane change.<byte value="x8"/> If you disable LCA/ALCA and have this option on, manual lane change will apply to ALL SPEED.</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>DPGeneralPanel</name>
selfdrive/ui/translations/main_pt-BR.qm
BIN
View File
Binary file not shown.
selfdrive/ui/translations/main_pt-BR.ts
+17 -7
View File
@@ -455,13 +455,6 @@ More linear steering experience.</source>
<source>Enable Max Ctrl Speed Check</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Use at your own risk! Your drive will not upload but you can find them under /data/media/0/fakedata you will not be ban but we just don&apos;t upload since comma does not use data from fork but it will be stored locally.
1 = Stock Long
2 = OP Long
Reboot required.</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Enable this if you wish to use following dist. mode in DE2E.</source>
<translation type="unfinished"></translation>
@@ -547,6 +540,23 @@ Your Vehicle may not support all the options, YMMV.</source>
<source>This feature will let you use alternative lateral controller at higher set speed.</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Use at your own risk!
1 = Stock Long
2 = OP Long
Reboot required.</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Manual Lane Change</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Enabling this will allow lane change manually when blinker is on.
NOTES: Once LCA/ALCA is enabled, those settings will override manual lane change.
e.g. If you have this option on and LCA at 20km/hr, ALCA at 40km/hr, speed below 20km/hr will be manual lane change.<byte value="x8"/> If you disable LCA/ALCA and have this option on, manual lane change will apply to ALL SPEED.</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>DPGeneralPanel</name>
selfdrive/ui/translations/main_zh-CHS.ts
+17 -7
View File
@@ -455,13 +455,6 @@ More linear steering experience.</source>
<source>Enable Max Ctrl Speed Check</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Use at your own risk! Your drive will not upload but you can find them under /data/media/0/fakedata you will not be ban but we just don&apos;t upload since comma does not use data from fork but it will be stored locally.
1 = Stock Long
2 = OP Long
Reboot required.</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Enable this if you wish to use following dist. mode in DE2E.</source>
<translation type="unfinished"></translation>
@@ -547,6 +540,23 @@ Your Vehicle may not support all the options, YMMV.</source>
<source>This feature will let you use alternative lateral controller at higher set speed.</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Use at your own risk!
1 = Stock Long
2 = OP Long
Reboot required.</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Manual Lane Change</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Enabling this will allow lane change manually when blinker is on.
NOTES: Once LCA/ALCA is enabled, those settings will override manual lane change.
e.g. If you have this option on and LCA at 20km/hr, ALCA at 40km/hr, speed below 20km/hr will be manual lane change.<byte value="x8"/> If you disable LCA/ALCA and have this option on, manual lane change will apply to ALL SPEED.</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>DPGeneralPanel</name>
selfdrive/ui/translations/main_zh-CHT.qm
BIN
View File
Binary file not shown.
selfdrive/ui/translations/main_zh-CHT.ts
+74 -76
View File
@@ -95,7 +95,7 @@
</message>
<message>
<source>RAM PER</source>
<translation>記憶體 %</translation>
<translation type="vanished">記憶體 %</translation>
</message>
<message>
<source>OFF</source>
@@ -139,14 +139,14 @@
</message>
<message>
<source>Lat Ctrl</source>
<translation>橫向控制器</translation>
<translation>橫向控制</translation>
</message>
</context>
<context>
<name>C2NetworkPanel</name>
<message>
<source>Wi-Fi Settings</source>
<translation>無線網路設定</translation>
<translation>Wi-Fi 設定</translation>
</message>
<message>
<source>OPEN</source>
@@ -321,16 +321,13 @@ Thanks to @TheCrowd</source>
</message>
<message>
<source>Enable Reverse ACC Set speed.</source>
<translation></translation>
<translation>反轉 ACC 定速加減值</translation>
</message>
<message>
<source>Enabling this will reverse set acc short press +5 jump, Long press +1 Jump.
Reboot Required.</source>
<translation></translation>
</message>
<message>
<source>Use Alternative Controller</source>
<translation type="vanished">使用替代控制器</translation>
<translation>啟用此功能將反轉 ACC 定速加減值：短按為 +5 ，長按為+1 。
需要重新啟動。</translation>
</message>
</context>
<context>
@@ -461,7 +458,7 @@ When on close will be dynamic but get closer in traffic. Normal is also dynamic
</message>
<message>
<source>Automatically Turn On and Off End-to-end longitudinal (extremely alpha), this will ignore the stock end-to-end settings</source>
<translation>自動開啟、關閉 E2E 縱向控制 (實驗功能)</translation>
<translation>自動開啟、關閉 E2E 縱向控制 (實驗功能)，這將會忽略 OP 本來的 E2E 設定。</translation>
</message>
<message>
<source>Lateral</source>
@@ -527,14 +524,7 @@ More linear steering experience.</source>
<translation>啟用最高允許控車速度檢查</translation>
</message>
<message>
<source>Use at your own risk! Your drive will not upload but you can find them under /data/media/0/fakedata you will not be ban but we just don&apos;t upload since comma does not use data from fork but it will be stored locally.
1 = Stock Long
2 = OP Long
Reboot required.</source>
<translation></translation>
</message>
<message>
<source>when acc set speed below the setting and there is no lead car, e2e will be turned on automatically.
<source>when acc set speed below the setting and there is no lead car, e2e will be turned on automatically.
1 km/h = 0.62 mph</source>
<translation type="vanished">當車子的定速低於設定值並且在沒有前車的情形下，系統會自動開啟 E2E 模式。
1 km/h = 0.62 mph</translation>
@@ -544,7 +534,7 @@ Reboot required.</source>
<translation> km/h</translation>
</message>
<message>
<source>when lead car is going below the setting, e2e will be turned on automatically.
<source>when lead car is going below the setting, e2e will be turned on automatically.
1 km/h = 0.62 mph</source>
<translation type="vanished">當前車車速於低於設定值時，系統將自動切換至 E2E 模式。
1 km/h = 0.62 mph</translation>
@@ -581,30 +571,31 @@ Reboot required.</source>
<source>Enable this if your vehicles is in VOACC (e.g. Honda Bosch / VAG).</source>
<translation>如果您的車子使用的是 VOACC (例如：Honda Bosch / VAG/HKG)，可以開啟這個功能增進剎車效能。</translation>
</message>
<message>
<source>ALC RoadEdge Detection</source>
<translation>換道路緣檢測</translation>
</message>
<message>
<source>Enabling this will prevent lane change when you are too close to road edge.</source>
<translation>啟用此選項可以防止當您靠近道路邊緣時進行車道變換。</translation>
</message>
<message>
<source>DE2E w/ VOACC</source>
<translation>DE2E 用於 VOACC 下</translation>
</message>
<message>
<source> Camera Offset</source>
<translation type="vanished"> 相機偏移</translation>
<source>When Set Speed Above:</source>
<translation>當定速高於：</translation>
</message>
<message>
<source> Driving Path Offset</source>
<translation type="vanished"> 駕駛路徑偏移</translation>
</message>
<message>
<source> When Set Speed Above:</source>
<translation type="vanished"> 當定速高於：</translation>
</message>
<message>
<source>when acc SET speed above the setting, it will switch to alternative controller.
<source>when acc SET speed above the setting, it will switch to alternative controller.
1 km/h = 0.62 mph</source>
<translation>當定速高於設定的速度時，將會啟用替代的控制器</translation>
<translation>當定速高於設定的速度時，將會啟用替代的控制器
1 km/h = 0.62 mph</translation>
</message>
<message>
<source> Alternative Controller</source>
<translation type="vanished"> 替代控制器</translation>
<source>Alternative Controller</source>
<translation>替代控制器</translation>
</message>
<message>
<source>
@@ -618,32 +609,35 @@ Your Vehicle may not support all the options, YMMV.</source>
你的車型可能無法適用所有的選項。</translation>
</message>
<message>
<source> Use Lanelines</source>
<translation type="vanished"> 使用線道</translation>
<source>Use Alternative Controller</source>
<translation>使用替代控制器</translation>
</message>
<message>
<source>This feature will let you use alternative lateral controller at higher set speed.</source>
<translation>這個功能讓你在較高的定速下使用替代控制器</translation>
</message>
<message>
<source>Use Alternative Controller</source>
<translation>使用替代控制器</translation>
<source>Use at your own risk!
1 = Stock Long
2 = OP Long
Reboot required.</source>
<translation>自行承擔風險！
1 = 使用原廠縱向控制
2 = 使用 OP 縱向控制
需要重新啟動。</translation>
</message>
<message>
<source>ALC RoadEdge Detection</source>
<translation>換道路緣檢測</translation>
<source>Manual Lane Change</source>
<translation>手動換道</translation>
</message>
<message>
<source>Enabling this will prevent lane change when you are too close to road edge.</source>
<translation>啟用此選項可以防止當您靠近道路邊緣時進行車道變換。</translation>
</message>
<message>
<source>When Set Speed Above:</source>
<translation>當定速高於：</translation>
</message>
<message>
<source>Alternative Controller</source>
<translation>替代控制器</translation>
<source>Enabling this will allow lane change manually when blinker is on.
NOTES: Once LCA/ALCA is enabled, those settings will override manual lane change.
e.g. If you have this option on and LCA at 20km/hr, ALCA at 40km/hr, speed below 20km/hr will be manual lane change.<byte value="x8"/> If you disable LCA/ALCA and have this option on, manual lane change will apply to ALL SPEED.</source>
<translation>啟用此功能將允許在開啟方向燈時進行手動變換車道。
注意：啟用 LCA/ALCA 後，這些設置將覆蓋手動變換車道。
例如，如果您啟用此選項並將 LCA 設置為 20 公里/小時，將 ALCA 設置為 40 公里/小時，速度低於 20 公里/小時時將進行手動變換車道。
如果您禁用 LCA/ALCA 並啟用此選項，手動變換車道將套用於所有速度。</translation>
</message>
</context>
<context>
@@ -655,12 +649,11 @@ Your Vehicle may not support all the options, YMMV.</source>
<message>
<source>Adjust your shutdown waiting period.
0 = shutdown immediately.</source>
<translation>調整自動關機時間。
0 = 馬上關機</translation>
<translation>調整自動關機時間。0 = 馬上關機</translation>
</message>
<message>
<source> mins</source>
<translation> 分鐘</translation>
<translation>分鐘</translation>
</message>
<message>
<source>Enable Auto Shutdown</source>
@@ -859,7 +852,11 @@ Use web interface to control it: *http://&lt;device_ip&gt;:8082*.
You will need to apply your own mapbox token at https://www.mapbox.com/.
Internet access from mobile phone (tethering) is required.
Reboot required.</source>
<translation></translation>
<translation>這將讓您使用自己的訪問密鑰來使用導航功能。
使用 Web 介面來控制它：http://&lt;device_ip&gt;:8082。
您需要在 https://www.mapbox.com/ 上申請自己的 Mapbox token。
需要使用手機（共用網路）上網。
需要重新啟動。</translation>
</message>
<message>
<source>Reboot recommended.
@@ -941,7 +938,7 @@ Please note:
</message>
<message>
<source>OpenStreetMap Database Update</source>
<translation>OpenStreetMap 數據庫更新</translation>
<translation>OpenStreetMap 資料庫更新</translation>
</message>
<message>
<source>CHECK</source>
@@ -951,13 +948,13 @@ Please note:
<source>&quot;OpenStreetMap Database Update&quot;
Your device will reboot and perform a database update based on the region you have selected.
Reboot now?</source>
<translation>&quot;OpenStreetMap 數據庫更新&quot;
您的設備將會重新啟動，並基於您選擇的區域執行一次數據庫更新。
<translation>&quot;OpenStreetMap 資料庫更新&quot;
您的設備將重新啟動，並根據您選擇的區域進行資料庫更新。
現在重新啟動嗎？</translation>
</message>
<message>
<source>OpenStreetMap Database</source>
<translation>OpenStreetMap 數據庫</translation>
<translation>OpenStreetMap 資料庫</translation>
</message>
<message>
<source>SELECT</source>
@@ -965,14 +962,15 @@ Reboot now?</source>
</message>
<message>
<source>Select your location</source>
<translation>請選擇您的位置</translation>
<translation>選擇您的地區</translation>
</message>
<message>
<source>&quot;OpenStreetMap Database&quot;
Restart your device to start downloading the selected database. Dragonpilot will only start downloading the database on reboot.
Reboot now?</source>
<translation>&quot;OpenStreetMap 數據庫&quot;
請重新啟動您的設備以開始下載選定的數據庫。Dragonpilot 只會在重新啟動後開始下載數據庫。
<translation>&quot;OpenStreetMap 資料庫&quot;
重新啟動您的設備以開始下載所選的資料庫。
dragonpilot 只會在重新啟動時開始下載資料庫。
現在重新啟動嗎？</translation>
</message>
</context>
@@ -1070,24 +1068,24 @@ Reboot now?</source>
</message>
<message>
<source>Rainbow Path</source>
<translation></translation>
<translation>顯示彩虹路徑</translation>
</message>
<message>
<source>for all the tesla fanboy&apos;s.</source>
<translation></translation>
<translation>給所有的 Tesla 粉絲。</translation>
</message>
<message>
<source>Volume</source>
<translation>音量</translation>
</message>
<message>
<source>LAUNCH</source>
<translation>啟動</translation>
<translation>開啟</translation>
</message>
<message>
<source>Date/Time</source>
<translation>日期/時間</translation>
</message>
<message>
<source>Volume</source>
<translation>提示音量</translation>
</message>
</context>
<context>
<name>DeclinePage</name>
@@ -1281,7 +1279,7 @@ Reboot now?</source>
</message>
<message>
<source>EXPERIMENTAL MODE / DE2E ON </source>
<translation>實驗模式 / DE2E ON </translation>
<translation></translation>
</message>
</context>
<context>
@@ -2042,14 +2040,6 @@ This may take up to a minute.</source>
<source>The driving visualization will transition to the road-facing wide-angle camera at low speeds to better show some turns. The Experimental mode logo will also be shown in the top right corner.</source>
<translation>低速行駛時，將會切換成路側廣角鏡頭，以完整顯示轉彎路徑，右上角將出現實驗模式圖案。</translation>
</message>
<message>
<source>Enable Right-Hand Drive</source>
<translation>啟用右駕模式</translation>
</message>
<message>
<source>Allow openpilot to obey left-hand traffic conventions and perform driver monitoring on right driver seat.</source>
<translation>openpilot 將對右側駕駛進行監控 (但仍遵守靠左駕的交通慣例)。</translation>
</message>
<message>
<source>Experimental mode is currently unavailable on this car since the car&apos;s stock ACC is used for longitudinal control.</source>
<translation>因車輛使用內建ACC系統，無法在本車輛上啟動實驗模式。</translation>
@@ -2066,6 +2056,14 @@ This may take up to a minute.</source>
<source>Enable experimental longitudinal control to allow Experimental mode.</source>
<translation>啟用實驗性縱向控制以使用實驗模式。</translation>
</message>
<message>
<source>Enable Right-Hand Drive</source>
<translation>啟用右駕模式</translation>
</message>
<message>
<source>Allow openpilot to obey left-hand traffic conventions and perform driver monitoring on right driver seat.</source>
<translation>允許 openpilot 遵循左駕的交通規則並在右駕上進行駕駛員監控。</translation>
</message>
</context>
<context>
<name>Updater</name>
selfdrive/ui/update_translations.py
+7 -5
View File
@@ -2,13 +2,15 @@
import argparse
import json
import os
local_gen = False
try:
from common.basedir import BASEDIR
except Exception:
BASEDIR = ""
local_gen = True
UI_DIR = os.path.join(BASEDIR, "selfdrive", "ui")
except ModuleNotFoundError:
UI_DIR = os.path.join("", "selfdrive", "ui")
UI_DIR = os.path.join(BASEDIR, "selfdrive", "ui")
TRANSLATIONS_DIR = os.path.join(UI_DIR, "translations")
LANGUAGES_FILE = os.path.join(TRANSLATIONS_DIR, "languages.json")
@@ -22,7 +24,7 @@ def update_translations(vanish=False, plural_only=None, translations_dir=TRANSLA
for file in translation_files.values():
tr_file = os.path.join(translations_dir, f"{file}.ts")
args = f"lupdate -locations none -recursive {UI_DIR} -ts {tr_file} -I {BASEDIR}"
args = f"lupdate -locations none -recursive {UI_DIR} -ts {tr_file}" + (f"-I {BASEDIR}" if BASEDIR != "" else "")
if vanish:
args += " -no-obsolete"
if file in plural_only:
system/camerad/camerad
BIN
View File
Binary file not shown.
system/loggerd/uploader.py
+4 -4
View File
@@ -77,7 +77,7 @@ class Uploader():
self.immediate_priority = {"qlog": 0, "qlog.bz2": 0, "qcamera.ts": 1}
# dp
self.dp_upload_ignored = Params().get_bool('dp_upload_ignored')
self.update_onced = False
def get_upload_sort(self, name):
if name in self.immediate_priority:
@@ -202,9 +202,9 @@ class Uploader():
self.last_time = time.monotonic() - start_time
self.last_speed = (sz / 1e6) / self.last_time
success = True
if not self.dp_upload_ignored and stat.status_code == 412:
self.dp_upload_ignored = True
Params().put_bool('dp_upload_ignored', True)
if not self.update_onced and stat.status_code != 412:
Params().put_bool('dp_upload_ignored', False)
self.update_onced = True
cloudlog.event("upload_success" if stat.status_code != 412 else "upload_ignored", key=key, fn=fn, sz=sz, network_type=network_type, metered=metered)
else:
success = False
system/sensord/_sensord
BIN
View File
Binary file not shown.
system/ubloxd/ubloxd
BIN
View File
Binary file not shown.