rooty/LibrePilot
1
0
Fork 0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2024-11-29 07:24:13 +01:00
Code Issues Releases Activity

Merge branch 'amorale/OP-1743_fix_cc_target' into next

Browse Source
This commit is contained in:
Alessio Morale 2015-02-24 22:26:10 +01:00
commit bcbb1d08e4
6 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
flight/modules/Attitude/attitude.c
View File

@ -178,8 +178,9 @@ int32_t AttitudeStart(void)
// Start main task // Start main task
xTaskCreate(AttitudeTask, "Attitude", STACK_SIZE_BYTES / 4, NULL, TASK_PRIORITY, &taskHandle); xTaskCreate(AttitudeTask, "Attitude", STACK_SIZE_BYTES / 4, NULL, TASK_PRIORITY, &taskHandle);
PIOS_TASK_MONITOR_RegisterTask(TASKINFO_RUNNING_ATTITUDE, taskHandle); PIOS_TASK_MONITOR_RegisterTask(TASKINFO_RUNNING_ATTITUDE, taskHandle);
#ifdef PIOS_INCLUDE_WDG
PIOS_WDG_RegisterFlag(PIOS_WDG_ATTITUDE); PIOS_WDG_RegisterFlag(PIOS_WDG_ATTITUDE);
#endif
return 0; return 0;
} }
@ -253,7 +254,9 @@ static void AttitudeTask(__attribute__((unused)) void *parameters)
// Set critical error and wait until the accel is producing data // Set critical error and wait until the accel is producing data
while (PIOS_ADXL345_FifoElements() == 0) { while (PIOS_ADXL345_FifoElements() == 0) {
AlarmsSet(SYSTEMALARMS_ALARM_ATTITUDE, SYSTEMALARMS_ALARM_CRITICAL); AlarmsSet(SYSTEMALARMS_ALARM_ATTITUDE, SYSTEMALARMS_ALARM_CRITICAL);
#ifdef PIOS_INCLUDE_WDG
PIOS_WDG_UpdateFlag(PIOS_WDG_ATTITUDE); PIOS_WDG_UpdateFlag(PIOS_WDG_ATTITUDE);
#endif
} }
accel_test = PIOS_ADXL345_Test(); accel_test = PIOS_ADXL345_Test();
#endif #endif
@ -310,9 +313,9 @@ static void AttitudeTask(__attribute__((unused)) void *parameters)
} }
init = 1; init = 1;
} }
#ifdef PIOS_INCLUDE_WDG
PIOS_WDG_UpdateFlag(PIOS_WDG_ATTITUDE); PIOS_WDG_UpdateFlag(PIOS_WDG_ATTITUDE);
#endif
AccelStateData accelState; AccelStateData accelState;
GyroStateData gyros; GyroStateData gyros;
int32_t retval = 0; int32_t retval = 0;
@ -487,7 +490,7 @@ static int32_t updateSensorsCC3D(AccelStateData *accelStateData, GyroStateData *
count++; count++;
// check if further samples are already in queue // check if further samples are already in queue
ret = xQueueReceive(queue, (void *)&mpu6000_data, 0); ret = xQueueReceive(queue, (void *)mpu6000_data, 0);
} }
PERF_TRACK_VALUE(counterAccelSamples, count); PERF_TRACK_VALUE(counterAccelSamples, count);

4
flight/modules/ManualControl/manualcontrol.c
View File

@ -43,8 +43,8 @@
#include <systemsettings.h> #include <systemsettings.h>
#include <stabilizationdesired.h> #include <stabilizationdesired.h>
#include <callbackinfo.h> #include <callbackinfo.h>
#ifndef PIOS_EXCLUDE_ADVANCED_FEATURES
#include <stabilizationsettings.h> #include <stabilizationsettings.h>
#ifndef PIOS_EXCLUDE_ADVANCED_FEATURES
#include <vtolpathfollowersettings.h> #include <vtolpathfollowersettings.h>
#endif #endif
@ -160,9 +160,9 @@ int32_t ManualControlInitialize()
ManualControlSettingsInitialize(); ManualControlSettingsInitialize();
FlightModeSettingsInitialize(); FlightModeSettingsInitialize();
SystemSettingsInitialize(); SystemSettingsInitialize();
StabilizationSettingsInitialize();
#ifndef PIOS_EXCLUDE_ADVANCED_FEATURES #ifndef PIOS_EXCLUDE_ADVANCED_FEATURES
VtolSelfTuningStatsInitialize(); VtolSelfTuningStatsInitialize();
StabilizationSettingsInitialize();
VtolPathFollowerSettingsInitialize(); VtolPathFollowerSettingsInitialize();
#endif #endif
callbackHandle = PIOS_CALLBACKSCHEDULER_Create(&manualControlTask, CALLBACK_PRIORITY, CBTASK_PRIORITY, CALLBACKINFO_RUNNING_MANUALCONTROL, STACK_SIZE_BYTES); callbackHandle = PIOS_CALLBACKSCHEDULER_Create(&manualControlTask, CALLBACK_PRIORITY, CBTASK_PRIORITY, CALLBACKINFO_RUNNING_MANUALCONTROL, STACK_SIZE_BYTES);

2
flight/modules/Receiver/receiver.c
View File

@ -135,7 +135,7 @@ int32_t ReceiverInitialize()
{ {
/* Check the assumptions about uavobject enum's are correct */ /* Check the assumptions about uavobject enum's are correct */
PIOS_STATIC_ASSERT(assumptions); PIOS_STATIC_ASSERT(assumptions);
AccessoryDesiredInitialize();
ManualControlCommandInitialize(); ManualControlCommandInitialize();
ReceiverActivityInitialize(); ReceiverActivityInitialize();
ManualControlSettingsInitialize(); ManualControlSettingsInitialize();

2
flight/targets/boards/coptercontrol/firmware/inc/pios_config.h
View File

@ -162,7 +162,7 @@
/* Task stack sizes */ /* Task stack sizes */
#define PIOS_ACTUATOR_STACK_SIZE 820 #define PIOS_ACTUATOR_STACK_SIZE 820
#define PIOS_MANUAL_STACK_SIZE 635 #define PIOS_MANUAL_STACK_SIZE 735
#define PIOS_RECEIVER_STACK_SIZE 620 #define PIOS_RECEIVER_STACK_SIZE 620
#define PIOS_STABILIZATION_STACK_SIZE 400 #define PIOS_STABILIZATION_STACK_SIZE 400

2
flight/targets/boards/coptercontrol/firmware/pios_board.c
View File

@ -241,8 +241,10 @@ void PIOS_Board_Init(void)
HwSettingsInitialize(); HwSettingsInitialize();
#ifndef ERASE_FLASH #ifndef ERASE_FLASH
#ifdef PIOS_INCLUDE_WDG
/* Initialize watchdog as early as possible to catch faults during init */ /* Initialize watchdog as early as possible to catch faults during init */
PIOS_WDG_Init(); PIOS_WDG_Init();
#endif
#endif #endif
/* Initialize the alarms library */ /* Initialize the alarms library */

2
ground/openpilotgcs/src/plugins/config/outputchannelform.cpp
View File

@ -119,7 +119,7 @@ void OutputChannelForm::enableChannelTest(bool state)
ui.actuatorMin->setEnabled(false); ui.actuatorMin->setEnabled(false);
ui.actuatorMax->setEnabled(false); ui.actuatorMax->setEnabled(false);
ui.actuatorRev->setEnabled(false); ui.actuatorRev->setEnabled(false);
} else if (m_mixerType != "Disabled"){ } else if (m_mixerType != "Disabled") {
ui.actuatorMin->setEnabled(true); ui.actuatorMin->setEnabled(true);
ui.actuatorMax->setEnabled(true); ui.actuatorMax->setEnabled(true);
if (m_mixerType != "Motor") { if (m_mixerType != "Motor") {