Subversion Repositories FlightCtrl

Compare Revisions

Ignore whitespace Rev 951 → Rev 952

/branches/V0.70d Code Redesign killagreg/fc.c
166,7 → 166,7
BeepTime = 100; // 0.1 second
Delay_ms(250); // blocks 250 ms as pause to next beep,
// this will block the flight control loop,
// therefore do not use this funktion if motors are running
// therefore do not use this function if motors are running
}
}
 
/branches/V0.70d Code Redesign killagreg/main.c
283,10 → 283,10
{
if(UBat < ParamSet.LowVoltageWarning)
{
if(BeepModulation == 0xFFFF)
BeepModulation == 0x0300;
if(!BeepTime )
{
BeepTime = 6000; // 0.6 seconds
BeepModulation = 0x0300;
}
}
#ifdef USE_NAVICTRL
/branches/V0.70d Code Redesign killagreg/spi.c
176,18 → 176,18
switch (FromNaviCtrl.Command)
{
case SPI_CMD_OSD_DATA:
// ToFlightCtrl.Param.Byte[0] = OsdBar;
// ToFlightCtrl.Param.Int[1] = Distance;
// FromFlightCtrl.Param.Byte[0] = OsdBar;
// FromFlightCtrl.Param.Int[1] = Distance;
break;
 
case SPI_CMD_GPS_POS:
// ToFlightCtrl.Param.Long[0] = GPS_Data.Longitude;
// ToFlightCtrl.Param.Long[1] = GPS_Data.Latitude;
// FromFlightCtrl.Param.Long[0] = GPS_Data.Longitude;
// FromFlightCtrl.Param.Long[1] = GPS_Data.Latitude;
break;
 
case SPI_CMD_GPS_TARGET:
// ToFlightCtrl.Param.Long[0] = GPS_Data.TargetLongitude;
// ToFlightCtrl.Param.Long[1] = GPS_Data.TargetLatitude;
// FromFlightCtrl.Param.Long[0] = GPS_Data.TargetLongitude;
// FromFlightCtrl.Param.Long[1] = GPS_Data.TargetLatitude;
break;
 
default:
/branches/V0.70d Code Redesign killagreg/twimaster.c
188,7 → 188,7
{ // data to last motor send
motor_write = 0; // reset motor write counter
}
I2C_Start(); // Repeated start -> switch salve or switch Master Transmit -> Master Receive
I2C_Start(); // Repeated start -> switch slave or switch Master Transmit -> Master Receive
break;
 
// Master Receive