Subversion Repositories FlightCtrl

Compare Revisions

Ignore whitespace Rev 1748 → Rev 1749

/branches/MartinW_Jeti+/uart.c
79,44 → 79,46
unsigned int DebugDataIntervall = 0, Intervall3D = 0, Display_Interval = 0;
unsigned int AboTimeOut = 0;
 
const unsigned char ANALOG_TEXT[32][16] PROGMEM =
 
const unsigned char ANALOG_TEXT[32][13] PROGMEM =
{
//1234567890123456
"AngleNick ", //0
"AngleRoll ",
"AccNick ",
"AccRoll ",
"YawGyro ",
"Height Value ", //5
"AccZ ",
"Gas ",
"Compass Value ",
"Voltage [0.1V] ",
"Receiver Level ", //10
"Gyro Compass ",
"Motor 1 ",
"Motor 2 ",
"Motor 3 ",
"Motor 4 ", //15
"Motor 5 ",
"Motor 6 ",
"18 ",
"WoutCalcState ",
"Servo ", //20
"Hovergas ",
"Current [0.1A] ",
"Capacity [mAh] ",
"Motor 7 ",
"Motor 8 ", //25
"Motor 9 ",
"Motor 10 ",
"I2C-Error ",
"BL Limit ",
"GPS_Nick ", //30
"GPS_Roll "
"AngleNick ", //0
"AngleRoll ",
"AccNick ",
"AccRoll ",
"YawGyro ",
"Height Value ", //5
"AccZ ",
"Gas ",
"Compass Value",
"Voltage[0.1V]",
"ReceiverLevel", //10
"Gyro Compass ",
"Motor 1 ",
"Motor 2 ",
"Motor 3 ",
"Motor 4 ", //15
"Motor 5 ",
"Motor 6 ",
"18 ",
"WoutCalcState",
"Servo ", //20
"Hovergas ",
"Current[0.1A]",
"Capacity[mAh]",
"Motor 7 ",
"Motor 8 ", //25
"Motor 9 ",
"Motor 10 ",
"I2C-Error ",
"BL Limit ",
"GPS_Nick ", //30
"GPS_Roll "
};
 
 
 
//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
//++ Sende-Part der Datenübertragung
//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
167,7 → 169,11
RxdBuffer[buf_ptr] = '\r';
if(RxdBuffer[2] == 'R')
{
#ifdef NODISPLAY // main.h
 
#warning : "### no MKTool Display ###"
LcdClear();
#endif
wdt_enable(WDTO_250MS); // Reset-Commando
ServoActive = 0;
 
492,6 → 498,10
break;
 
case 'h':// x-1 Displayzeilen
#ifdef NODISPLAY // only include functions if DEBUG is defined in main.h
#warning : "### no MKTool Display ###"
 
PcZugriff = 255;
if((pRxData[0] & 0x80) == 0x00) // old format
{
513,6 → 523,7
MenuePunkt = pRxData[0];
DebugDisplayAnforderung1 = 1;
break;
#endif
case 'v': // Version-Anforderung und Ausbaustufe
GetVersionAnforderung = 1;
break;
588,6 → 599,8
DebugDataIntervall = 0;
Intervall3D = 0;
}
#ifdef NODISPLAY //main.h
#warning : "### no MKTool Display ###"
 
if(((Display_Interval>0 && CheckDelay(Display_Timer)) || DebugDisplayAnforderung) && UebertragungAbgeschlossen)
{
611,6 → 624,7
SendOutData('L', FC_ADDRESS, 3, &MenuePunkt, sizeof(MenuePunkt), &MaxMenue, sizeof(MaxMenue), DisplayBuff, sizeof(DisplayBuff));
DebugDisplayAnforderung1 = 0;
}
#endif
if(GetVersionAnforderung && UebertragungAbgeschlossen)
{
SendOutData('V', FC_ADDRESS, 1, (unsigned char *) &VersionInfo, sizeof(VersionInfo));