Skip to content

Send Message to hud when message change #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
leonunix wants to merge 2 commits into
base: WiFi
Choose a base branch
from
Open

Send Message to hud when message change #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9dde24f
fix send hud form
Nov 12, 2018
0311669
fix format
Nov 12, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 16 additions & 8 deletions mazda/callbacks.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -680,6 +680,7 @@ void MazdaEventCallbacks::HandleNaviTurn(IHUConnectionThreadInterface& stream, c
changed = 1;
}
if(changed){
navi_data->changed = 1;
navi_data->previous_msg = navi_data->previous_msg+1;
if(navi_data->previous_msg == 8){
navi_data->previous_msg = 1;
Expand All @@ -689,16 +690,23 @@ void MazdaEventCallbacks::HandleNaviTurn(IHUConnectionThreadInterface& stream, c
}

void MazdaEventCallbacks::HandleNaviTurnDistance(IHUConnectionThreadInterface& stream, const HU::NAVDistanceMessage &request){
hudmutex.lock();
if(request.distance() > 1000){
hudmutex.lock();
if(request.distance() > 1000){
int now_distance = request.distance()/100;
if(now_distance != navi_data->distance){
navi_data->distance_unit = 3;
navi_data->distance = request.distance()/100;
navi_data->distance = now_distance;
navi_data->changed = 1;
}
else{
}
else{
int now_distance = (((request.distance() + 5) / 10)*10)*10;
if(now_distance != navi_data->distance){
navi_data->distance_unit = 1;
navi_data->distance = (((request.distance() + 5) / 10)*10);
navi_data->distance = navi_data->distance*10;
navi_data->distance = now_distance;
navi_data->changed = 1;
}
navi_data->time_until = request.time_until();
hudmutex.unlock();
}
navi_data->time_until = request.time_until();
hudmutex.unlock();
}
19 changes: 10 additions & 9 deletions mazda/hud/hud.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,17 +88,18 @@ void hud_thread_func(std::condition_variable& quitcv, std::mutex& quitmutex, std
guidancePointData._1 = navi_data->event_name;
guidancePointData._2 = navi_data->previous_msg;



try
{
vbsnavi_client->SetHUDDisplayMsgReq(hudDisplayMsg);
tmc_client->SetHUD_Display_Msg2(guidancePointData);
}
catch(DBus::Error& error)
{
if(navi_data->changed){
try
{
vbsnavi_client->SetHUDDisplayMsgReq(hudDisplayMsg);
tmc_client->SetHUD_Display_Msg2(guidancePointData);
}
catch(DBus::Error& error)
{
loge("DBUS: hud_send failed %s: %s\n", error.name(), error.message());
return;
}
navi_data->changed = 0;
}
hudmutex.unlock();
{
Expand Down
1 change: 1 addition & 0 deletions mazda/hud/hud.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ struct NaviData {
uint8_t distance_unit;
int32_t time_until;
uint8_t previous_msg;
uint8_t changed;
};

enum NaviTurns: uint32_t {
Expand Down