mawei/StarPilot
1
0
Fork 0
mirror of https://github.com/firestar5683/StarPilot.git synced 2026-07-01 19:42:07 +08:00
Code Issues Packages Projects Releases Wiki Activity

Don't show "no gps" when ubloxd is not running (#1479)

Browse Source 
* dont show no gps when ubloxd is not running

* Just s

* Dropped that

* Connected is too long
old-commit-hash: f7c8707bf854f40c54d3c0b9676e26584b95103c
This commit is contained in:
Willem Melching
2020-05-08 21:04:55 -07:00
committed by GitHub
parent d7fcbc9c4b
commit 83d02c8c4a
2 changed files with 15 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
selfdrive/ui/sidebar.cc
+10 -5
View File
@@ -144,12 +144,17 @@ static void ui_draw_sidebar_panda_metric(UIState *s) {
panda_severity = 2;
snprintf(panda_message_str, sizeof(panda_message_str), "%s", "NO\nVEHICLE");
} else {
if (s->scene.satelliteCount < 6) {
panda_severity = 1;
snprintf(panda_message_str, sizeof(panda_message_str), "%s", "VEHICLE\nNO GPS");
} else if (s->scene.satelliteCount >= 6) {
if (s->started){
if (s->scene.satelliteCount < 6) {
panda_severity = 1;
snprintf(panda_message_str, sizeof(panda_message_str), "%s", "VEHICLE\nNO GPS");
} else if (s->scene.satelliteCount >= 6) {
panda_severity = 0;
snprintf(panda_message_str, sizeof(panda_message_str), "%s", "VEHICLE\nGOOD GPS");
}
} else {
panda_severity = 0;
snprintf(panda_message_str, sizeof(panda_message_str), "%s", "VEHICLE\nGOOD GPS");
snprintf(panda_message_str, sizeof(panda_message_str), "%s", "VEHICLE\nONLINE");
}
}
selfdrive/ui/ui.cc
+5 -6
View File
@@ -374,7 +374,7 @@ void handle_message(UIState *s, Message* msg) {
memcpy(amsg.begin(), msg->getData(), msg->getSize());
capnp::FlatArrayMessageReader cmsg(amsg);
cereal::Event::Reader event = cmsg.getRoot<cereal::Event>();
auto which = event.which();
UIScene &scene = s->scene;
if (which == cereal::Event::CONTROLS_STATE && s->started) {
@@ -440,7 +440,7 @@ void handle_message(UIState *s, Message* msg) {
}
} else if (which == cereal::Event::RADAR_STATE) {
auto data = event.getRadarState();
auto leaddatad = data.getLeadOne();
scene.lead_status = leaddatad.getStatus();
scene.lead_d_rel = leaddatad.getDRel();
@@ -484,7 +484,7 @@ void handle_message(UIState *s, Message* msg) {
scene.map_valid = event.getLiveMapData().getMapValid();
} else if (which == cereal::Event::THERMAL) {
auto data = event.getThermal();
scene.networkType = data.getNetworkType();
scene.networkStrength = data.getNetworkStrength();
scene.batteryPercent = data.getBatteryPercent();
@@ -492,7 +492,7 @@ void handle_message(UIState *s, Message* msg) {
scene.freeSpace = data.getFreeSpace();
scene.thermalStatus = data.getThermalStatus();
scene.paTemp = data.getPa0();
s->thermal_started = data.getStarted();
} else if (which == cereal::Event::UBLOX_GNSS) {
auto data = event.getUbloxGnss();
@@ -892,7 +892,7 @@ int main(int argc, char* argv[]) {
// light sensor scaling params
const int LEON = is_leon();
float brightness_b, brightness_m;
float brightness_b, brightness_m;
int result = read_param_float(&brightness_b, "BRIGHTNESS_B", true);
result += read_param_float(&brightness_m, "BRIGHTNESS_M", true);
@@ -962,7 +962,6 @@ int main(int argc, char* argv[]) {
// Visiond process is just stopped, force a redraw to make screen blank again.
if (!s->started) {
s->scene.satelliteCount = -1;
s->scene.uilayout_sidebarcollapsed = false;
update_offroad_layout_state(s);
ui_draw(s);