@@ -44,93 +44,92 @@ void newMONCOMMS(UBX_MON_COMMS_data_t *ubxDataStruct)
44
44
// Mimic the data shown in u-center
45
45
for (uint8_t port = 0 ; port < ubxDataStruct->header .nPorts ; port++) // For each port
46
46
{
47
- bool known = true ;
48
- switch (ubxDataStruct->port [port].portId ) // Check the port ID is valid
47
+ // Check the port ID is valid (skip 0x0101 and 0x0200)
48
+ bool validPort = false ;
49
+ switch (ubxDataStruct->port [port].portId )
49
50
{
50
51
case COM_PORT_ID_I2C:
51
52
case COM_PORT_ID_UART1:
52
53
case COM_PORT_ID_UART2:
53
54
case COM_PORT_ID_USB:
54
55
case COM_PORT_ID_SPI:
55
- break ;
56
- default :
57
- known = false ;
56
+ validPort = true ;
58
57
break ;
59
- }
60
- if (!known)
61
- break ; // Skip if port ID is not known
62
-
63
- switch (ubxDataStruct->port [port].portId ) // Print the port ID
64
- {
65
- case COM_PORT_ID_I2C:
66
- Serial.print (F (" I2C " ));
67
- break ;
68
- case COM_PORT_ID_UART1:
69
- Serial.print (F (" UART1 " ));
70
- break ;
71
- case COM_PORT_ID_UART2:
72
- Serial.print (F (" UART2 " ));
73
- break ;
74
- case COM_PORT_ID_USB:
75
- Serial.print (F (" USB " ));
76
- break ;
77
- case COM_PORT_ID_SPI:
78
- Serial.print (F (" SPI " ));
79
- break ;
80
58
default :
81
- Serial.print (F (" UNKNOWN " ));
82
- // Serial.printf("0x%04X ", ubxDataStruct->port[port].portId);
59
+ // Serial.printf("Unknown / reserved portId 0x%04X\r\n", ubxDataStruct->port[port].portId);
83
60
break ;
84
61
}
85
62
86
- Serial.print (" : txBytes " );
87
- String txBytes = String (ubxDataStruct->port [port].txBytes );
88
- Serial.print (txBytes);
89
- for (int i = 0 ; i < 10 - txBytes.length (); i++)
90
- Serial.print (" " );
91
-
92
- Serial.print (" : rxBytes " );
93
- String rxBytes = String (ubxDataStruct->port [port].rxBytes );
94
- Serial.print (rxBytes);
95
- for (int i = 0 ; i < 10 - rxBytes.length (); i++)
96
- Serial.print (" " );
97
-
98
- for (int i = 0 ; i < 4 ; i++)
63
+ if (validPort)
99
64
{
100
- if (ubxDataStruct->header .protIds [i] < 0xFF )
65
+ switch (ubxDataStruct->port [port].portId ) // Print the port ID
66
+ {
67
+ case COM_PORT_ID_I2C:
68
+ Serial.print (F (" I2C " ));
69
+ break ;
70
+ case COM_PORT_ID_UART1:
71
+ Serial.print (F (" UART1 " ));
72
+ break ;
73
+ case COM_PORT_ID_UART2:
74
+ Serial.print (F (" UART2 " ));
75
+ break ;
76
+ case COM_PORT_ID_USB:
77
+ Serial.print (F (" USB " ));
78
+ break ;
79
+ case COM_PORT_ID_SPI:
80
+ Serial.print (F (" SPI " ));
81
+ break ;
82
+ }
83
+
84
+ Serial.print (" : txBytes " );
85
+ String txBytes = String (ubxDataStruct->port [port].txBytes );
86
+ Serial.print (txBytes);
87
+ for (int i = 0 ; i < 10 - txBytes.length (); i++)
88
+ Serial.print (" " );
89
+
90
+ Serial.print (" : rxBytes " );
91
+ String rxBytes = String (ubxDataStruct->port [port].rxBytes );
92
+ Serial.print (rxBytes);
93
+ for (int i = 0 ; i < 10 - rxBytes.length (); i++)
94
+ Serial.print (" " );
95
+
96
+ for (int i = 0 ; i < 4 ; i++)
101
97
{
102
- switch (ubxDataStruct->header .protIds [i])
98
+ if (ubxDataStruct->header .protIds [i] < 0xFF )
103
99
{
104
- case 0 :
105
- Serial.print (F (" : UBX " ));
106
- break ;
107
- case 1 :
108
- Serial.print (F (" : NMEA " ));
109
- break ;
110
- case 2 :
111
- Serial.print (F (" : RTCM2 " ));
112
- break ;
113
- case 5 :
114
- Serial.print (F (" : RTCM3 " ));
115
- break ;
116
- case 6 :
117
- Serial.print (F (" : SPARTN " ));
118
- break ;
119
- default :
120
- Serial.print (F (" : UNKNOWN " ));
121
- break ;
100
+ switch (ubxDataStruct->header .protIds [i])
101
+ {
102
+ case 0 :
103
+ Serial.print (F (" : UBX " ));
104
+ break ;
105
+ case 1 :
106
+ Serial.print (F (" : NMEA " ));
107
+ break ;
108
+ case 2 :
109
+ Serial.print (F (" : RTCM2 " ));
110
+ break ;
111
+ case 5 :
112
+ Serial.print (F (" : RTCM3 " ));
113
+ break ;
114
+ case 6 :
115
+ Serial.print (F (" : SPARTN " ));
116
+ break ;
117
+ default :
118
+ Serial.print (F (" : UNKNOWN " ));
119
+ break ;
120
+ }
121
+ String msgs = String (ubxDataStruct->port [port].msgs [i]);
122
+ Serial.print (msgs);
123
+ for (int i = 0 ; i < 5 - msgs.length (); i++)
124
+ Serial.print (" " );
122
125
}
123
- String msgs = String (ubxDataStruct->port [port].msgs [i]);
124
- Serial.print (msgs);
125
- for (int i = 0 ; i < 5 - msgs.length (); i++)
126
- Serial.print (" " );
127
126
}
127
+
128
+ Serial.print (" : skipped " );
129
+ Serial.print (ubxDataStruct->port [port].skipped );
130
+
131
+ Serial.println ();
128
132
}
129
-
130
- Serial.print (" : skipped " );
131
- Serial.print (ubxDataStruct->port [port].skipped );
132
-
133
- Serial.println ();
134
133
}
135
134
}
136
135
0 commit comments