Rev 1793 | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed
Rev 1793 | Rev 1797 | ||
---|---|---|---|
Line 30... | Line 30... | ||
30 | else |
30 | else |
31 | { |
31 | { |
32 | JetiBox_printfxy(6,0,"Status"); |
32 | JetiBox_printfxy(6,0,"Status"); |
33 | } |
33 | } |
34 | if(NC_ErrorCode) JetiBox_printfxy(6,0,"ERROR: %2d",NC_ErrorCode); |
34 | if(NC_ErrorCode) JetiBox_printfxy(6,0,"ERROR: %2d",NC_ErrorCode); |
35 | JetiBox_printfxy(0,1,"%4i %2i:%02i",Capacity.UsedCapacity,FlugSekunden/60,FlugSekunden%60); |
35 | //JetiBox_printfxy(0,1,"%4i %2i:%02i",Capacity.UsedCapacity,FlugSekunden/60,FlugSekunden%60); // MartinR: so war es |
- | 36 | JetiBox_printfxy(0,1,"%4imAh%2i:%02i",Capacity.UsedCapacity,FlugSekunden/60,FlugSekunden%60); // MartinR: geändert |
|
36 | if(EE_Parameter.GlobalConfig & CFG_HOEHENREGELUNG) |
37 | if(EE_Parameter.GlobalConfig & CFG_HOEHENREGELUNG) |
37 | { |
38 | { |
38 | JetiBox_printfxy(10,1,"%4im%c", (int16_t)(HoehenWert/100),VarioCharacter); |
39 | //JetiBox_printfxy(10,1,"%4im%c", (int16_t)(HoehenWert/100),VarioCharacter); // MartinR: so war es |
- | 40 | JetiBox_printfxy(12,1,"%3im", (int16_t)(HoehenWert/100)); // MartinR: geändert |
|
39 | } |
41 | } |
40 | } |
42 | } |
Line 41... | Line 43... | ||
41 | 43 | ||
Line 54... | Line 56... | ||
54 | JetiBox_printfxy(8,1,"\%cC ",0xdf); |
56 | JetiBox_printfxy(8,1,"\%cC ",0xdf); |
55 | } |
57 | } |
Line 56... | Line 58... | ||
56 | 58 | ||
Line -... | Line 59... | ||
- | 59 | } |
|
57 | } |
60 | |
58 | 61 | /* // MartinR für Tests Deaktiviert wegen Speicherplatz |
|
59 | void Menu_Battery(uint8_t key) |
62 | void Menu_Battery(uint8_t key) |
60 | { //0123456789ABCDEF |
63 | { //0123456789ABCDEF |
61 | JetiBox_printfxy(0,0,"%2i.%1iV %3i.%1iA", UBat/10, UBat%10, Capacity.ActualCurrent/10, Capacity.ActualCurrent%10); |
64 | JetiBox_printfxy(0,0,"%2i.%1iV %3i.%1iA", UBat/10, UBat%10, Capacity.ActualCurrent/10, Capacity.ActualCurrent%10); |
- | 65 | JetiBox_printfxy(0,1,"%4iW %6imAh",Capacity.ActualPower, Capacity.UsedCapacity); |
|
Line 62... | Line 66... | ||
62 | JetiBox_printfxy(0,1,"%4iW %6imAh",Capacity.ActualPower, Capacity.UsedCapacity); |
66 | } |
63 | } |
67 | */ // MartinR: Deaktiviert wegen Speicherplatz |
64 | 68 | ||
Line 72... | Line 76... | ||
72 | { |
76 | { |
73 | case SATFIX_3D: |
77 | case SATFIX_3D: |
74 | JetiBox_printfxy(12,0," 3D"); |
78 | JetiBox_printfxy(12,0," 3D"); |
75 | break; |
79 | break; |
Line 76... | Line 80... | ||
76 | 80 | ||
77 | case SATFIX_2D: |
81 | //case SATFIX_2D: // MartinR: Deaktiviert wegen Speicherplatz |
78 | case SATFIX_NONE: |
82 | case SATFIX_NONE: |
79 | default: |
83 | default: |
80 | JetiBox_printfxy(12,0,"NoFx"); |
84 | JetiBox_printfxy(12,0,"NoFx"); |
81 | break; |
85 | break; |
Line 91... | Line 95... | ||
91 | JetiBox_printfxy(2,0,"No NaviCtrl!"); |
95 | JetiBox_printfxy(2,0,"No NaviCtrl!"); |
92 | } |
96 | } |
93 | } |
97 | } |
Line -... | Line 98... | ||
- | 98 | ||
- | 99 | ||
- | 100 | // MartinR für Jeti+ Anfang |
|
- | 101 | void Menu_spoti1(uint8_t key) |
|
- | 102 | { //0123456789ABCDEF |
|
- | 103 | ||
- | 104 | JetiBox_printfxy(0,0,">%3i=Serialpot1",PPM_in[13]); |
|
- | 105 | //JetiBox_printfxy(0,1," %3i=Serialpot2",PPM_in[14]); |
|
- | 106 | if(key== JETIBOX_KEY_UP) PPM_in[13] = PPM_in[13]+25; |
|
- | 107 | if(key== JETIBOX_KEY_DOWN) PPM_in[13] = PPM_in[13]-25; |
|
- | 108 | } |
|
- | 109 | ||
- | 110 | void Menu_spoti2(uint8_t key) |
|
- | 111 | { //0123456789ABCDEF |
|
- | 112 | ||
- | 113 | //JetiBox_printfxy(0,0," %3i=Serialpot1",PPM_in[13]); |
|
- | 114 | JetiBox_printfxy(0,1,">%3i=Serialpot2",PPM_in[14],key); |
|
- | 115 | if(key== JETIBOX_KEY_UP) PPM_in[14] = PPM_in[14]+2; |
|
- | 116 | if(key== JETIBOX_KEY_DOWN) PPM_in[14] = PPM_in[14]-2; |
|
- | 117 | } |
|
- | 118 | ||
94 | 119 | // MartinR für Jeti+ Ende |
|
95 | 120 | ||
96 | // ----------------------------------------------------------- |
121 | // ----------------------------------------------------------- |
97 | // the menu topology |
122 | // the menu topology |
Line 114... | Line 139... | ||
114 | 139 | ||
Line 115... | Line 140... | ||
115 | */ |
140 | */ |
116 | 141 | ||
- | 142 | const MENU_ENTRY JetiBox_Menu[] PROGMEM= |
|
117 | const MENU_ENTRY JetiBox_Menu[] PROGMEM= |
143 | { // l r u d pHandler |
118 | { // l r u d pHandler |
144 | //{3, 1, 0, 0, &Menu_Status }, // 0 // MartinR: so war es |
119 | {3, 1, 0, 0, &Menu_Status }, // 0 |
145 | {4, 1, 0, 0, &Menu_Status }, // 0 // MartinR für Jeti+ |
120 | {0, 2, 1, 1, &Menu_Temperature }, // 1 |
146 | {0, 2, 1, 1, &Menu_Temperature }, // 1 |
- | 147 | //{1, 3, 2, 2, &Menu_Battery }, // 2 // MartinR: so war es |
|
- | 148 | //{2, 0, 3, 3, &Menu_PosInfo }, // 3 // MartinR: so war es |
|
- | 149 | {1, 3, 2, 2, &Menu_PosInfo }, // 3 // MartinR: geändert für Jeti+ |
|
- | 150 | ||
- | 151 | {2, 4, 3, 3, &Menu_spoti1 }, // 4 // MartinR: für Jeti+ |
|
- | 152 | {3, 0, 4, 4, &Menu_spoti2 }, // 4 // MartinR: für Jeti+ |
|
121 | {1, 3, 2, 2, &Menu_Battery }, // 2 |
153 | |
Line 122... | Line 154... | ||
122 | {2, 0, 3, 3, &Menu_PosInfo }, // 3 |
154 | |
123 | }; |
155 | }; |
124 | 156 |