Skip to content

Commit

Permalink
- Change RTKPLOT observation plot colors to make more readable and mo…
Browse files Browse the repository at this point in the history 
…re closely match pre-b34 colors

- Restore example cmd and config files lost in b33f-b34 merge
  • Loading branch information
@rtklibexplorer
rtklibexplorer committed Apr 21, 2021
1 parent 64989ce commit a5b8a54
Show file tree
Hide file tree
Showing 15 changed files with 617 additions and 3 deletions.
20 changes: 19 additions & 1 deletion app/winapp/rtkplot/plotcmn.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,24 @@ void __fastcall TPlot::ShowLegend(UTF8String *msgs)
}
}
}
// show observation legand in status-bar ------------------------------------------------
void __fastcall TPlot::ShowObsLegend(UTF8String *msgs)
{
TLabel *ql[]={QL1,QL2,QL3,QL4,QL5,QL6,QL7};
int i,sel=!BtnSol1->Down&&BtnSol2->Down?1:0;

trace(3,"ShowLegend\n");

for (i=0;i<7;i++) {
if (!msgs||msgs[i]=="") {
ql[i]->Caption=" "; ql[i]->Width=1;
}
else {
ql[i]->Caption=msgs[i];
ql[i]->Font->Color=MColor[sel][3+i-(i>2?5:0)];
}
}
}
// get current cursor position ----------------------------------------------
int __fastcall TPlot::GetCurrentPos(double *rr)
{
Expand Down Expand Up @@ -317,7 +335,7 @@ TColor __fastcall TPlot::ObsColor(const obsd_t *obs, double az, double el)
if (n==0) {
return clBlack;
}
color=MColor[0][6-n];
color=MColor[0][3-n+(n>2?5:0)];
}
else if (sscanf(obstype,"L%1d",&freq)==1) {
freq-=freq>2?2:0; /* L1,L2,L5,L6 ... */
Expand Down
6 changes: 4 additions & 2 deletions app/winapp/rtkplot/plotinfo.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,8 @@ void __fastcall TPlot::UpdateTimeObs(void)
}
}
ShowMsg(msg);
ShowLegend(msgs);
if (msgs[0]==msgs1[0]) ShowObsLegend(msgs);
else ShowLegend(msgs);
}
// update time-information for solution plot --------------------------------
void __fastcall TPlot::UpdateTimeSol(void)
Expand Down Expand Up @@ -172,7 +173,8 @@ void __fastcall TPlot::UpdateInfoObs(void)
}
}
ShowMsg(msg);
ShowLegend(msgs);
if (msgs[0]==msgs1[0]) ShowObsLegend(msgs);
else ShowLegend(msgs);
}
// update statistics-information for solution plot --------------------------
void __fastcall TPlot::UpdateInfoSol(void)
Expand Down
1 change: 1 addition & 0 deletions app/winapp/rtkplot/plotmain.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -544,6 +544,7 @@ class TPlot : public TForm
int __fastcall ExecCmd (AnsiString cmd);
void __fastcall ShowMsg (UTF8String msg);
void __fastcall ShowLegend (UTF8String *msgs);
void __fastcall ShowObsLegend (UTF8String *msgs);
void __fastcall LoadOpt (void);
void __fastcall SaveOpt (void);

Expand Down
42 changes: 42 additions & 0 deletions data/cmd/ubx_m8n_1hz.cmd
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
# Sample rate 1 Hz for setup
!UBX CFG-RATE 1000 1 1

# Configure GPS and GLONASS satellites
!UBX CFG-GNSS 0 32 32 1 0 10 32 0 65537
!UBX CFG-GNSS 0 32 32 1 6 8 16 0 65537

# Set up raw data out for UART and USB
!UBX CFG-MSG 3 15 0 1 0 1 0 0
!UBX CFG-MSG 3 16 0 1 0 1 0 0
!UBX CFG-MSG 1 32 0 1 0 1 0 0

# change NAV5 mode to pedestrian
!UBX CFG-NAV5 1 3 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0

# turn off extra messages default messages
# NMEA GGA
!UBX CFG-MSG 240 0 0 0 0 0 0 0
# NMEA GLL
!UBX CFG-MSG 240 1 0 0 0 0 0 0
# NMEA GSA
!UBX CFG-MSG 240 2 0 0 0 0 0 0
# NMEA GSV
!UBX CFG-MSG 240 3 0 0 0 0 0 0
# NMEA RMC
!UBX CFG-MSG 240 4 0 0 0 0 0 0
# NMEA VTG
!UBX CFG-MSG 240 5 0 0 0 0 0 0
# NMEA ZDA + others
!UBX CFG-MSG 240 8 0 0 0 0 0 0
!UBX CFG-MSG 1 3 0 0 0 0 0 0
!UBX CFG-MSG 1 3 0 0 0 0 0 0
!UBX CFG-MSG 1 6 0 0 0 0 0 0
!UBX CFG-MSG 1 18 0 0 0 0 0 0
!UBX CFG-MSG 1 34 0 0 0 0 0 0
!UBX CFG-MSG 1 48 0 0 0 0 0 0



@
# Sample rate 1 Hz
!UBX CFG-RATE 1000 1 1
45 changes: 45 additions & 0 deletions data/cmd/ubx_m8n_5hz.cmd
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
# Sample rate 1 Hz for setup
!UBX CFG-RATE 1000 1 1

# Configure GPS and GLONASS satellites
!UBX CFG-GNSS 0 32 32 1 0 10 32 0 65537
!UBX CFG-GNSS 0 32 32 1 6 8 16 0 65537

# Set up raw data out for UART and USB
!UBX CFG-MSG 3 15 0 1 0 1 0 0
!UBX CFG-MSG 3 16 0 1 0 1 0 0
!UBX CFG-MSG 1 32 0 1 0 1 0 0

# change NAV5 mode to pedestrian
!UBX CFG-NAV5 1 3 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0

# turn off extra messages default messages
# NMEA GGA
!UBX CFG-MSG 240 0 0 0 0 0 0 0
# NMEA GLL
!UBX CFG-MSG 240 1 0 0 0 0 0 0
# NMEA GSA
!UBX CFG-MSG 240 2 0 0 0 0 0 0
# NMEA GSV
!UBX CFG-MSG 240 3 0 0 0 0 0 0
# NMEA RMC
!UBX CFG-MSG 240 4 0 0 0 0 0 0
# NMEA VTG
!UBX CFG-MSG 240 5 0 0 0 0 0 0
# NMEA ZDA + others
!UBX CFG-MSG 240 8 0 0 0 0 0 0
!UBX CFG-MSG 1 3 0 0 0 0 0 0
!UBX CFG-MSG 1 3 0 0 0 0 0 0
!UBX CFG-MSG 1 6 0 0 0 0 0 0
!UBX CFG-MSG 1 18 0 0 0 0 0 0
!UBX CFG-MSG 1 34 0 0 0 0 0 0
!UBX CFG-MSG 1 48 0 0 0 0 0 0

# Sample rate 5 Hz for data collection
!UBX CFG-RATE 200 1 1




@
!UBX CFG-RATE 1000 1 1
65 changes: 65 additions & 0 deletions data/cmd/ubx_m8t_1hz_uart.cmd
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,65 @@
# Set sample rate low while configuring receiver
!UBX CFG-RATE 1000 1 1

# turn on UBX RXM-RAWX messages on UART
!UBX CFG-MSG 2 21 0 1 0 0 0 0

# turn on UBX RXM-SFRBX messages on UART
!UBX CFG-MSG 2 19 0 1 0 0 0 0

# turn on UBX TIM TM2 messages on UART
!UBX CFG-MSG 13 3 0 1 0 0 0 0

# GNSS system settings
# set GPS 8-16 channels on
!UBX CFG-GNSS 0 32 32 1 0 8 16 0 65537
# set SBAS 1-3 channels on
!UBX CFG-GNSS 0 32 32 1 1 1 3 0 65537
# set Galileo 4-8 channels on
!UBX CFG-GNSS 0 32 32 1 2 4 8 0 65537
# set BeiDou 8-16 channels off
!UBX CFG-GNSS 0 32 32 1 3 8 16 0 0
# set IMES 0-8 channels off
!UBX CFG-GNSS 0 32 32 1 4 0 8 0 0
# set QZSS 0-3 channels off
!UBX CFG-GNSS 0 32 32 1 5 0 3 0 0
# set GLONASS 8-14 channels on
!UBX CFG-GNSS 0 32 32 1 6 8 14 0 65537

# change NAV5 stationary mode to pedestrian
!UBX CFG-NAV5 1 3 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0

# turn off extra messages default messages
# NMEA GGA
!UBX CFG-MSG 240 0 0 0 0 0 0 0
# NMEA GLL
!UBX CFG-MSG 240 1 0 0 0 0 0 0
# NMEA GSA
!UBX CFG-MSG 240 2 0 0 0 0 0 0
# NMEA GSV
!UBX CFG-MSG 240 3 0 0 0 0 0 0
# NMEA RMC
!UBX CFG-MSG 240 4 0 0 0 0 0 0
# NMEA VTG
!UBX CFG-MSG 240 5 0 0 0 0 0 0
# NMEA ZDA
!UBX CFG-MSG 240 8 0 0 0 0 0 0
!UBX CFG-MSG 1 3 0 0 0 0 0 0
!UBX CFG-MSG 1 3 0 0 0 0 0 0
!UBX CFG-MSG 1 6 0 0 0 0 0 0
!UBX CFG-MSG 1 18 0 0 0 0 0 0
!UBX CFG-MSG 1 34 0 0 0 0 0 0
!UBX CFG-MSG 1 48 0 0 0 0 0 0
!UBX CFG-MSG 3 15 0 0 0 0 0 0
!UBX CFG-MSG 3 16 0 0 0 0 0 0
!UBX CFG-MSG 12 16 0 0 0 0 0 0
!UBX CFG-MSG 12 49 0 0 0 0 0 0
!UBX CFG-MSG 12 52 0 0 0 0 0 0
!UBX CFG-MSG 04 02 0 0 0 0 0 0
!UBX CFG-MSG 10 38 0 0 0 0 0 0




@
!UBX CFG-RATE 1000 1 1
65 changes: 65 additions & 0 deletions data/cmd/ubx_m8t_1hz_usb.cmd
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,65 @@
# Set sample rate low while configuring receiver
!UBX CFG-RATE 1000 1 1

# turn on UBX RXM-RAWX messages on USB
!UBX CFG-MSG 2 21 0 0 0 1 0 0

# turn on UBX RXM-SFRBX messages on USB
!UBX CFG-MSG 2 19 0 0 0 1 0 0

# turn on UBX TIM TM2 messages on USB
!UBX CFG-MSG 13 3 0 0 0 1 0 0

# GNSS system settings
# set GPS 8-16 channels on
!UBX CFG-GNSS 0 32 32 1 0 8 16 0 65537
# set SBAS 1-3 channels on
!UBX CFG-GNSS 0 32 32 1 1 1 3 0 65537
# set Galileo 4-8 channels on
!UBX CFG-GNSS 0 32 32 1 2 4 8 0 65537
# set BeiDou 8-16 channels off
!UBX CFG-GNSS 0 32 32 1 3 8 16 0 0
# set IMES 0-8 channels off
!UBX CFG-GNSS 0 32 32 1 4 0 8 0 0
# set QZSS 0-3 channels off
!UBX CFG-GNSS 0 32 32 1 5 0 3 0 0
# set GLONASS 8-14 channels on
!UBX CFG-GNSS 0 32 32 1 6 8 14 0 65537

# change NAV5 stationary mode to pedestrian
!UBX CFG-NAV5 1 3 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0

# turn off extra messages default messages
# NMEA GGA
!UBX CFG-MSG 240 0 0 0 0 0 0 0
# NMEA GLL
!UBX CFG-MSG 240 1 0 0 0 0 0 0
# NMEA GSA
!UBX CFG-MSG 240 2 0 0 0 0 0 0
# NMEA GSV
!UBX CFG-MSG 240 3 0 0 0 0 0 0
# NMEA RMC
!UBX CFG-MSG 240 4 0 0 0 0 0 0
# NMEA VTG
!UBX CFG-MSG 240 5 0 0 0 0 0 0
# NMEA ZDA
!UBX CFG-MSG 240 8 0 0 0 0 0 0
!UBX CFG-MSG 1 3 0 0 0 0 0 0
!UBX CFG-MSG 1 3 0 0 0 0 0 0
!UBX CFG-MSG 1 6 0 0 0 0 0 0
!UBX CFG-MSG 1 18 0 0 0 0 0 0
!UBX CFG-MSG 1 34 0 0 0 0 0 0
!UBX CFG-MSG 1 48 0 0 0 0 0 0
!UBX CFG-MSG 3 15 0 0 0 0 0 0
!UBX CFG-MSG 3 16 0 0 0 0 0 0
!UBX CFG-MSG 12 16 0 0 0 0 0 0
!UBX CFG-MSG 12 49 0 0 0 0 0 0
!UBX CFG-MSG 12 52 0 0 0 0 0 0
!UBX CFG-MSG 04 02 0 0 0 0 0 0
!UBX CFG-MSG 10 38 0 0 0 0 0 0




@
!UBX CFG-RATE 1000 1 1
66 changes: 66 additions & 0 deletions data/cmd/ubx_m8t_5hz_uart.cmd
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,66 @@
# Set sample rate low while configuring receiver
!UBX CFG-RATE 1000 1 1

# turn on UBX RXM-RAWX messages on UART
!UBX CFG-MSG 2 21 0 1 0 0 0 0

# turn on UBX RXM-SFRBX messages on UART
!UBX CFG-MSG 2 19 0 1 0 0 0 0

# turn on UBX TIM TM2 messages on UART
!UBX CFG-MSG 13 3 0 1 0 0 0 0

# GNSS system settings
# set GPS 8-16 channels on
!UBX CFG-GNSS 0 32 32 1 0 8 16 0 65537
# set SBAS 1-3 channels on
!UBX CFG-GNSS 0 32 32 1 1 1 3 0 65537
# set Galileo 4-8 channels on
!UBX CFG-GNSS 0 32 32 1 2 4 8 0 65537
# set BeiDou 8-16 channels off
!UBX CFG-GNSS 0 32 32 1 3 8 16 0 0
# set IMES 0-8 channels off
!UBX CFG-GNSS 0 32 32 1 4 0 8 0 0
# set QZSS 0-3 channels off
!UBX CFG-GNSS 0 32 32 1 5 0 3 0 0
# set GLONASS 8-14 channels on
!UBX CFG-GNSS 0 32 32 1 6 8 14 0 65537

# change NAV5 stationary mode to pedestrian
!UBX CFG-NAV5 1 3 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0

# turn off extra messages default messages
# NMEA GGA
!UBX CFG-MSG 240 0 0 0 0 0 0 0
# NMEA GLL
!UBX CFG-MSG 240 1 0 0 0 0 0 0
# NMEA GSA
!UBX CFG-MSG 240 2 0 0 0 0 0 0
# NMEA GSV
!UBX CFG-MSG 240 3 0 0 0 0 0 0
# NMEA RMC
!UBX CFG-MSG 240 4 0 0 0 0 0 0
# NMEA VTG
!UBX CFG-MSG 240 5 0 0 0 0 0 0
# NMEA ZDA
!UBX CFG-MSG 240 8 0 0 0 0 0 0
!UBX CFG-MSG 1 3 0 0 0 0 0 0
!UBX CFG-MSG 1 3 0 0 0 0 0 0
!UBX CFG-MSG 1 6 0 0 0 0 0 0
!UBX CFG-MSG 1 18 0 0 0 0 0 0
!UBX CFG-MSG 1 34 0 0 0 0 0 0
!UBX CFG-MSG 1 48 0 0 0 0 0 0
!UBX CFG-MSG 3 15 0 0 0 0 0 0
!UBX CFG-MSG 3 16 0 0 0 0 0 0
!UBX CFG-MSG 12 16 0 0 0 0 0 0
!UBX CFG-MSG 12 49 0 0 0 0 0 0
!UBX CFG-MSG 12 52 0 0 0 0 0 0
!UBX CFG-MSG 04 02 0 0 0 0 0 0
!UBX CFG-MSG 10 38 0 0 0 0 0 0

# Set sample rate to 5 Hz
!UBX CFG-RATE 200 1 1


@
!UBX CFG-RATE 1000 1 1
Loading

0 comments on commit a5b8a54

Please sign in to comment.