mirror of
https://bitbucket.org/librepilot/librepilot.git
synced 2025-02-20 10:54:14 +01:00
OP-976: Add the ';' back
This compile successfuly with make all_flight
This commit is contained in:
parent
1cfc7f1586
commit
23b2907d08
@ -139,7 +139,7 @@ int32_t ActuatorInitialize()
|
||||
|
||||
return 0;
|
||||
}
|
||||
MODULE_INITCALL(ActuatorInitialize, ActuatorStart)
|
||||
MODULE_INITCALL(ActuatorInitialize, ActuatorStart);
|
||||
|
||||
/**
|
||||
* @brief Main Actuator module task
|
||||
|
@ -124,7 +124,7 @@ int32_t AirspeedInitialize()
|
||||
|
||||
return 0;
|
||||
}
|
||||
MODULE_INITCALL(AirspeedInitialize, AirspeedStart)
|
||||
MODULE_INITCALL(AirspeedInitialize, AirspeedStart);
|
||||
|
||||
|
||||
/**
|
||||
|
@ -122,7 +122,7 @@ int32_t AltitudeInitialize()
|
||||
HwSettingsCC_RcvrPortGet(&hwsettings_rcvrport);
|
||||
return 0;
|
||||
}
|
||||
MODULE_INITCALL(AltitudeInitialize, AltitudeStart)
|
||||
MODULE_INITCALL(AltitudeInitialize, AltitudeStart);
|
||||
/**
|
||||
* Module thread, should not return.
|
||||
*/
|
||||
|
@ -82,7 +82,7 @@ int32_t AltitudeInitialize()
|
||||
#endif
|
||||
return 0;
|
||||
}
|
||||
MODULE_INITCALL(AltitudeInitialize, AltitudeStart)
|
||||
MODULE_INITCALL(AltitudeInitialize, AltitudeStart);
|
||||
/**
|
||||
* Module thread, should not return.
|
||||
*/
|
||||
|
@ -104,7 +104,7 @@ int32_t AltitudeHoldInitialize()
|
||||
|
||||
return 0;
|
||||
}
|
||||
MODULE_INITCALL(AltitudeHoldInitialize, AltitudeHoldStart)
|
||||
MODULE_INITCALL(AltitudeHoldInitialize, AltitudeHoldStart);
|
||||
|
||||
float tau;
|
||||
float throttleIntegral;
|
||||
|
@ -170,7 +170,7 @@ int32_t AttitudeInitialize(void)
|
||||
return 0;
|
||||
}
|
||||
|
||||
MODULE_INITCALL(AttitudeInitialize, AttitudeStart)
|
||||
MODULE_INITCALL(AttitudeInitialize, AttitudeStart);
|
||||
|
||||
/**
|
||||
* Module thread, should not return.
|
||||
|
@ -241,7 +241,7 @@ int32_t AttitudeStart(void)
|
||||
return 0;
|
||||
}
|
||||
|
||||
MODULE_INITCALL(AttitudeInitialize, AttitudeStart)
|
||||
MODULE_INITCALL(AttitudeInitialize, AttitudeStart);
|
||||
|
||||
/**
|
||||
* Module thread, should not return.
|
||||
|
@ -116,7 +116,7 @@ int32_t AutotuneStart(void)
|
||||
return 0;
|
||||
}
|
||||
|
||||
MODULE_INITCALL(AutotuneInitialize, AutotuneStart)
|
||||
MODULE_INITCALL(AutotuneInitialize, AutotuneStart);
|
||||
|
||||
/**
|
||||
* Module thread, should not return.
|
||||
|
@ -122,7 +122,7 @@ int32_t BatteryInitialize(void)
|
||||
return 0;
|
||||
}
|
||||
|
||||
MODULE_INITCALL(BatteryInitialize, 0)
|
||||
MODULE_INITCALL(BatteryInitialize, 0);
|
||||
#define HAS_SENSOR(x) batterySettings.SensorType[x] == FLIGHTBATTERYSETTINGS_SENSORTYPE_ENABLED
|
||||
static void onTimer(__attribute__((unused)) UAVObjEvent *ev)
|
||||
{
|
||||
|
@ -142,7 +142,7 @@ int32_t CameraStabStart(void)
|
||||
return 0;
|
||||
}
|
||||
|
||||
MODULE_INITCALL(CameraStabInitialize, CameraStabStart)
|
||||
MODULE_INITCALL(CameraStabInitialize, CameraStabStart);
|
||||
|
||||
static void attitudeUpdated(UAVObjEvent *ev)
|
||||
{
|
||||
|
@ -125,7 +125,7 @@ static int32_t comUsbBridgeInitialize(void)
|
||||
|
||||
return 0;
|
||||
}
|
||||
MODULE_INITCALL(comUsbBridgeInitialize, comUsbBridgeStart)
|
||||
MODULE_INITCALL(comUsbBridgeInitialize, comUsbBridgeStart);
|
||||
|
||||
/**
|
||||
* Main task. It does not return.
|
||||
|
@ -59,4 +59,4 @@ void ExampleInitialize(void)
|
||||
{
|
||||
ExampleModEventInitialize();
|
||||
}
|
||||
MODULE_INITCALL(ExampleInitialize, ExampleStart)
|
||||
MODULE_INITCALL(ExampleInitialize, ExampleStart);
|
||||
|
@ -123,7 +123,7 @@ int32_t MagBaroInitialize()
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
MODULE_INITCALL(MagBaroInitialize, MagBaroStart)
|
||||
MODULE_INITCALL(MagBaroInitialize, MagBaroStart);
|
||||
/**
|
||||
* Module thread, should not return.
|
||||
*/
|
||||
|
@ -113,7 +113,7 @@ static int32_t fault_start(void)
|
||||
}
|
||||
return -1;
|
||||
}
|
||||
MODULE_INITCALL(fault_initialize, fault_start)
|
||||
MODULE_INITCALL(fault_initialize, fault_start);
|
||||
|
||||
static void fault_task(__attribute__((unused)) void *parameters)
|
||||
{
|
||||
|
@ -86,7 +86,7 @@ static void resetTask(UAVObjEvent *);
|
||||
* \note
|
||||
*
|
||||
*/
|
||||
MODULE_INITCALL(FirmwareIAPInitialize, 0)
|
||||
MODULE_INITCALL(FirmwareIAPInitialize, 0);
|
||||
int32_t FirmwareIAPInitialize()
|
||||
{
|
||||
FirmwareIAPObjInitialize();
|
||||
|
@ -127,7 +127,7 @@ int32_t FixedWingPathFollowerInitialize()
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
MODULE_INITCALL(FixedWingPathFollowerInitialize, FixedWingPathFollowerStart)
|
||||
MODULE_INITCALL(FixedWingPathFollowerInitialize, FixedWingPathFollowerStart);
|
||||
|
||||
static float northVelIntegral = 0;
|
||||
static float eastVelIntegral = 0;
|
||||
|
@ -93,7 +93,7 @@ int32_t FlightPlanInitialize()
|
||||
|
||||
return 0;
|
||||
}
|
||||
MODULE_INITCALL(FlightPlanInitialize, FlightPlanStart)
|
||||
MODULE_INITCALL(FlightPlanInitialize, FlightPlanStart);
|
||||
/**
|
||||
* Module task
|
||||
*/
|
||||
|
@ -190,7 +190,7 @@ int32_t GPSInitialize(void)
|
||||
return -1;
|
||||
}
|
||||
|
||||
MODULE_INITCALL(GPSInitialize, GPSStart)
|
||||
MODULE_INITCALL(GPSInitialize, GPSStart);
|
||||
|
||||
// ****************
|
||||
/**
|
||||
|
@ -162,7 +162,7 @@ int32_t ManualControlInitialize()
|
||||
|
||||
return 0;
|
||||
}
|
||||
MODULE_INITCALL(ManualControlInitialize, ManualControlStart)
|
||||
MODULE_INITCALL(ManualControlInitialize, ManualControlStart);
|
||||
|
||||
/**
|
||||
* Module task
|
||||
|
@ -117,7 +117,7 @@ int32_t OPLinkModInitialize(void)
|
||||
return 0;
|
||||
}
|
||||
|
||||
MODULE_INITCALL(OPLinkModInitialize, 0)
|
||||
MODULE_INITCALL(OPLinkModInitialize, 0);
|
||||
|
||||
/**
|
||||
* System task, periodically executes every SYSTEM_UPDATE_PERIOD_MS
|
||||
|
@ -68,7 +68,7 @@ int32_t WavPlayerInitialize(void)
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
MODULE_INITCALL(WavPlayerInitialize, WavPlayerStart)
|
||||
MODULE_INITCALL(WavPlayerInitialize, WavPlayerStart);
|
||||
|
||||
// ****************
|
||||
/**
|
||||
|
@ -2436,7 +2436,7 @@ int32_t osdgenInitialize(void)
|
||||
|
||||
return 0;
|
||||
}
|
||||
MODULE_INITCALL(osdgenInitialize, osdgenStart)
|
||||
MODULE_INITCALL(osdgenInitialize, osdgenStart);
|
||||
|
||||
// ****************
|
||||
/**
|
||||
|
@ -107,7 +107,7 @@ int32_t osdinputInitialize(void)
|
||||
|
||||
return 0;
|
||||
}
|
||||
MODULE_INITCALL(osdinputInitialize, osdinputStart)
|
||||
MODULE_INITCALL(osdinputInitialize, osdinputStart);
|
||||
|
||||
// ****************
|
||||
/**
|
||||
|
@ -286,7 +286,7 @@ static int32_t osdoutputInitialize(void)
|
||||
#endif
|
||||
return 0;
|
||||
}
|
||||
MODULE_INITCALL(osdoutputInitialize, osdoutputStart)
|
||||
MODULE_INITCALL(osdoutputInitialize, osdoutputStart);
|
||||
|
||||
/**
|
||||
* @}
|
||||
|
@ -136,7 +136,7 @@ int32_t OveroSyncStart(void)
|
||||
return 0;
|
||||
}
|
||||
|
||||
MODULE_INITCALL(OveroSyncInitialize, OveroSyncStart)
|
||||
MODULE_INITCALL(OveroSyncInitialize, OveroSyncStart);
|
||||
|
||||
/**
|
||||
* Register a new object, adds object to local list and connects the queue depending on the object's
|
||||
|
@ -138,7 +138,7 @@ int32_t OveroSyncStart(void)
|
||||
return 0;
|
||||
}
|
||||
|
||||
MODULE_INITCALL(OveroSyncInitialize, OveroSyncStart)
|
||||
MODULE_INITCALL(OveroSyncInitialize, OveroSyncStart);
|
||||
|
||||
/**
|
||||
* Register a new object, adds object to local list and connects the queue depending on the object's
|
||||
|
@ -111,7 +111,7 @@ int32_t PathPlannerInitialize()
|
||||
return 0;
|
||||
}
|
||||
|
||||
MODULE_INITCALL(PathPlannerInitialize, PathPlannerStart)
|
||||
MODULE_INITCALL(PathPlannerInitialize, PathPlannerStart);
|
||||
|
||||
/**
|
||||
* Module task
|
||||
|
@ -246,7 +246,7 @@ static int32_t RadioComBridgeInitialize(void)
|
||||
|
||||
return 0;
|
||||
}
|
||||
MODULE_INITCALL(RadioComBridgeInitialize, RadioComBridgeStart)
|
||||
MODULE_INITCALL(RadioComBridgeInitialize, RadioComBridgeStart);
|
||||
|
||||
/**
|
||||
* Telemetry transmit task, regular priority
|
||||
|
@ -143,7 +143,7 @@ int32_t SensorsStart(void)
|
||||
return 0;
|
||||
}
|
||||
|
||||
MODULE_INITCALL(SensorsInitialize, SensorsStart)
|
||||
MODULE_INITCALL(SensorsInitialize, SensorsStart);
|
||||
|
||||
int32_t accel_test;
|
||||
int32_t gyro_test;
|
||||
|
@ -138,7 +138,7 @@ int32_t SensorsStart(void)
|
||||
return 0;
|
||||
}
|
||||
|
||||
MODULE_INITCALL(SensorsInitialize, SensorsStart)
|
||||
MODULE_INITCALL(SensorsInitialize, SensorsStart);
|
||||
|
||||
/**
|
||||
* Simulated sensor task. Run a model of the airframe and produce sensor values
|
||||
|
@ -138,7 +138,7 @@ int32_t StabilizationInitialize()
|
||||
return 0;
|
||||
}
|
||||
|
||||
MODULE_INITCALL(StabilizationInitialize, StabilizationStart)
|
||||
MODULE_INITCALL(StabilizationInitialize, StabilizationStart);
|
||||
|
||||
/**
|
||||
* Module task
|
||||
|
@ -154,7 +154,7 @@ int32_t SystemModInitialize(void)
|
||||
return 0;
|
||||
}
|
||||
|
||||
MODULE_INITCALL(SystemModInitialize, 0)
|
||||
MODULE_INITCALL(SystemModInitialize, 0);
|
||||
/**
|
||||
* System task, periodically executes every SYSTEM_UPDATE_PERIOD_MS
|
||||
*/
|
||||
|
@ -148,7 +148,7 @@ int32_t TelemetryInitialize(void)
|
||||
return 0;
|
||||
}
|
||||
|
||||
MODULE_INITCALL(TelemetryInitialize, TelemetryStart)
|
||||
MODULE_INITCALL(TelemetryInitialize, TelemetryStart);
|
||||
|
||||
/**
|
||||
* Register a new object, adds object to local list and connects the queue depending on the object's
|
||||
|
@ -138,7 +138,7 @@ int32_t TxPIDStart(void)
|
||||
return 0;
|
||||
}
|
||||
|
||||
MODULE_INITCALL(TxPIDInitialize, TxPIDStart)
|
||||
MODULE_INITCALL(TxPIDInitialize, TxPIDStart);
|
||||
|
||||
/**
|
||||
* Update PIDs callback function
|
||||
|
@ -147,7 +147,7 @@ int32_t VtolPathFollowerInitialize()
|
||||
return 0;
|
||||
}
|
||||
|
||||
MODULE_INITCALL(VtolPathFollowerInitialize, VtolPathFollowerStart)
|
||||
MODULE_INITCALL(VtolPathFollowerInitialize, VtolPathFollowerStart);
|
||||
|
||||
static float northVelIntegral = 0;
|
||||
static float eastVelIntegral = 0;
|
||||
|
@ -56,7 +56,7 @@ extern initmodule_t __module_initcall_start[], __module_initcall_end[];
|
||||
extern void InitModules();
|
||||
extern void StartModules();
|
||||
|
||||
#define MODULE_INITCALL(ifn, sfn)
|
||||
#define MODULE_INITCALL(ifn, sfn);
|
||||
|
||||
#define MODULE_TASKCREATE_ALL \
|
||||
{ \
|
||||
@ -89,7 +89,7 @@ extern void StartModules();
|
||||
static initmodule_t __initcall_##fn __attribute__((__used__)) \
|
||||
__attribute__((__section__(".initcall" level ".init"))) = { .fn_minit = ifn, .fn_tinit = sfn };
|
||||
|
||||
#define MODULE_INITCALL(ifn, sfn) __define_module_initcall("module", ifn, sfn)
|
||||
#define MODULE_INITCALL(ifn, sfn); __define_module_initcall("module", ifn, sfn)
|
||||
|
||||
#define MODULE_INITIALISE_ALL \
|
||||
{ for (initmodule_t *fn = __module_initcall_start; fn < __module_initcall_end; fn++) { \
|
||||
|
@ -51,7 +51,7 @@ extern initmodule_t __module_initcall_start[], __module_initcall_end[];
|
||||
extern void InitModules();
|
||||
extern void StartModules();
|
||||
|
||||
#define MODULE_INITCALL(ifn, sfn)
|
||||
#define MODULE_INITCALL(ifn, sfn);
|
||||
|
||||
#define MODULE_TASKCREATE_ALL \
|
||||
{ \
|
||||
|
@ -38,7 +38,7 @@
|
||||
* and we cannot define a linker script for each of them atm
|
||||
*/
|
||||
|
||||
#define MODULE_INITCALL(ifn, sfn)
|
||||
#define MODULE_INITCALL(ifn, sfn);
|
||||
|
||||
#define MODULE_TASKCREATE_ALL
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user