Rev 53 | Rev 55 | Go to most recent revision | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed
Rev 53 | Rev 54 | ||
---|---|---|---|
Line 150... | Line 150... | ||
150 | } |
150 | } |
151 | if(GPSData.Position.Longitude < 0) sign = '-'; |
151 | if(GPSData.Position.Longitude < 0) sign = '-'; |
152 | else sign = '+'; |
152 | else sign = '+'; |
153 | i1 = abs(GPSData.Position.Longitude)/10000000L; |
153 | i1 = abs(GPSData.Position.Longitude)/10000000L; |
154 | i2 = abs(GPSData.Position.Longitude)%10000000L; |
154 | i2 = abs(GPSData.Position.Longitude)%10000000L; |
155 | LCD_printfxy(0,1,"Lon:%c%3ld.%07ld deg",sign, i1, i2); |
155 | LCD_printfxy(0,1,"Lon:%c%03ld.%07ld deg",sign, i1, i2); |
156 | if(GPSData.Position.Latitude < 0) sign = '-'; |
156 | if(GPSData.Position.Latitude < 0) sign = '-'; |
157 | else sign = '+'; |
157 | else sign = '+'; |
158 | i1 = abs(GPSData.Position.Latitude)/10000000L; |
158 | i1 = abs(GPSData.Position.Latitude)/10000000L; |
159 | i2 = abs(GPSData.Position.Latitude)%10000000L; |
159 | i2 = abs(GPSData.Position.Latitude)%10000000L; |
160 | LCD_printfxy(0,2,"Lat:%c%3ld.%07ld deg",sign, i1, i2); |
160 | LCD_printfxy(0,2,"Lat:%c%03ld.%07ld deg",sign, i1, i2); |
161 | if(GPSData.Position.Altitude < 0) sign = '-'; |
161 | if(GPSData.Position.Altitude < 0) sign = '-'; |
162 | else sign = '+'; |
162 | else sign = '+'; |
163 | i1 = abs(GPSData.Position.Altitude)/1000L; |
163 | i1 = abs(GPSData.Position.Altitude)/1000L; |
164 | i2 = abs(GPSData.Position.Altitude)%1000L; |
164 | i2 = abs(GPSData.Position.Altitude)%1000L; |
165 | LCD_printfxy(0,3,"Alt:%c%4ld.%03ld m",i1, i2); |
165 | LCD_printfxy(0,3,"Alt:%c%04ld.%03ld m", sign, i1, i2); |
166 | } |
166 | } |
167 | break; |
167 | break; |
168 | case 2: |
168 | case 2: |
169 | if (GPSData.Status == INVALID) |
169 | if (GPSData.Status == INVALID) |
170 | { |
170 | { |
Line 230... | Line 230... | ||
230 | { |
230 | { |
231 | if(GPS_HomePosition.Longitude < 0) sign = '-'; |
231 | if(GPS_HomePosition.Longitude < 0) sign = '-'; |
232 | else sign = '+'; |
232 | else sign = '+'; |
233 | i1 = abs(GPS_HomePosition.Longitude)/10000000L; |
233 | i1 = abs(GPS_HomePosition.Longitude)/10000000L; |
234 | i2 = abs(GPS_HomePosition.Longitude)%10000000L; |
234 | i2 = abs(GPS_HomePosition.Longitude)%10000000L; |
235 | LCD_printfxy(0,1,"Lon: %c%3ld.%07ld deg",sign, i1, i2); |
235 | LCD_printfxy(0,1,"Lon: %c%03ld.%07ld deg",sign, i1, i2); |
236 | if(GPS_HomePosition.Latitude < 0) sign = '-'; |
236 | if(GPS_HomePosition.Latitude < 0) sign = '-'; |
237 | else sign = '+'; |
237 | else sign = '+'; |
238 | i1 = abs(GPS_HomePosition.Latitude)/10000000L; |
238 | i1 = abs(GPS_HomePosition.Latitude)/10000000L; |
239 | i2 = abs(GPS_HomePosition.Latitude)%10000000L; |
239 | i2 = abs(GPS_HomePosition.Latitude)%10000000L; |
240 | LCD_printfxy(0,2,"Lat: %c%3ld.%07ld deg",sign, i1, i2); |
240 | LCD_printfxy(0,2,"Lat: %c%03ld.%07ld deg",sign, i1, i2); |
241 | if(GPS_HomePosition.Altitude < 0) sign = '-'; |
241 | if(GPS_HomePosition.Altitude < 0) sign = '-'; |
242 | else sign = '+'; |
242 | else sign = '+'; |
243 | i1 = abs(GPS_HomePosition.Altitude)/1000L; |
243 | i1 = abs(GPS_HomePosition.Altitude)/1000L; |
244 | i2 = abs(GPS_HomePosition.Altitude)%1000L; |
244 | i2 = abs(GPS_HomePosition.Altitude)%1000L; |
245 | LCD_printfxy(0,3,"Alt:%c%4ld.%03ld m",sign, i1, i2); |
245 | LCD_printfxy(0,3,"Alt:%c%04ld.%03ld m",sign, i1, i2); |
246 | } |
246 | } |
247 | break; |
247 | break; |
248 | case 6: // RC stick controls from FC |
248 | case 6: // RC stick controls from FC |
249 | LCD_printfxy(0,0,"RC-Sticks" ); |
249 | LCD_printfxy(0,0,"RC-Sticks" ); |
250 | LCD_printfxy(0,1,"Ni:%4i Ro:%4i ",FC.StickNick, FC.StickRoll); |
250 | LCD_printfxy(0,1,"Ni:%4i Ro:%4i ",FC.StickNick, FC.StickRoll); |