Subversion Repositories FlightCtrl

Compare Revisions

Ignore whitespace Rev 1742 → Rev 1743

/trunk/Spektrum.c
15,6 → 15,7
#endif
//--------------------------------------------------------------//
//--------------------------------------------------------------//
/*
void SpektrumBinding(void)
{
unsigned int timerTimeout = SetDelay(10000); // Timeout 10 sec.
68,7 → 69,7
 
SpektrumUartInit(); // init Uart again
}
 
*/
//############################################################################
// USART1 initialisation from killagreg
void SpektrumUartInit(void)
/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
151,7 → 151,7
UART_Init();
rc_sum_init();
ADC_Init();
I2C_Init();
I2C_Init(1);
SPI_MasterInit();
Capacity_Init();
LIBFC_Init();
/trunk/makefile
6,7 → 6,7
#-------------------------------------------------------------------
VERSION_MAJOR = 0
VERSION_MINOR = 80
VERSION_PATCH = 6
VERSION_PATCH = 7
VERSION_SERIAL_MAJOR = 11 # Serial Protocol
VERSION_SERIAL_MINOR = 0 # Serial Protocol
NC_SPI_COMPATIBLE = 14 # Navi-Kompatibilität
/trunk/twimaster.c
93,7 → 93,7
/* Initialize I2C (TWI) */
/**************************************************/
 
void I2C_Init(void)
void I2C_Init(char clear)
{
uint8_t i;
uint8_t sreg = SREG;
117,7 → 117,7
motor_write = 0;
motor_read = 0;
 
for(i=0; i < MAX_MOTORS; i++)
if(clear) for(i=0; i < MAX_MOTORS; i++)
{
Motor[i].Version = 0;
Motor[i].SetPoint = 0;
128,7 → 128,7
Motor[i].MaxPWM = 0;
Motor[i].Temperature = 0;
}
 
sei();
SREG = sreg;
}
 
144,7 → 144,7
TWDR = 0;
TWSR = 0;
TWBR = 0;
I2C_Init();
I2C_Init(0);
I2C_WriteByte(0);
BLFlags |= BLFLAG_READ_VERSION;
}
/trunk/twimaster.h
81,7 → 81,7
 
extern volatile uint16_t I2CTimeout;
 
void I2C_Init (void); // Initialize I2C
void I2C_Init(char); // Initialize I2C
#define I2C_Start(start_state) {twi_state = start_state; BLFlags &= ~BLFLAG_TX_COMPLETE; TWCR = (1<<TWSTA) | (1<<TWEN) | (1<<TWINT) | (1<<TWIE);}
#define I2C_Stop(start_state) {twi_state = start_state; TWCR = (1<<TWEN) | (1<<TWSTO) | (1<<TWINT);}
void I2C_Reset(void); // Reset I2C
/trunk/version.txt
424,3 → 424,7
0.80g H.Buss 11.08.2010
- erweitetern Messbereich für Luftdruck bei der FC2.1 aktiviert
 
0.80h H.Buss 30.08.2010
- bei I2C-Fehlern wurden die Counter zurück gesetzt und für einige ms die Interrupts angehalten - das ist jetzt behoben