Subversion Repositories NaviCtrl

Compare Revisions

Ignore whitespace Rev 74 → Rev 75

/trunk/Hex-Files/Navi-Ctrl_STR9_V0_14a.hex
File deleted
/trunk/main.c
336,6 → 336,7
{
if(!CheckSPIOkay) GPS_Navigation(); // process the GPS data even if the FC is not connected
CheckErrors();
if(FC.MKFlags & MKFLAG_FLY) NaviData.FlyingTime++;
TimerCheckError = SetDelay(1000);
Request_SendFollowMe = TRUE;
}
343,7 → 344,6
if(CheckDelay(TimerKmlAddPointDelay))
{
TimerKmlAddPointDelay = SetDelay(500); // every 500 ms
 
if(FC.MKFlags & MKFLAG_FLY) // model is flying
{
switch(logfilestate)
406,7 → 406,7
}
break;
 
default:
default:
break;
}
} // EOF model is flying
/trunk/spi_slave.c
324,6 → 324,7
FC.UBat = FromFlightCtrl.Param.Byte[9];
Parameter.LowVoltageWarning = FromFlightCtrl.Param.Byte[10];
Parameter.ActiveSetting = FromFlightCtrl.Param.Byte[11];
DebugOut.Analog[5] = FC.MKFlags;
break;
 
#define CHK_POTI_MM(b,a,min,max) { if(a > 250) { if(a == 251) b = FC.Poti1; else if(a == 252) b = FC.Poti2; else if(a == 253) b = FC.Poti3; else if(a == 254) b = FC.Poti4;} else b = a; if(b <= min) b = min; else if(b >= max) b = max;}
/trunk/uart1.c
121,9 → 121,9
Data3D_t Data3D;
 
u32 DebugData_Timer;
u32 DebugData_Interval = 1000; // in ms
u32 DebugData_Interval = 5000; // in ms
u32 NaviData_Timer;
u32 NaviData_Interval = 1000; // in ms
u32 NaviData_Interval = 5000; // in ms
u32 Data3D_Timer = 0; // in ms
u32 Data3D_Interval = 0;
 
137,7 → 137,7
"AccNick ",
"AccRoll ",
" ",
" ", //5
"MK-Flags ", //5
" ",
" ",
" ",
/trunk/uart1.h
87,7 → 87,7
 
extern NaviData_t NaviData;
extern u8 Request_NaviData;
 
#define NC_FLAG_FREE 1
#define NC_FLAG_PH 2
#define NC_FLAG_CH 4