mawei/sunnypilot
1
0
Fork 0
mirror of https://github.com/sunnypilot/sunnypilot.git synced 2026-10-04 18:43:42 +08:00
Code Issues Packages Projects Releases Wiki Activity

ui: only show overriding set speed states when gas pressed (#63)

Browse Source
This commit is contained in:
Jason Wen
2023-03-27 02:15:02 -04:00
committed by GitHub
parent 9c3bceb9f3
commit 989b8b251d
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
selfdrive/ui/qt/onroad.cc
+4 -3
View File
@@ -424,6 +424,7 @@ void AnnotatedCameraWidget::updateState(const UIState &s) {
setProperty("status", s.status);
setProperty("steerOverride", car_state.getSteeringPressed());
setProperty("gasOverride", car_state.getGasPressed());
setProperty("latActive", car_control.getLatActive());
setProperty("madsEnabled", car_state.getMadsEnabled());
@@ -598,7 +599,7 @@ void AnnotatedCameraWidget::drawHud(QPainter &p) {
if (is_cruise_set) {
if (status == STATUS_DISENGAGED) {
p.setPen(whiteColor());
} else if (status == STATUS_OVERRIDE) {
} else if (status == STATUS_OVERRIDE && gasOverride) {
p.setPen(QColor(0x91, 0x9b, 0x95, 0xff));
} else if (speedLimitSLC > 0) {
p.setPen(interpColor(
@@ -626,13 +627,13 @@ void AnnotatedCameraWidget::drawHud(QPainter &p) {
// Draw set speed
if (is_cruise_set) {
if (speedLimitSLC > 0 && status != STATUS_DISENGAGED && status != STATUS_OVERRIDE) {
if (speedLimitSLC > 0 && status != STATUS_DISENGAGED && (status != STATUS_OVERRIDE || !gasOverride)) {
p.setPen(interpColor(
setSpeed,
{speedLimitSLC + 5, speedLimitSLC + 15, speedLimitSLC + 25},
{whiteColor(), QColor(0xff, 0x95, 0x00, 0xff), QColor(0xff, 0x00, 0x00, 0xff)}
));
} else if (speedLimit > 0 && status != STATUS_DISENGAGED && status != STATUS_OVERRIDE) {
} else if (speedLimit > 0 && status != STATUS_DISENGAGED && (status != STATUS_OVERRIDE || !gasOverride)) {
p.setPen(interpColor(
setSpeed,
{speedLimit + 5, speedLimit + 15, speedLimit + 25},
selfdrive/ui/qt/onroad.h
+2
View File
@@ -70,6 +70,7 @@ class AnnotatedCameraWidget : public CameraWidget {
Q_PROPERTY(int status MEMBER status);
Q_PROPERTY(bool steerOverride MEMBER steerOverride);
Q_PROPERTY(bool gasOverride MEMBER gasOverride);
Q_PROPERTY(bool latActive MEMBER latActive);
Q_PROPERTY(bool madsEnabled MEMBER madsEnabled);
@@ -194,6 +195,7 @@ private:
bool wide_cam_requested = false;
bool steerOverride = false;
bool gasOverride = false;
bool latActive = false;
bool madsEnabled = false;