Skip to content

Commit 1cfb398

Browse files
authored
fix hud display will be clear sometimes. (#185)
1 parent 54b38d6 commit 1cfb398

3 files changed

Lines changed: 14 additions & 4 deletions

File tree

mazda/callbacks.cpp

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -758,11 +758,19 @@ void MazdaEventCallbacks::HandleNaviTurnDistance(IHUConnectionThreadInterface& s
758758
navi_data->distance_unit = now_unit;
759759
navi_data->distance = now_distance;
760760
navi_data->changed = 1;
761+
navi_data->previous_msg = navi_data->previous_msg+1;
762+
if (navi_data->previous_msg == 8) {
763+
navi_data->previous_msg = 1;
764+
}
761765
}
762766

763767
if (navi_data->time_until != request.time_until()) {
764768
navi_data->time_until = request.time_until();
765769
navi_data->changed = 1;
770+
navi_data->previous_msg = navi_data->previous_msg+1;
771+
if (navi_data->previous_msg == 8) {
772+
navi_data->previous_msg = 1;
773+
}
766774
}
767775

768776
hudmutex.unlock();
@@ -813,4 +821,4 @@ void logUnknownFields(const ::google::protobuf::UnknownFieldSet& fields) {
813821
break;
814822
}
815823
}
816-
}
824+
}

mazda/hud/hud.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ uint8_t turns[][3] = {
3535
{NaviTurns::SHARP_LEFT,NaviTurns::SHARP_RIGHT,0}, //TURN_SHARP_TURN
3636
{NaviTurns::U_TURN_LEFT, NaviTurns::U_TURN_RIGHT,0}, //TURN_U_TURN
3737
{NaviTurns::LEFT,NaviTurns::RIGHT,NaviTurns::STRAIGHT}, //TURN_ON_RAMP
38-
{NaviTurns::LEFT,NaviTurns::RIGHT,NaviTurns::STRAIGHT}, //TURN_OFF_RAMP
38+
{NaviTurns::OFF_RAMP_LEFT,NaviTurns::OFF_RAMP_RIGHT,NaviTurns::STRAIGHT}, //TURN_OFF_RAMP
3939
{NaviTurns::FORK_LEFT, NaviTurns::FORK_RIGHT, 0}, //TURN_FORK
4040
{NaviTurns::MERGE_LEFT, NaviTurns::MERGE_RIGHT, 0}, //TURN_MERGE
4141
{0,0,0}, //TURN_ROUNDABOUT_ENTER
@@ -161,4 +161,4 @@ bool hud_installed()
161161
loge("DBUS: GetHUDIsInstalled failed %s: %s\n", error.name(), error.message());
162162
return(false);
163163
}
164-
}
164+
}

mazda/hud/hud.h

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,9 @@ enum NaviTurns: uint32_t {
5050
FORK_LEFT = 15,
5151
FORK_RIGHT = 14,
5252
MERGE_LEFT = 16,
53-
MERGE_RIGHT = 17
53+
MERGE_RIGHT = 17,
54+
OFF_RAMP_LEFT = 7,
55+
OFF_RAMP_RIGHT = 30
5456
};
5557

5658
void hud_start();

0 commit comments

Comments
 (0)