Subversion Repositories FlightCtrl

Compare Revisions

Ignore whitespace Rev 1960 → Rev 2018

/branches/dongfang_FC_rewrite/menu.c
61,15 → 61,15
#include "attitude.h"
 
#if (!defined (USE_NAVICTRL))
uint8_t MaxMenuItem = 13;
uint8_t maxMenuItem = 13;
#else
#ifdef USE_NAVICTRL
#include "gps.c"
uint8_t MaxMenuItem = 14;
uint8_t maxMenuItem = 14;
#endif
#endif
uint8_t MenuItem = 0;
uint8_t RemoteKeys = 0;
uint8_t menuItem = 0;
uint8_t remoteKeys = 0;
 
#define KEY1 0x01
#define KEY2 0x02
78,16 → 78,16
#define KEY5 0x10
 
#define DISPLAYBUFFSIZE 80
int8_t DisplayBuff[DISPLAYBUFFSIZE] = "Hello World";
uint8_t DispPtr = 0;
int8_t displayBuff[DISPLAYBUFFSIZE] = "Hello World";
uint8_t dispPtr = 0;
 
/************************************/
/* Clear LCD Buffer */
/************************************/
void LCD_Clear(void) {
void LCD_clear(void) {
uint8_t i;
for (i = 0; i < DISPLAYBUFFSIZE; i++)
DisplayBuff[i] = ' ';
displayBuff[i] = ' ';
}
 
/************************************/
94,35 → 94,35
/* Update Menu on LCD */
/************************************/
// Display with 20 characters in 4 lines
void LCD_PrintMenu(void) {
if (RemoteKeys & KEY1) {
if (MenuItem)
MenuItem--;
void LCD_printMenu(void) {
if (remoteKeys & KEY1) {
if (menuItem)
menuItem--;
else
MenuItem = MaxMenuItem;
menuItem = maxMenuItem;
}
 
if (RemoteKeys & KEY2) {
if (MenuItem == MaxMenuItem)
MenuItem = 0;
if (remoteKeys & KEY2) {
if (menuItem == maxMenuItem)
menuItem = 0;
else
MenuItem++;
menuItem++;
}
if ((RemoteKeys & KEY1) && (RemoteKeys & KEY2))
MenuItem = 0;
if ((remoteKeys & KEY1) && (remoteKeys & KEY2))
menuItem = 0;
 
LCD_Clear();
LCD_clear();
 
if (MenuItem > MaxMenuItem)
MenuItem = MaxMenuItem;
if (menuItem > maxMenuItem)
menuItem = maxMenuItem;
// print menu item number in the upper right corner
if (MenuItem < 10) {
LCD_printfxy(17,0,"[%i]",MenuItem);
if (menuItem < 10) {
LCD_printfxy(17,0,"[%i]", menuItem);
} else {
LCD_printfxy(16,0,"[%i]",MenuItem);
LCD_printfxy(16,0,"[%i]", menuItem);
}
 
switch (MenuItem) {
switch (menuItem) {
case 0:// Version Info Menu Item
LCD_printfxy(0,0,"+ MikroKopter +")
;
289,9 → 289,9
#endif
 
default:
MaxMenuItem = MenuItem - 1;
MenuItem = 0;
maxMenuItem = menuItem - 1;
menuItem = 0;
break;
}
RemoteKeys = 0;
remoteKeys = 0;
}