rooty/LibrePilot
1
0
Fork 0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2025-03-21 13:28:58 +01:00
Code Issues Releases Activity

Handle I2C defines better, needed in CC for now

Browse Source 
git-svn-id: svn://svn.openpilot.org/OpenPilot/trunk@2815 ebee16cc-31ac-478f-84a7-5cbb03baadba
This commit is contained in:
sambas 2011-02-20 07:14:02 +00:00 committed by sambas
parent 06a8fdb45d
commit 8d6f320fca
3 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
flight/Modules/Actuator/actuator.c
View File

@ -445,6 +445,7 @@ static bool set_channel(uint8_t mixer_channel, uint16_t value) {
case ACTUATORSETTINGS_CHANNELTYPE_PWM:
PIOS_Servo_Set(settings.ChannelAddr[mixer_channel], value);
return true;
#if defined(PIOS_INCLUDE_I2C_ESC)
case ACTUATORSETTINGS_CHANNELTYPE_MK:
{
ManualControlCommandData manual;
@ -462,6 +463,7 @@ static bool set_channel(uint8_t mixer_channel, uint16_t value) {
case ACTUATORSETTINGS_CHANNELTYPE_ASTEC4:
return PIOS_SetAstec4Speed(settings.ChannelAddr[mixer_channel],value);
break;
#endif
default:
return false;
}

2
flight/Modules/System/systemmod.c
View File

@ -227,6 +227,7 @@ static void updateI2Cstats() {} //Posix and win32 don't have I2C
#else
static void updateI2Cstats()
{
#if defined(PIOS_INCLUDE_I2C)
I2CStatsData i2cStats;
I2CStatsGet(&i2cStats);
@ -241,6 +242,7 @@ static void updateI2Cstats()
}
i2cStats.last_error_type = history.type;
I2CStatsSet(&i2cStats);
#endif
}
#endif

3
flight/PiOS/STM32F10x/pios_i2c.c
View File

@ -959,7 +959,6 @@ bool PIOS_I2C_Transfer(uint32_t i2c_id, const struct pios_i2c_txn txn_list[], ui
return (!i2c_adapter->bus_error) && semaphore_success;
}
#endif
void PIOS_I2C_EV_IRQ_Handler(uint32_t i2c_id)
{
@ -1110,6 +1109,8 @@ void PIOS_I2C_ER_IRQ_Handler(uint32_t i2c_id)
}
}
#endif
/**
* @}
* @}