Skip to content

Commit 5527c16

Browse files
authored
incorrect status bar fixes [CPP-927] (#1027)
1 parent 3c9f2c2 commit 5527c16

File tree

3 files changed

+9
-8
lines changed

3 files changed

+9
-8
lines changed

console_backend/src/status_bar.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -274,6 +274,7 @@ impl StatusBar {
274274
.heartbeat_data
275275
.lock()
276276
.expect(HEARTBEAT_LOCK_MUTEX_FAILURE);
277+
shared_data.ins_status_string = format!("0x{:<01x}", msg.flags);
277278
shared_data.ins_status_flags = ins_status_flags;
278279
shared_data.last_ins_status_receipt_time = last_ins_status_receipt_time;
279280
}

console_backend/src/tabs/solution_tab/solution_position_tab.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -379,6 +379,8 @@ impl SolutionPositionTab {
379379
/// - `msg`: The MsgInsStatus to extract data from.
380380
pub fn handle_ins_status(&mut self, msg: MsgInsStatus) {
381381
self.ins_status_flags = msg.flags;
382+
self.table
383+
.insert(INS_STATUS, format!("0x{:<01x}", self.ins_status_flags));
382384
self.last_ins_status_receipt_time = Instant::now();
383385
let mut shared_data = self.shared_state.lock();
384386
shared_data.solution_tab.position_tab.ins_status_flags = msg.flags;
@@ -396,8 +398,6 @@ impl SolutionPositionTab {
396398
let dops_fields = msg.fields();
397399
self.table
398400
.insert(DOPS_FLAGS, format!("0x{:<03x}", dops_fields.flags));
399-
self.table
400-
.insert(INS_STATUS, format!("0x{:<01x}", self.ins_status_flags));
401401
if dops_fields.flags != 0 {
402402
self.table.insert(PDOP, dops_into_string(dops_fields.pdop));
403403
self.table.insert(GDOP, dops_into_string(dops_fields.gdop));

resources/StatusBar.qml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@ import SwiftConsole
2929

3030
Rectangle {
3131
property string position: Constants.statusBar.defaultValue
32-
property string rtk: Constants.statusBar.defaultValue
33-
property string ins: Constants.statusBar.defaultValue
32+
property string rtk_val: Constants.statusBar.defaultValue
33+
property string ins_val: Constants.statusBar.defaultValue
3434
property int satellites: -1
3535
property real correctionAge: -1
3636
property string antennaStatus: Constants.statusBar.defaultValue
@@ -52,8 +52,8 @@ Rectangle {
5252
status_bar_model.fill_data(statusBarData);
5353
if (statusBarData.title) {
5454
position = statusBarData.pos;
55-
rtk = statusBarData.rtk;
56-
ins = statusBarData.ins;
55+
rtk_val = statusBarData.rtk;
56+
ins_val = statusBarData.ins;
5757
satellites = statusBarData.solid_connection ? statusBarData.sats : -1;
5858
correctionAge = statusBarData.corr_age;
5959
antennaStatus = statusBarData.antenna_status;
@@ -77,10 +77,10 @@ Rectangle {
7777
"valueText": position
7878
}, {
7979
"labelText": Constants.statusBar.rtkLabel,
80-
"valueText": rtk
80+
"valueText": rtk_val
8181
}, {
8282
"labelText": Constants.statusBar.insLabel,
83-
"valueText": ins
83+
"valueText": ins_val
8484
}, {
8585
"labelText": Constants.statusBar.satsLabel,
8686
"valueText": satellites < 0 ? Constants.statusBar.defaultValue : satellites

0 commit comments

Comments
 (0)