rooty/LibrePilot
1
0
Fork 0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2025-01-30 15:52:12 +01:00
Code Issues Releases Activity

Made OverSynce an optional module.

Browse Source 
Conflicts:

	shared/uavobjectdefinition/hwsettings.xml
This commit is contained in:
James Cotton 2012-07-14 09:07:22 -05:00
parent 6e12054a08
commit 9eee4f1bc7
2 changed files with 25 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
flight/Modules/OveroSync/overosync.c
View File

@ -31,6 +31,7 @@
*/ */
#include "openpilot.h" #include "openpilot.h"
#include "hwsettings.h"
#include "overosync.h" #include "overosync.h"
#include "overosyncstats.h" #include "overosyncstats.h"
#include "systemstats.h" #include "systemstats.h"
@ -49,6 +50,7 @@ static UAVTalkConnection uavTalkCon;
static xTaskHandle overoSyncTaskHandle; static xTaskHandle overoSyncTaskHandle;
volatile bool buffer_swap_failed; volatile bool buffer_swap_failed;
volatile uint32_t buffer_swap_timeval; volatile uint32_t buffer_swap_timeval;
static bool overoEnabled;
// Private functions // Private functions
static void overoSyncTask(void *parameters); static void overoSyncTask(void *parameters);
@ -141,6 +143,23 @@ int32_t OveroSyncInitialize(void)
if(pios_spi_overo_id == 0) if(pios_spi_overo_id == 0)
return -1; return -1;
#ifdef MODULE_OVERO_BUILTIN
overoEnabled = true;
#else
HwSettingsInitialize();
uint8_t optionalModules[HWSETTINGS_OPTIONALMODULES_NUMELEM];
HwSettingsOptionalModulesGet(optionalModules);
if (optionalModules[HWSETTINGS_OPTIONALMODULES_OVERO] == HWSETTINGS_OPTIONALMODULES_ENABLED) {
overoEnabled = true;
} else {
overoEnabled = false;
return -1;
}
#endif
OveroSyncStatsInitialize(); OveroSyncStatsInitialize();
PIOS_EXTI_Init(&pios_exti_overo_cfg); PIOS_EXTI_Init(&pios_exti_overo_cfg);
@ -160,6 +179,11 @@ int32_t OveroSyncInitialize(void)
*/ */
int32_t OveroSyncStart(void) int32_t OveroSyncStart(void)
{ {
//Check if module is enabled or not
if (overoEnabled == false) {
return -1;
}
if(pios_spi_overo_id == 0) if(pios_spi_overo_id == 0)
return -1; return -1;

2
shared/uavobjectdefinition/hwsettings.xml
View File

@ -18,7 +18,7 @@
<field name="USB_HIDPort" units="function" type="enum" elements="1" options="USBTelemetry,Disabled" defaultvalue="USBTelemetry"/> <field name="USB_HIDPort" units="function" type="enum" elements="1" options="USBTelemetry,Disabled" defaultvalue="USBTelemetry"/>
<field name="USB_VCPPort" units="function" type="enum" elements="1" options="USBTelemetry,ComBridge,Disabled" defaultvalue="Disabled"/> <field name="USB_VCPPort" units="function" type="enum" elements="1" options="USBTelemetry,ComBridge,Disabled" defaultvalue="Disabled"/>
<field name="OptionalModules" units="" type="enum" elementnames="CameraStab,GPS,ComUsbBridge,Fault,Altitude,Airspeed,TxPID,Battery,VtolPathFollower,FixedWingPathFollower" options="Disabled,Enabled" defaultvalue="Disabled"/> <field name="OptionalModules" units="" type="enum" elementnames="CameraStab,GPS,ComUsbBridge,Fault,Altitude,Airspeed,TxPID,VtolPathFollower,FixedWingPathFollower,Battery,Overo" options="Disabled,Enabled" defaultvalue="Disabled"/>
<field name="DSMxBind" units="" type="uint8" elements="1" defaultvalue="0"/> <field name="DSMxBind" units="" type="uint8" elements="1" defaultvalue="0"/>
<access gcs="readwrite" flight="readwrite"/> <access gcs="readwrite" flight="readwrite"/>