Rev 881 | Go to most recent revision | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed
| Rev 881 | Rev 883 | ||
|---|---|---|---|
| Line 183... | Line 183... | ||
| 183 | LCD_printfxy(0,2,"Lat: "); |
183 | LCD_printfxy(0,2,"Lat: "); |
| 184 | LCD_printfxy(0,3,"Alt: "); |
184 | LCD_printfxy(0,3,"Alt: "); |
| 185 | } |
185 | } |
| 186 | else // newdata or processed |
186 | else // newdata or processed |
| 187 | { |
187 | { |
| 188 | LCD_printfxy(0,0,"Sat:%02d ", GPSData.NumOfSats); |
188 | LCD_printfxy(0,0,"Sat:%02d Fix:%c", GPSData.NumOfSats,NMEA_In_Fix_Txt[0]); |
| - | 189 | if(ExternalGpsInUse) |
|
| - | 190 | { |
|
| - | 191 | LCD_printfxy(7,0,"Fix:%c ",NMEA_In_Fix_Txt[0]); |
|
| - | 192 | } |
|
| - | 193 | else |
|
| - | 194 | { |
|
| 189 | switch (GPSData.SatFix) |
195 | switch (GPSData.SatFix) |
| 190 | { |
196 | { |
| 191 | case SATFIX_NONE: |
197 | case SATFIX_NONE: |
| 192 | LCD_printfxy(7,0,"NoFix"); |
198 | LCD_printfxy(7,0,"NoFix"); |
| 193 | break; |
199 | break; |
| Line 207... | Line 213... | ||
| 207 | } |
213 | } |
| 208 | else |
214 | else |
| 209 | { |
215 | { |
| 210 | LCD_printfxy(12,0," "); |
216 | LCD_printfxy(12,0," "); |
| 211 | } |
217 | } |
| - | 218 | } |
|
| - | 219 | if(GPSData.SatFix == SATFIX_NONE) LCD_printfxy(7,0,"NoFix "); |
|
| Line 212... | Line 220... | ||
| 212 | 220 | ||
| 213 | if(GPSData.Position.Longitude < 0) sign = '-'; |
221 | if(GPSData.Position.Longitude < 0) sign = '-'; |
| 214 | else sign = '+'; |
222 | else sign = '+'; |
| 215 | i1 = abs(GPSData.Position.Longitude)/10000000L; |
223 | i1 = abs(GPSData.Position.Longitude)/10000000L; |
| Line 223... | Line 231... | ||
| 223 | if(GPSData.Position.Altitude < 0) sign = '-'; |
231 | if(GPSData.Position.Altitude < 0) sign = '-'; |
| 224 | else sign = '+'; |
232 | else sign = '+'; |
| 225 | i1 = abs(GPSData.Position.Altitude)/1000L; |
233 | i1 = abs(GPSData.Position.Altitude)/1000L; |
| 226 | i2 = abs(GPSData.Position.Altitude)%1000L; |
234 | i2 = abs(GPSData.Position.Altitude)%1000L; |
| 227 | LCD_printfxy(0,3,"Alt:%c%04ld.%03ldm V%d", sign, i1, i2, GPS_Version/1000); |
235 | LCD_printfxy(0,3,"Alt:%c%04ld.%03ldm V%d", sign, i1, i2, GPS_Version/1000); |
| - | 236 | if(ExternalGpsInUse) LCD_printfxy(15,3,"NMEA"); |
|
| 228 | } |
237 | } |
| - | 238 | ||
| 229 | break; |
239 | break; |
| 230 | case 3: |
240 | case 3: |
| 231 | if (GPSData.Status == INVALID) |
241 | if (GPSData.Status == INVALID) |
| 232 | { |
242 | { |
| 233 | LCD_printfxy(0,0,"No GPS data"); |
243 | LCD_printfxy(0,0,"No GPS data"); |