Rev 697 | Rev 724 | Go to most recent revision | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed
| Rev 697 | Rev 708 | ||
|---|---|---|---|
| Line 62... | Line 62... | ||
| 62 | #include "GPS.h" |
62 | #include "GPS.h" |
| 63 | #include "timer1.h" |
63 | #include "timer1.h" |
| 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 "uart0.h" |
|
| 67 | #include "uart1.h" |
68 | #include "uart1.h" |
| 68 | #include "ncmag.h" |
69 | #include "ncmag.h" |
| 69 | #include "logging.h" |
70 | #include "logging.h" |
| 70 | #include "settings.h" |
71 | #include "settings.h" |
| 71 | #include "sdc.h" |
72 | #include "sdc.h" |
| 72 | #include "analog.h" |
73 | #include "analog.h" |
| 73 | #include "canbus.h" |
74 | #include "canbus.h" |
| - | 75 | #include "triggerlog.h" |
|
| Line 74... | Line 76... | ||
| 74 | 76 | ||
| 75 | u8 DispPtr = 0; |
77 | u8 DispPtr = 0; |
| Line 113... | Line 115... | ||
| 113 | 115 | ||
| 114 | switch(MenuItem) |
116 | switch(MenuItem) |
| 115 | { |
117 | { |
| 116 | // Version Info |
118 | // Version Info |
| - | 119 | case 0: |
|
| - | 120 | if(IamMaster == SLAVE) LCD_printfxy(0,0,"+ Navi-Ctrl (S) +") |
|
| - | 121 | else |
|
| 117 | case 0: |
122 | if(IamMaster == MASTER)LCD_printfxy(0,0,"+ Navi-Ctrl (M) +") |
| - | 123 | else LCD_printfxy(0,0,"++ Navi-Ctrl ++") |
|
| 118 | LCD_printfxy(0,0,"++ Navi-Ctrl ++"); |
124 | |
| 119 | LCD_printfxy(0,1,"HW V%d.%d SW V%d.%02d%c", UART_VersionInfo.HWMajor/10, UART_VersionInfo.HWMajor%10, VERSION_MAJOR, VERSION_MINOR, 'a'+ VERSION_PATCH); |
125 | LCD_printfxy(0,1,"HW V%d.%d SW V%d.%02d%c", UART_VersionInfo.HWMajor/10, UART_VersionInfo.HWMajor%10, VERSION_MAJOR, VERSION_MINOR, 'a'+ VERSION_PATCH); |
| 120 | if(FC.StatusFlags3 & FC_STATUS3_REDUNDANCE_AKTIVE) LCD_printfxy(19,1,"R"); |
126 | if(FC.StatusFlags3 & FC_STATUS3_REDUNDANCE_AKTIVE) LCD_printfxy(19,1,"R"); |
| 121 | if(ErrorCode) |
127 | if(ErrorCode) |
| 122 | { |
128 | { |
| Line 207... | Line 213... | ||
| 207 | LCD_printfxy(0,2,"Lat:%c%03ld.%07ld deg",sign, i1, i2); |
213 | LCD_printfxy(0,2,"Lat:%c%03ld.%07ld deg",sign, i1, i2); |
| 208 | if(GPSData.Position.Altitude < 0) sign = '-'; |
214 | if(GPSData.Position.Altitude < 0) sign = '-'; |
| 209 | else sign = '+'; |
215 | else sign = '+'; |
| 210 | i1 = abs(GPSData.Position.Altitude)/1000L; |
216 | i1 = abs(GPSData.Position.Altitude)/1000L; |
| 211 | i2 = abs(GPSData.Position.Altitude)%1000L; |
217 | i2 = abs(GPSData.Position.Altitude)%1000L; |
| 212 | LCD_printfxy(0,3,"Alt:%c%04ld.%03ld m", sign, i1, i2); |
218 | LCD_printfxy(0,3,"Alt:%c%04ld.%03ldm V%d", sign, i1, i2, GPS_Version/1000); |
| 213 | } |
219 | } |
| 214 | break; |
220 | break; |
| 215 | case 3: |
221 | case 3: |
| 216 | if (GPSData.Status == INVALID) |
222 | if (GPSData.Status == INVALID) |
| 217 | { |
223 | { |
| Line 422... | Line 428... | ||
| 422 | break; |
428 | break; |
| 423 | case 18: // User Parameter |
429 | case 18: // User Parameter |
| 424 | LCD_printfxy(0,0,"SD-Card Logs"); |
430 | LCD_printfxy(0,0,"SD-Card Logs"); |
| 425 | if(SDCardInfo.Valid == 1) |
431 | if(SDCardInfo.Valid == 1) |
| 426 | { |
432 | { |
| 427 | LCD_printfxy(0,1,"GPX:%4i (%3ims) ",Logged_GPX_Counter,LogCfg.GPX_Interval); |
433 | LCD_printfxy(0,1,"GPX: %4i (%3ims) ",Logged_GPX_Counter,LogCfg.GPX_Interval); |
| 428 | LCD_printfxy(0,2,"KML:%4i (%3ims) ",Logged_KML_Counter,LogCfg.KML_Interval); |
434 | LCD_printfxy(0,2,"KML: %4i (%3ims) ",Logged_KML_Counter,LogCfg.KML_Interval); |
| - | 435 | LCD_printfxy(0,3,"Trig:%4i ",Logged_TRIG_Counter); |
|
| 429 | } |
436 | } |
| 430 | else |
437 | else |
| 431 | LCD_printfxy(0,1,"no card in slot "); |
438 | LCD_printfxy(0,1,"no card in slot "); |
| 432 | break; |
439 | break; |
| 433 | case 19: // magnetic field |
440 | case 19: // magnetic field |
| Line 610... | Line 617... | ||
| 610 | LCD_printfxy(0,3,"A6:%3i A7:%3i",AnalogData.Ch6,AnalogData.Ch7); |
617 | LCD_printfxy(0,3,"A6:%3i A7:%3i",AnalogData.Ch6,AnalogData.Ch7); |
| 611 | break; |
618 | break; |
| 612 | */ |
619 | */ |
| Line 613... | Line 620... | ||
| 613 | 620 | ||
| - | 621 | case 29: |
|
| - | 622 | LCD_printfxy(0,0,"Trigger Input"); |
|
| - | 623 | if(UART_VersionInfo.HWMajor >= 30) |
|
| - | 624 | { |
|
| - | 625 | if(BlitzSchuhConnected) LCD_printfxy(0,1,"External") |
|
| - | 626 | else LCD_printfxy(0,1,"Internal"); |
|
| - | 627 | LCD_printfxy(0,2,"Counter:%4d ",TrigLogging.Count); |
|
| - | 628 | LCD_printfxy(0,3,"Logfile:%4i ",Logged_TRIG_Counter); |
|
| - | 629 | } |
|
| - | 630 | else |
|
| - | 631 | { |
|
| - | 632 | LCD_printfxy(0,1,"Not Supported in "); |
|
| - | 633 | LCD_printfxy(0,2,"Hardware V%d ", UART_VersionInfo.HWMajor/10); |
|
| - | 634 | LCD_printfxy(0,3,"(V3 required)"); |
|
| - | 635 | } |
|
| 614 | case 29: |
636 | |
| 615 | // LCD_printfxy(0,0,"PPM Input"); |
637 | // LCD_printfxy(0,0,"PPM Input"); |
| 616 | /* |
638 | /* |
| 617 | LCD_printfxy(0,0,"%4i %4i %4i %4i",PPM_In[1],PPM_In[2],PPM_In[3],PPM_In[4]); |
639 | LCD_printfxy(0,0,"%4i %4i %4i %4i",PPM_In[1],PPM_In[2],PPM_In[3],PPM_In[4]); |
| 618 | LCD_printfxy(0,1,"%4i %4i %4i %4i",PPM_In[5],PPM_In[6],PPM_In[7],PPM_In[8]); |
640 | LCD_printfxy(0,1,"%4i %4i %4i %4i",PPM_In[5],PPM_In[6],PPM_In[7],PPM_In[8]); |
| 619 | LCD_printfxy(0,2,"%4i %4i %4i %4i",PPM_In[9],PPM_In[10],PPM_In[11],PPM_In[12]); |
641 | LCD_printfxy(0,2,"%4i %4i %4i %4i",PPM_In[9],PPM_In[10],PPM_In[11],PPM_In[12]); |
| 620 | LCD_printfxy(0,3,"%4i %4i %4i %4i",PPM_In[13],PPM_In[14],PPM_In[15],PPM_In[16]); |
- | |
| 621 | */ |
642 | LCD_printfxy(0,3,"%4i %4i %4i %4i",PPM_In[13],PPM_In[14],PPM_In[15],PPM_In[16]); |
| 622 | LCD_printfxy(0,0,"%4i %4i %4i %4i",PPM_In[17],PPM_In[18],PPM_In[19],PPM_In[20]); |
643 | LCD_printfxy(0,0,"%4i %4i %4i %4i",PPM_In[17],PPM_In[18],PPM_In[19],PPM_In[20]); |
| 623 | LCD_printfxy(0,1,"%4i %4i %4i %4i",PPM_In[21],PPM_In[22],PPM_In[23],PPM_In[24]); |
644 | LCD_printfxy(0,1,"%4i %4i %4i %4i",PPM_In[21],PPM_In[22],PPM_In[23],PPM_In[24]); |
| 624 | LCD_printfxy(0,2,"%4i %4i %4i %4i",PPM_In[25],PPM_In[26],PPM_In[27],PPM_In[28]); |
645 | LCD_printfxy(0,2,"%4i %4i %4i %4i",PPM_In[25],PPM_In[26],PPM_In[27],PPM_In[28]); |
| - | 646 | LCD_printfxy(0,3,"%4i %4i %4i %4i",PPM_In[29],PPM_In[30],PPM_In[31],PPM_In[32]); |
|
| 625 | LCD_printfxy(0,3,"%4i %4i %4i %4i",PPM_In[29],PPM_In[30],PPM_In[31],PPM_In[32]); |
647 | */ |
| 626 | break; |
648 | break; |
| 627 | default: |
649 | default: |
| 628 | //MaxMenuItem = MenuItem - 1; |
650 | //MaxMenuItem = MenuItem - 1; |
| 629 | MenuItem = 0; |
651 | MenuItem = 0; |