From 85d42868d61de9f60726f27aa26b61eda17a003a Mon Sep 17 00:00:00 2001 From: peabody124 Date: Tue, 1 Feb 2011 02:17:36 +0000 Subject: [PATCH] CC-10 Rename the TaskInfo and Alarm field for CCAttitude to Attitude git-svn-id: svn://svn.openpilot.org/OpenPilot/trunk@2654 ebee16cc-31ac-478f-84a7-5cbb03baadba --- flight/Modules/CCAttitude/ccattitude.c | 4 +- .../OpenPilotOSX.xcodeproj/project.pbxproj | 101 ++++++++++++++++++ shared/uavobjectdefinition/systemalarms.xml | 2 +- shared/uavobjectdefinition/taskinfo.xml | 4 +- 4 files changed, 106 insertions(+), 5 deletions(-) diff --git a/flight/Modules/CCAttitude/ccattitude.c b/flight/Modules/CCAttitude/ccattitude.c index f2e99bc83..990f14f9b 100644 --- a/flight/Modules/CCAttitude/ccattitude.c +++ b/flight/Modules/CCAttitude/ccattitude.c @@ -88,7 +88,7 @@ int32_t CCAttitudeInitialize(void) { // Start main task xTaskCreate(CCAttitudeTask, (signed char *)"CCAttitude", STACK_SIZE_BYTES/4, NULL, TASK_PRIORITY, &taskHandle); - TaskMonitorAdd(TASKINFO_RUNNING_AHRSCOMMS, taskHandle); + TaskMonitorAdd(TASKINFO_RUNNING_ATTITUDE, taskHandle); PIOS_WDG_RegisterFlag(PIOS_WDG_ATTITUDE); return 0; } @@ -99,7 +99,7 @@ int32_t CCAttitudeInitialize(void) static void CCAttitudeTask(void *parameters) { -// AlarmsClear(SYSTEMALARMS_ALARM_AHRSCOMMS, SYSTEMALARMS_ALARM_CRITICAL); + AlarmsClear(SYSTEMALARMS_ALARM_ATTITUDE); PIOS_ADC_SetCallback(adc_callback); diff --git a/flight/Project/OpenPilotOSX/OpenPilotOSX.xcodeproj/project.pbxproj b/flight/Project/OpenPilotOSX/OpenPilotOSX.xcodeproj/project.pbxproj index 07dd63abf..f41a70056 100644 --- a/flight/Project/OpenPilotOSX/OpenPilotOSX.xcodeproj/project.pbxproj +++ b/flight/Project/OpenPilotOSX/OpenPilotOSX.xcodeproj/project.pbxproj @@ -2725,6 +2725,48 @@ 65B7E6B4120DF1E2000C1123 /* pios_config.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = pios_config.h; sourceTree = ""; }; 65B7E6B6120DF1E2000C1123 /* Makefile */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.make; name = Makefile; path = ../../AHRS/Makefile; sourceTree = SOURCE_ROOT; }; 65B7E6B7120DF1E2000C1123 /* pios_board.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = pios_board.c; path = ../../AHRS/pios_board.c; sourceTree = SOURCE_ROOT; }; + 65C35E5012EFB2F3004811C2 /* actuatorcommand.xml */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = actuatorcommand.xml; sourceTree = ""; }; + 65C35E5112EFB2F3004811C2 /* actuatordesired.xml */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = actuatordesired.xml; sourceTree = ""; }; + 65C35E5212EFB2F3004811C2 /* actuatorsettings.xml */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = actuatorsettings.xml; sourceTree = ""; }; + 65C35E5312EFB2F3004811C2 /* ahrscalibration.xml */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = ahrscalibration.xml; sourceTree = ""; }; + 65C35E5412EFB2F3004811C2 /* ahrssettings.xml */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = ahrssettings.xml; sourceTree = ""; }; + 65C35E5512EFB2F3004811C2 /* ahrsstatus.xml */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = ahrsstatus.xml; sourceTree = ""; }; + 65C35E5612EFB2F3004811C2 /* attitudeactual.xml */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = attitudeactual.xml; sourceTree = ""; }; + 65C35E5712EFB2F3004811C2 /* attitudedesired.xml */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = attitudedesired.xml; sourceTree = ""; }; + 65C35E5812EFB2F3004811C2 /* attituderaw.xml */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = attituderaw.xml; sourceTree = ""; }; + 65C35E5912EFB2F3004811C2 /* baroaltitude.xml */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = baroaltitude.xml; sourceTree = ""; }; + 65C35E5A12EFB2F3004811C2 /* batterysettings.xml */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = batterysettings.xml; sourceTree = ""; }; + 65C35E5B12EFB2F3004811C2 /* firmwareiap.xml */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = firmwareiap.xml; sourceTree = ""; }; + 65C35E5C12EFB2F3004811C2 /* flightbatterystate.xml */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = flightbatterystate.xml; sourceTree = ""; }; + 65C35E5D12EFB2F3004811C2 /* flightplancontrol.xml */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = flightplancontrol.xml; sourceTree = ""; }; + 65C35E5E12EFB2F3004811C2 /* flightplansettings.xml */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = flightplansettings.xml; sourceTree = ""; }; + 65C35E5F12EFB2F3004811C2 /* flightplanstatus.xml */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = flightplanstatus.xml; sourceTree = ""; }; + 65C35E6012EFB2F3004811C2 /* flighttelemetrystats.xml */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = flighttelemetrystats.xml; sourceTree = ""; }; + 65C35E6112EFB2F3004811C2 /* gcstelemetrystats.xml */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = gcstelemetrystats.xml; sourceTree = ""; }; + 65C35E6212EFB2F3004811C2 /* gpsposition.xml */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = gpsposition.xml; sourceTree = ""; }; + 65C35E6312EFB2F3004811C2 /* gpssatellites.xml */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = gpssatellites.xml; sourceTree = ""; }; + 65C35E6412EFB2F3004811C2 /* gpstime.xml */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = gpstime.xml; sourceTree = ""; }; + 65C35E6512EFB2F3004811C2 /* guidancesettings.xml */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = guidancesettings.xml; sourceTree = ""; }; + 65C35E6612EFB2F3004811C2 /* homelocation.xml */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = homelocation.xml; sourceTree = ""; }; + 65C35E6712EFB2F3004811C2 /* i2cstats.xml */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = i2cstats.xml; sourceTree = ""; }; + 65C35E6812EFB2F3004811C2 /* manualcontrolcommand.xml */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = manualcontrolcommand.xml; sourceTree = ""; }; + 65C35E6912EFB2F3004811C2 /* manualcontrolsettings.xml */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = manualcontrolsettings.xml; sourceTree = ""; }; + 65C35E6A12EFB2F3004811C2 /* mixersettings.xml */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = mixersettings.xml; sourceTree = ""; }; + 65C35E6B12EFB2F3004811C2 /* mixerstatus.xml */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = mixerstatus.xml; sourceTree = ""; }; + 65C35E6C12EFB2F3004811C2 /* nedaccel.xml */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = nedaccel.xml; sourceTree = ""; }; + 65C35E6D12EFB2F3004811C2 /* objectpersistence.xml */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = objectpersistence.xml; sourceTree = ""; }; + 65C35E6E12EFB2F3004811C2 /* positionactual.xml */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = positionactual.xml; sourceTree = ""; }; + 65C35E6F12EFB2F3004811C2 /* positiondesired.xml */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = positiondesired.xml; sourceTree = ""; }; + 65C35E7012EFB2F3004811C2 /* ratedesired.xml */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = ratedesired.xml; sourceTree = ""; }; + 65C35E7112EFB2F3004811C2 /* stabilizationsettings.xml */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = stabilizationsettings.xml; sourceTree = ""; }; + 65C35E7212EFB2F3004811C2 /* systemalarms.xml */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = systemalarms.xml; sourceTree = ""; }; + 65C35E7312EFB2F3004811C2 /* systemsettings.xml */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = systemsettings.xml; sourceTree = ""; }; + 65C35E7412EFB2F3004811C2 /* systemstats.xml */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = systemstats.xml; sourceTree = ""; }; + 65C35E7512EFB2F3004811C2 /* taskinfo.xml */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = taskinfo.xml; sourceTree = ""; }; + 65C35E7612EFB2F3004811C2 /* telemetrysettings.xml */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = telemetrysettings.xml; sourceTree = ""; }; + 65C35E7712EFB2F3004811C2 /* velocityactual.xml */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = velocityactual.xml; sourceTree = ""; }; + 65C35E7812EFB2F3004811C2 /* velocitydesired.xml */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = velocitydesired.xml; sourceTree = ""; }; + 65C35E7912EFB2F3004811C2 /* watchdogstatus.xml */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = watchdogstatus.xml; sourceTree = ""; }; 65D2CA841248F9A400B1E7D6 /* mixersettings.xml */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = mixersettings.xml; sourceTree = ""; }; 65D2CA851248F9A400B1E7D6 /* mixerstatus.xml */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = mixerstatus.xml; sourceTree = ""; }; 65E6DF6812E02BA300058553 /* ccattitude.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = ccattitude.c; sourceTree = ""; }; @@ -3335,6 +3377,7 @@ 08FB7794FE84155DC02AAC07 /* OpenPilotOSX */ = { isa = PBXGroup; children = ( + 65C35E4E12EFB2F3004811C2 /* shared */, 65173C9F12EBFD1700D6A7CB /* Makefile */, 657CEEB5121DBC49007A1FBE /* flight */, 65B35D7D121C261E003EAD18 /* ground */, @@ -7674,6 +7717,64 @@ path = ../../AHRS/inc; sourceTree = SOURCE_ROOT; }; + 65C35E4E12EFB2F3004811C2 /* shared */ = { + isa = PBXGroup; + children = ( + 65C35E4F12EFB2F3004811C2 /* uavobjectdefinition */, + ); + name = shared; + path = ../../../shared; + sourceTree = SOURCE_ROOT; + }; + 65C35E4F12EFB2F3004811C2 /* uavobjectdefinition */ = { + isa = PBXGroup; + children = ( + 65C35E5012EFB2F3004811C2 /* actuatorcommand.xml */, + 65C35E5112EFB2F3004811C2 /* actuatordesired.xml */, + 65C35E5212EFB2F3004811C2 /* actuatorsettings.xml */, + 65C35E5312EFB2F3004811C2 /* ahrscalibration.xml */, + 65C35E5412EFB2F3004811C2 /* ahrssettings.xml */, + 65C35E5512EFB2F3004811C2 /* ahrsstatus.xml */, + 65C35E5612EFB2F3004811C2 /* attitudeactual.xml */, + 65C35E5712EFB2F3004811C2 /* attitudedesired.xml */, + 65C35E5812EFB2F3004811C2 /* attituderaw.xml */, + 65C35E5912EFB2F3004811C2 /* baroaltitude.xml */, + 65C35E5A12EFB2F3004811C2 /* batterysettings.xml */, + 65C35E5B12EFB2F3004811C2 /* firmwareiap.xml */, + 65C35E5C12EFB2F3004811C2 /* flightbatterystate.xml */, + 65C35E5D12EFB2F3004811C2 /* flightplancontrol.xml */, + 65C35E5E12EFB2F3004811C2 /* flightplansettings.xml */, + 65C35E5F12EFB2F3004811C2 /* flightplanstatus.xml */, + 65C35E6012EFB2F3004811C2 /* flighttelemetrystats.xml */, + 65C35E6112EFB2F3004811C2 /* gcstelemetrystats.xml */, + 65C35E6212EFB2F3004811C2 /* gpsposition.xml */, + 65C35E6312EFB2F3004811C2 /* gpssatellites.xml */, + 65C35E6412EFB2F3004811C2 /* gpstime.xml */, + 65C35E6512EFB2F3004811C2 /* guidancesettings.xml */, + 65C35E6612EFB2F3004811C2 /* homelocation.xml */, + 65C35E6712EFB2F3004811C2 /* i2cstats.xml */, + 65C35E6812EFB2F3004811C2 /* manualcontrolcommand.xml */, + 65C35E6912EFB2F3004811C2 /* manualcontrolsettings.xml */, + 65C35E6A12EFB2F3004811C2 /* mixersettings.xml */, + 65C35E6B12EFB2F3004811C2 /* mixerstatus.xml */, + 65C35E6C12EFB2F3004811C2 /* nedaccel.xml */, + 65C35E6D12EFB2F3004811C2 /* objectpersistence.xml */, + 65C35E6E12EFB2F3004811C2 /* positionactual.xml */, + 65C35E6F12EFB2F3004811C2 /* positiondesired.xml */, + 65C35E7012EFB2F3004811C2 /* ratedesired.xml */, + 65C35E7112EFB2F3004811C2 /* stabilizationsettings.xml */, + 65C35E7212EFB2F3004811C2 /* systemalarms.xml */, + 65C35E7312EFB2F3004811C2 /* systemsettings.xml */, + 65C35E7412EFB2F3004811C2 /* systemstats.xml */, + 65C35E7512EFB2F3004811C2 /* taskinfo.xml */, + 65C35E7612EFB2F3004811C2 /* telemetrysettings.xml */, + 65C35E7712EFB2F3004811C2 /* velocityactual.xml */, + 65C35E7812EFB2F3004811C2 /* velocitydesired.xml */, + 65C35E7912EFB2F3004811C2 /* watchdogstatus.xml */, + ); + path = uavobjectdefinition; + sourceTree = ""; + }; 65E6DF6712E02BA300058553 /* CCAttitude */ = { isa = PBXGroup; children = ( diff --git a/shared/uavobjectdefinition/systemalarms.xml b/shared/uavobjectdefinition/systemalarms.xml index a5826a71f..622afc173 100644 --- a/shared/uavobjectdefinition/systemalarms.xml +++ b/shared/uavobjectdefinition/systemalarms.xml @@ -2,7 +2,7 @@ Alarms from OpenPilot to indicate failure conditions or warnings. Set by various modules. + elementnames="OutOfMemory,StackOverflow,CPUOverload,EventSystem,SDCard,Telemetry,ManualControl,Actuator,Attitude,Stabilization,Guidance,AHRSComms,Battery,FlightTime,I2C,GPS" defaultvalue="Uninitialised"/> diff --git a/shared/uavobjectdefinition/taskinfo.xml b/shared/uavobjectdefinition/taskinfo.xml index 1c93e84b1..54819f895 100644 --- a/shared/uavobjectdefinition/taskinfo.xml +++ b/shared/uavobjectdefinition/taskinfo.xml @@ -1,8 +1,8 @@ Task information - - + +