Subversion Repositories FlightCtrl

Compare Revisions

Ignore whitespace Rev 2464 → Rev 2465

/I2C_Telemetry/trunk/main.c
224,6 → 224,8
}
PrintLine();// ("\n\r===================================");
 
// no mixer table here!
RequiredMotors = FoundMotors;
 
if(RequiredMotors < FoundMotors) UART_VersionInfo.HardwareError[1] |= FC_ERROR1_MIXER;
 
/I2C_Telemetry/trunk/menu.c
231,7 → 231,7
for(i=0;i<3;i++)
{
LCD_printfxy(0,i+1,"%3d %3d %3d %3d ",Motor[i*4].State & MOTOR_STATE_ERROR_MASK,Motor[i*4+1].State & MOTOR_STATE_ERROR_MASK,Motor[i*4+2].State & MOTOR_STATE_ERROR_MASK,Motor[i*4+3].State & MOTOR_STATE_ERROR_MASK);
// if(i*4 >= RequiredMotors) break;
if(i*4 >= RequiredMotors) break;
}
break;
case 15:
239,7 → 239,7
for(i=0;i<3;i++)
{
LCD_printfxy(0,i+1,"%3d %3d %3d %3d ",Motor[i*4].Temperature,Motor[i*4+1].Temperature,Motor[i*4+2].Temperature,Motor[i*4+3].Temperature);
// if(4 + i * 4 >= RequiredMotors) break;
if(4 + i * 4 >= RequiredMotors) break;
}
break;
case 16:
/I2C_Telemetry/trunk/twimaster.c
165,7 → 165,8
case 0: // TWI_STATE_MOTOR_TX
I2C_TransferActive = 1;
// skip motor if not used in mixer
while(motor_write < MAX_MOTORS) motor_write++;
// here we have no mixer table
while((motor_write >= RequiredMotors) && (motor_write < MAX_MOTORS)) motor_write++;
if(motor_write >= MAX_MOTORS) // writing finished, read now
{
BLConfig_WriteMask = 0; // reset configuration bitmask