Rev 267 | Rev 313 | Go to most recent revision | Show entire file | Regard whitespace | Details | Blame | Last modification | View Log | RSS feed
Rev 267 | Rev 292 | ||
---|---|---|---|
Line 329... | Line 329... | ||
329 | LCD_printfxy(0,1,"UP3:%3i UP4:%3i",Parameter.User3,Parameter.User4); |
329 | LCD_printfxy(0,1,"UP3:%3i UP4:%3i",Parameter.User3,Parameter.User4); |
330 | LCD_printfxy(0,2,"UP5:%3i UP6:%3i",Parameter.User5,Parameter.User6); |
330 | LCD_printfxy(0,2,"UP5:%3i UP6:%3i",Parameter.User5,Parameter.User6); |
331 | LCD_printfxy(0,3,"UP7:%3i UP8:%3i",Parameter.User7,Parameter.User8); |
331 | LCD_printfxy(0,3,"UP7:%3i UP8:%3i",Parameter.User7,Parameter.User8); |
332 | break; |
332 | break; |
333 | case 15: // magnetic field |
333 | case 15: // magnetic field |
334 | if(Compass_Device == COMPASS_NCMAG) |
- | |
335 | { |
- | |
336 | if(Compass_CalState) |
334 | if(Compass_CalState) |
337 | { |
335 | { |
338 | LCD_printfxy(0,0,"Calibration:"); |
336 | LCD_printfxy(0,0,"Calibration:"); |
339 | LCD_printfxy(0,1,"Step %d/", Compass_CalState); |
337 | LCD_printfxy(0,1,"Step %d/", Compass_CalState); |
340 | LCD_printfxy(0,2,"X %4i Y %4i Z %4i",MagVector.X,MagVector.Y,MagVector.Z); |
338 | LCD_printfxy(0,2,"X %4i Y %4i Z %4i",MagVector.X,MagVector.Y,MagVector.Z); |
Line 364... | Line 362... | ||
364 | } |
362 | } |
365 | } |
363 | } |
366 | else |
364 | else |
367 | { |
365 | { |
368 | LCD_printfxy(0,0,"Magnetic Field"); |
366 | LCD_printfxy(0,0,"Magnetic Field"); |
369 | LCD_printfxy(0,1,"X:%5i (%4i) ",MagVector.X, MagRawVector.X); |
367 | LCD_printfxy(0,1,"X:%5i",MagVector.X); |
370 | LCD_printfxy(0,2,"Y:%5i (%4i) ",MagVector.Y, MagRawVector.Y); |
368 | LCD_printfxy(0,2,"Y:%5i",MagVector.Y); |
371 | LCD_printfxy(0,3,"Z:%5i (%4i) ",MagVector.Z, MagRawVector.Z); |
369 | LCD_printfxy(0,3,"Z:%5i",MagVector.Z); |
372 | LCD_printfxy(15,3,"(CAL)"); |
370 | LCD_printfxy(15,3,"(CAL)"); |
373 | } |
371 | } |
374 | if(Keys & KEY4) // next step |
372 | if(Keys & KEY4) // next step |
375 | { |
373 | { |
376 | if(Compass_CalState <5) Compass_SetCalState(Compass_CalState+1); |
374 | if(Compass_CalState <5) Compass_SetCalState(Compass_CalState+1); |
377 | else Compass_SetCalState(0); |
375 | else Compass_SetCalState(0); |
378 | } |
376 | } |
379 | if(Keys & KEY3)Compass_SetCalState(0); // cancel |
377 | if(Keys & KEY3)Compass_SetCalState(0); // cancel |
380 | } |
- | |
381 | else // other compass |
- | |
382 | { |
- | |
383 | Compass_UpdateMagVector(); |
- | |
384 | LCD_printfxy(0,0,"Magnetic Field"); |
- | |
385 | LCD_printfxy(0,1,"X: %4i",MagVector.X); |
- | |
386 | LCD_printfxy(0,2,"Y: %4i",MagVector.Y); |
- | |
387 | LCD_printfxy(0,3,"Z: %4i",MagVector.Z); |
- | |
388 | } |
- | |
389 | break; |
378 | break; |
390 | default: |
379 | default: |
391 | //MaxMenuItem = MenuItem - 1; |
380 | //MaxMenuItem = MenuItem - 1; |
392 | MenuItem = 0; |
381 | MenuItem = 0; |
393 | break; |
382 | break; |