Merge pull request #1668 from AlienWiiBF/Serial_Fix
Fix findSerialPortIndexByIdentifier() function
This commit is contained in:
commit
ebb1be31d0
|
@ -110,8 +110,7 @@ baudRate_e lookupBaudRateIndex(uint32_t baudRate)
|
||||||
int findSerialPortIndexByIdentifier(serialPortIdentifier_e identifier)
|
int findSerialPortIndexByIdentifier(serialPortIdentifier_e identifier)
|
||||||
{
|
{
|
||||||
for (int index = 0; index < SERIAL_PORT_COUNT; index++) {
|
for (int index = 0; index < SERIAL_PORT_COUNT; index++) {
|
||||||
const serialPortUsage_t *candidate = &serialPortUsageList[index];
|
if (serialPortIdentifiers[index] == identifier) {
|
||||||
if (candidate->identifier == identifier) {
|
|
||||||
return index;
|
return index;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -47,14 +47,13 @@ void targetConfiguration(master_t *config)
|
||||||
{
|
{
|
||||||
config->rxConfig.spektrum_sat_bind = 5;
|
config->rxConfig.spektrum_sat_bind = 5;
|
||||||
config->rxConfig.spektrum_sat_bind_autoreset = 1;
|
config->rxConfig.spektrum_sat_bind_autoreset = 1;
|
||||||
config->gyro_sync_denom = 2;
|
|
||||||
config->sensorSelectionConfig.mag_hardware = MAG_NONE; // disabled by default
|
config->sensorSelectionConfig.mag_hardware = MAG_NONE; // disabled by default
|
||||||
config->pid_process_denom = 1;
|
|
||||||
|
|
||||||
if (hardwareMotorType == MOTOR_BRUSHED) {
|
if (hardwareMotorType == MOTOR_BRUSHED) {
|
||||||
config->motorConfig.minthrottle = 1000;
|
config->motorConfig.minthrottle = 1000;
|
||||||
config->motorConfig.motorPwmRate = 32000;
|
config->motorConfig.motorPwmRate = 32000;
|
||||||
config->motorConfig.motorPwmProtocol = PWM_TYPE_BRUSHED;
|
config->motorConfig.motorPwmProtocol = PWM_TYPE_BRUSHED;
|
||||||
|
config->pid_process_denom = 2;
|
||||||
config->motorConfig.useUnsyncedPwm = true;
|
config->motorConfig.useUnsyncedPwm = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -58,14 +58,13 @@ void targetConfiguration(master_t *config)
|
||||||
{
|
{
|
||||||
config->batteryConfig.currentMeterOffset = CURRENTOFFSET;
|
config->batteryConfig.currentMeterOffset = CURRENTOFFSET;
|
||||||
config->batteryConfig.currentMeterScale = CURRENTSCALE;
|
config->batteryConfig.currentMeterScale = CURRENTSCALE;
|
||||||
config->gyro_sync_denom = 1;
|
|
||||||
config->sensorSelectionConfig.mag_hardware = MAG_NONE; // disabled by default
|
config->sensorSelectionConfig.mag_hardware = MAG_NONE; // disabled by default
|
||||||
config->pid_process_denom = 1;
|
|
||||||
|
|
||||||
if (hardwareMotorType == MOTOR_BRUSHED) {
|
if (hardwareMotorType == MOTOR_BRUSHED) {
|
||||||
config->motorConfig.minthrottle = 1000;
|
config->motorConfig.minthrottle = 1000;
|
||||||
config->motorConfig.motorPwmRate = BRUSHED_MOTORS_PWM_RATE;
|
config->motorConfig.motorPwmRate = BRUSHED_MOTORS_PWM_RATE;
|
||||||
config->motorConfig.motorPwmProtocol = PWM_TYPE_BRUSHED;
|
config->motorConfig.motorPwmProtocol = PWM_TYPE_BRUSHED;
|
||||||
|
config->pid_process_denom = 1;
|
||||||
config->motorConfig.useUnsyncedPwm = true;
|
config->motorConfig.useUnsyncedPwm = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue