Subversion Repositories FlightCtrl

Compare Revisions

Ignore whitespace Rev 2627 → Rev 2628

/trunk/libfc1284.a
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
/trunk/libfc644.a
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
/trunk/main.c
51,7 → 51,7
// + Note: For information on license extensions (e.g. commercial use), please contact us at info(@)hisystems.de.
// ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
#include "main.h"
unsigned char DisableRcOffBeeping = 0;
unsigned char DisableRcOffBeeping = 1;
unsigned char PlatinenVersion = 10;
unsigned char BattLowVoltageWarning = 94;
unsigned char BattAutoLandingVoltage = 0, BattComingHomeVoltage = 0;
479,7 → 479,7
 
DebugOut.Status[0] = 0x01 | 0x02;
JetiBeep = 0;
if(EE_Parameter.ExtraConfig & CFG_NO_RCOFF_BEEPING) DisableRcOffBeeping = 1;
if(!(EE_Parameter.ExtraConfig & CFG_NO_RCOFF_BEEPING)) DisableRcOffBeeping = 0;
ReadBlSize = 3; // don't read the version any more
#ifdef REDUNDANT_FC_SLAVE
timer = SetDelay(2500);
758,7 → 758,7
} // 500Hz
if(update_spi == 0) // 41Hz
{
if(!MotorenEin && NC_RequestsConfig) { SendSettingToNC(); NC_RequestsConfig = 0;}
if(!MotorenEin && NC_RequestsConfig) { SendSettingToNC(); update_spi = 12;}
else
if(SPI_StartTransmitPacket()) update_spi = 12;
else
/trunk/spi.c
180,7 → 180,6
{
// if(!SPITransferCompleted) return(0);
while(!SPITransferCompleted) { SPI_TransmitByte();_delay_us(100);}; // send the remaining data
while(I2C_TransferActive) _delay_us(10); // wait until the I2C data is finished -> avoid I2C errors
SLAVE_SELECT_PORT &= ~(1 << SPI_SLAVE_SELECT); // SelectSlave
SPI_TX_Buffer = (unsigned char *) &HugeBlockToNavi; // pointer to the huge Block
PtrToChksum = (unsigned char *) &HugeBlockToNavi.Chksum;
191,6 → 190,10
HugeBlockToNavi.Chksum = SPI_FCSYNCBYTE_HB1;
SPI_Datasize = sizeof(HugeBlockToNavi);
SPDR = HugeBlockToNavi.Sync1; // Start transmission
// +++++++++++++++++++++++++++++++
// finish I2CTransfer first
// if(I2C_TransferActive)_delay_ms(2);
// +++++++++++++++++++++++++++++++
SPI_TransmitByte();_delay_us(200); SPI_TransmitByte();_delay_us(200); // leave the NC a bit time to fill the FIFO
while(!SPITransferCompleted) { _delay_us(80); SPI_TransmitByte();};
}
201,6 → 204,7
EE_Parameter.crc = RAM_Checksum((uint8_t*)(&EE_Parameter), sizeof(EE_Parameter)-1);
memcpy(HugeBlockToNavi.Data, (unsigned char *) &EE_Parameter, sizeof(EE_Parameter));
TransmitHugeBlock();
NC_RequestsConfig = 0;
}
 
//------------------------------------------------------
/trunk/version.txt
830,12 → 830,14
- prevents switch-on in case of error
- switches off if Master says: Switched off by RC-Command
 
2.13e
2.13f (14.01.2016)
- New Parameter: CamCtrlModeChannel & CamCtrlZoomChannel
- CamCtrl Character in HoTT & Jeti display
- HugeBlock: wait until the I2C data is finished -> avoid I2C errors
- Servo Position from Serial Poti: check if there is valid data
- 30 sek Timout on serial Data (only for Servo Position until now)
- Small Bugfix: Bepp sequence was sometimes disturbed during power on
 
toDo:
- CalAthmospheare nachführen