Subversion Repositories FlightCtrl

Compare Revisions

Ignore whitespace Rev 1643 → Rev 1644

/trunk/fc.c
210,8 → 210,6
DebugOut.Analog[31] = GPS_Roll;
}
 
 
 
void Piep(unsigned char Anzahl, unsigned int dauer)
{
if(MotorenEin) return; //auf keinen Fall im Flug!
/trunk/libfc1284.a
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
/trunk/main.c
63,7 → 63,6
void CalMk3Mag(void)
{
static unsigned char stick = 1;
 
if(PPM_in[EE_Parameter.Kanalbelegung[K_NICK]] > -20) stick = 0;
if((PPM_in[EE_Parameter.Kanalbelegung[K_NICK]] < -70) && !stick)
{
257,8 → 256,8
J3High;
UpdateMotor=0;
if(WinkelOut.CalcState) CalMk3Mag();
else MotorRegler();
SendMotorData();
else MotorRegler();
SendMotorData();
J3Low;
if(UpdateMotor) DebugOut.Analog[17]++;
ROT_OFF;
345,7 → 344,6
second = 0;
FlugSekunden++;
}
 
if(++timer2 == 2930) // eine Minute
{
timer2 = 0;
/trunk/twimaster.c
181,9 → 181,9
SIGNAL (TWI_vect)
//############################################################################
{ // 2 3 4 5 6 7 8 9
unsigned char test[] = {0,0,'#',0x1F,255,30,99,49,0x00,7,8,9,10};
unsigned char test[] = {0,0,'#',0x1F,255,30,99,64,0x00,7,8,9,10};
static unsigned char missing_motor,send = 0,crc = 0,read_more = 0;
 
J4High;
switch(twi_state++)
{
//++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
203,7 → 203,7
case 1:
i2c_write_byte(Motor[motor].SetPoint);
// if(!(Motor[motor].Version & MOTOR_STATE_NEW_PROTOCOL_MASK) /*|| !Motor[motor].SetPointLowerBits*/)
if(!(Motor[motor].Version & MOTOR_STATE_NEW_PROTOCOL_MASK) || !Motor[motor].SetPointLowerBits && !TransmitBlConfig)
if((!(Motor[motor].Version & MOTOR_STATE_NEW_PROTOCOL_MASK) || !Motor[motor].SetPointLowerBits) && !TransmitBlConfig)
twi_state++; // skip
break;
case 2:
223,7 → 223,6
{
if(send <= 10) twi_state--;
}
 
break;
case 3:
motor++;
353,5 → 352,6
break;
}
TWCR |= 0x80;
J4Low;
}