Rev 357 | Go to most recent revision | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed
Rev 357 | Rev 380 | ||
---|---|---|---|
Line 64... | Line 64... | ||
64 | #include "compass.h" |
64 | #include "compass.h" |
65 | #include "spi_slave.h" |
65 | #include "spi_slave.h" |
66 | #include "menu.h" |
66 | #include "menu.h" |
67 | #include "uart1.h" |
67 | #include "uart1.h" |
68 | #include "ncmag.h" |
68 | #include "ncmag.h" |
- | 69 | #include "logging.h" |
|
Line 69... | Line 70... | ||
69 | 70 | ||
70 | u8 DispPtr = 0; |
71 | u8 DispPtr = 0; |
Line 118... | Line 119... | ||
118 | { |
119 | { |
119 | LCD_printfxy(0,2,"Error: %d",ErrorCode); |
120 | LCD_printfxy(0,2,"Error: %d",ErrorCode); |
120 | LCD_printfxy(0,3,"%s",ErrorMSG); |
121 | LCD_printfxy(0,3,"%s",ErrorMSG); |
121 | } |
122 | } |
122 | else |
123 | else |
123 | { |
124 | { |
124 | LCD_printfxy(0,3,"(c) Buss, Busker"); |
125 | LCD_printfxy(0,3,"(c) HiSystems GmbH"); |
125 | LCD_printfxy(0,2,"%s",ErrorMSG); |
126 | LCD_printfxy(0,2,"%s",ErrorMSG); |
126 | } |
127 | } |
127 | break; |
128 | break; |
128 | case 1: |
129 | case 1: |
129 | if (GPSData.Status == INVALID) |
130 | if (GPSData.Status == INVALID) |
Line 367... | Line 368... | ||
367 | LCD_printfxy(0,0,"UP1:%3i UP2:%3i",Parameter.User1,Parameter.User2); |
368 | LCD_printfxy(0,0,"UP1:%3i UP2:%3i",Parameter.User1,Parameter.User2); |
368 | LCD_printfxy(0,1,"UP3:%3i UP4:%3i",Parameter.User3,Parameter.User4); |
369 | LCD_printfxy(0,1,"UP3:%3i UP4:%3i",Parameter.User3,Parameter.User4); |
369 | LCD_printfxy(0,2,"UP5:%3i UP6:%3i",Parameter.User5,Parameter.User6); |
370 | LCD_printfxy(0,2,"UP5:%3i UP6:%3i",Parameter.User5,Parameter.User6); |
370 | LCD_printfxy(0,3,"UP7:%3i UP8:%3i",Parameter.User7,Parameter.User8); |
371 | LCD_printfxy(0,3,"UP7:%3i UP8:%3i",Parameter.User7,Parameter.User8); |
371 | break; |
372 | break; |
- | 373 | case 17: // User Parameter |
|
- | 374 | LCD_printfxy(0,0,"SD-Card Logs",Parameter.User1,Parameter.User2); |
|
- | 375 | LCD_printfxy(0,1,"GPX:%4i (%3ims) ",Logged_GPX_Counter,LogCfg.GPX_Interval); |
|
- | 376 | LCD_printfxy(0,2,"KML:%4i (%3ims) ",Logged_KML_Counter,LogCfg.KML_Interval); |
|
- | 377 | break; |
|
372 | case 17: // magnetic field |
378 | case 18: // magnetic field |
373 | if(Compass_CalState) |
379 | if(Compass_CalState) |
374 | { |
380 | { |
375 | LCD_printfxy(0,0,"Calibration:"); |
381 | LCD_printfxy(0,0,"Calibration:"); |
376 | LCD_printfxy(0,1,"Step %d/", Compass_CalState); |
382 | LCD_printfxy(0,1,"Step %d/", Compass_CalState); |
377 | LCD_printfxy(0,2,"X %4i Y %4i Z %4i",MagVector.X,MagVector.Y,MagVector.Z); |
383 | LCD_printfxy(0,2,"X %4i Y %4i Z %4i",MagVector.X,MagVector.Y,MagVector.Z); |
Line 418... | Line 424... | ||
418 | if(Compass_CalState <5) Compass_SetCalState(Compass_CalState+1); |
424 | if(Compass_CalState <5) Compass_SetCalState(Compass_CalState+1); |
419 | else Compass_SetCalState(0); |
425 | else Compass_SetCalState(0); |
420 | } |
426 | } |
421 | if(Keys & KEY3)Compass_SetCalState(0); // cancel |
427 | if(Keys & KEY3)Compass_SetCalState(0); // cancel |
422 | break; |
428 | break; |
423 | case 18: |
429 | case 19: |
424 | if(GeoMagDec < 0) sign = '-'; |
430 | if(GeoMagDec < 0) sign = '-'; |
425 | else sign = '+'; |
431 | else sign = '+'; |
426 | LCD_printfxy(0,0,"Magnetic Field"); |
432 | LCD_printfxy(0,0,"Magnetic Field"); |
427 | LCD_printfxy(0,1,"Field:%3i (Percent)",EarthMagneticField/5); |
433 | LCD_printfxy(0,1,"Field:%3i (Percent)",EarthMagneticField/5); |
428 | LCD_printfxy(0,2,"Declination:%c%i.%1i ", sign, abs(GeoMagDec)/10,abs(GeoMagDec)%10); |
434 | LCD_printfxy(0,2,"Declination:%c%i.%1i ", sign, abs(GeoMagDec)/10,abs(GeoMagDec)%10); |