Subversion Repositories FlightCtrl

Rev

Rev 1740 | Rev 1749 | Go to most recent revision | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 1740 Rev 1742
Line 95... Line 95...
95
}
95
}
Line 96... Line 96...
96
 
96
 
97
//1 
97
//1 
98
void Menu_Current(uint8_t key)
98
void Menu_Current(uint8_t key)
-
 
99
{                       //0123456789ABCDEF
-
 
100
 
99
{                       //0123456789ABCDEF
101
       
100
  JetiBox_printfxy(0,0,"%3i %3i %3i %3i", Motor[0].Current-12, Motor[1].Current-12, Motor[2].Current-12, Motor[3].Current-12);
102
                JetiBox_printfxy(0,0,"%3i %3i %3i %3i", Motor[0].Current-12, Motor[1].Current-12, Motor[2].Current-12, Motor[3].Current-12);
101
  JetiBox_printfxy(0,1,"%3i %3i %3i %3i", Motor[4].Current-12, Motor[5].Current-12, Motor[6].Current-12, Motor[7].Current-12);
103
                JetiBox_printfxy(0,1,"%3i %3i %3i %3i", Motor[4].Current-12, Motor[5].Current-12, Motor[6].Current-12, Motor[7].Current-12);
102
  if(RequiredMotors <= 4)
104
                if(RequiredMotors <= 4)
103
        {
105
                {
104
         JetiBox_printfxy(0,1,"Currents    ");
106
                JetiBox_printfxy(0,1,"Currents    ");
105
    }
107
                }
106
        else
108
                else
107
    if(RequiredMotors <= 6)
109
                if(RequiredMotors <= 6)
108
        {
110
                {
109
         JetiBox_printfxy(8,1,"%3i.%1iA ",Capacity.ActualCurrent/10, Capacity.ActualCurrent%10);
111
                JetiBox_printfxy(8,1,"%3i.%1iA ",Capacity.ActualCurrent/10, Capacity.ActualCurrent%10);
-
 
112
                }
Line 110... Line 113...
110
        }
113
       
111
 
114
 
112
}
115
}
113
//1
116
//1
Line 166... Line 169...
166
        JetiBox_printfxy(0,0," %3i=Serialpot1",PPM_in[13]);
169
        JetiBox_printfxy(0,0," %3i=Serialpot1",PPM_in[13]);
167
        JetiBox_printfxy(0,1,">%3i=Serialpot2",PPM_in[14],key);
170
        JetiBox_printfxy(0,1,">%3i=Serialpot2",PPM_in[14],key);
168
        if(key== JETIBOX_KEY_UP) PPM_in[14] = PPM_in[14]+5;
171
        if(key== JETIBOX_KEY_UP) PPM_in[14] = PPM_in[14]+5;
169
        if(key== JETIBOX_KEY_DOWN) PPM_in[14] = PPM_in[14]-5;
172
        if(key== JETIBOX_KEY_DOWN) PPM_in[14] = PPM_in[14]-5;
170
}
173
}
-
 
174
void Menu_hoeheD(uint8_t key)
-
 
175
{                       //0123456789ABCDEF
Line -... Line 176...
-
 
176
 
-
 
177
        JetiBox_printfxy(0,0,">%3i=HD",EE_Parameter.Luftdruck_D);
-
 
178
        JetiBox_printfxy(0,1," %3i=HP",EE_Parameter.Hoehe_P);
-
 
179
        if(key== JETIBOX_KEY_UP) EE_Parameter.Luftdruck_D = EE_Parameter.Luftdruck_D+1;
-
 
180
        if(key== JETIBOX_KEY_DOWN) EE_Parameter.Luftdruck_D = EE_Parameter.Luftdruck_D-1;
-
 
181
}
-
 
182
void Menu_hoeheP(uint8_t key)
-
 
183
{                       //0123456789ABCDEF
-
 
184
 
-
 
185
        JetiBox_printfxy(0,0," %3i=HD",EE_Parameter.Luftdruck_D);
-
 
186
        JetiBox_printfxy(0,1,">%3i=HP",EE_Parameter.Hoehe_P);
-
 
187
        if(key== JETIBOX_KEY_UP) EE_Parameter.Hoehe_P = EE_Parameter.Hoehe_P+1;
-
 
188
        if(key== JETIBOX_KEY_DOWN) EE_Parameter.Hoehe_P = EE_Parameter.Hoehe_P-1;
171
 
189
}
172
//#define JETIBOX_KEY_UP        0x2F
190
//#define JETIBOX_KEY_UP        0x2F
-
 
191
//#define JETIBOX_KEY_DOWN      0x4F
-
 
192
//unsigned char Parameter_Luftdruck_D  = 48;      // Wert : 0-250
-
 
193
//unsigned char Parameter_Hoehe_P      = 16;      // Wert : 0-32
-
 
194
//CHK_POTI_MM(Parameter_Luftdruck_D,EE_Parameter.Luftdruck_D,0,100);
173
//#define JETIBOX_KEY_DOWN      0x4F
195
//CHK_POTI_MM(Parameter_Hoehe_P,EE_Parameter.Hoehe_P,0,100);
174
//1
-
 
175
 
-
 
176
 
-
 
177
 
196
//1
178
// -----------------------------------------------------------
197
// -----------------------------------------------------------
179
// the menu topology
198
// the menu topology
180
// -----------------------------------------------------------
199
// -----------------------------------------------------------
Line 196... Line 215...
196
 
215
 
Line 197... Line 216...
197
*/
216
*/
198
 
217
 
199
const MENU_ENTRY JetiBox_Menu[] PROGMEM=
218
const MENU_ENTRY JetiBox_Menu[] PROGMEM=
200
{ // l  r  u  d  pHandler links rechts up down
219
{ // l  r  u  d  pHandler links rechts up down
201
        {9, 1, 0, 0, &Menu_Status },    // 0 ///
220
        {11, 1, 0, 0, &Menu_Status },   // 0 ///
202
        {0, 2, 1, 1, &Menu_Temperature },       // 1
221
        {0, 2, 1, 1, &Menu_Temperature },       // 1
203
        {1, 3, 2, 2, &Menu_Battery },   // 2
222
        {1, 3, 2, 2, &Menu_Battery },   // 2
204
        {2, 4, 3, 3, &Menu_PosInfo },   // 3
223
        {2, 4, 3, 3, &Menu_PosInfo },   // 3
205
        //1
224
        //1
206
        {3, 5, 4, 4, &Menu_Current },   // 4 ///
225
        {3, 5, 4, 4, &Menu_Current },   // 4 ///
207
        {4, 6, 5, 5, &Menu_SetPoint },  // 5 ///
226
        {4, 6, 5, 5, &Menu_SetPoint },  // 5 ///
208
        {5, 7, 6, 6, &Menu_Integal },   // 6 ///
227
        {5, 7, 6, 6, &Menu_Integal },   // 6 ///
209
        {6, 8, 7, 7, &Menu_Info },      // 7 ///
228
        {6, 8, 7, 7, &Menu_Info },      // 7 ///
210
        {7, 9, 8, 8, &Menu_spoti1 },    // 8 ///
-
 
211
        {8, 0, 9, 9, &Menu_spoti2 },    // 9 ///
-
 
-
 
229
        {7, 9, 8, 8, &Menu_spoti1 },    // 8 ///
-
 
230
        {8, 10, 9, 9, &Menu_spoti2 },   // 9 ///
Line 212... Line 231...
212
 
231
        {9, 11, 10, 10, &Menu_hoeheD }, // 10 ///
213
       
232
        {10, 0, 11, 11, &Menu_hoeheP }, // 11 ///
Line 214... Line 233...
214
       
233
       
Line 231... Line 250...
231
                         else item = pgm_read_byte(&JetiBox_Menu[item].left);           //trigger to left menu item
250
                         else item = pgm_read_byte(&JetiBox_Menu[item].left);           //trigger to left menu item
232
                        break;
251
                        break;
233
                case JETIBOX_KEY_RIGHT:
252
                case JETIBOX_KEY_RIGHT:
234
                        item = pgm_read_byte(&JetiBox_Menu[item].right);        //trigger to right menu item
253
                        item = pgm_read_byte(&JetiBox_Menu[item].right);        //trigger to right menu item
235
                        break;
254
                        break;
236
                case JETIBOX_KEY_UP:
255
                case JETIBOX_KEY_UP:   
237
               
-
 
238
                        jetivalue1=jetivalue1+5;
-
 
239
                       
-
 
240
                        item = pgm_read_byte(&JetiBox_Menu[item].up);           //trigger to up menu item
256
                        item = pgm_read_byte(&JetiBox_Menu[item].up);           //trigger to up menu item
241
                        break;
257
                        break;
242
                case JETIBOX_KEY_DOWN:
258
                case JETIBOX_KEY_DOWN:
243
               
-
 
244
                        jetivalue1=jetivalue1-5;
-
 
245
                       
-
 
246
                        item = pgm_read_byte(&JetiBox_Menu[item].down);         //trigger to down menu item
259
                        item = pgm_read_byte(&JetiBox_Menu[item].down);         //trigger to down menu item
247
                        break;
260
                        break;
248
                default:
261
                default:
249
                        break;
262
                        break;
250
        }
263
        }