rooty/LibrePilot
1
0
Fork 0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2025-02-27 16:54:15 +01:00
Code Issues Releases Activity

UAVObjects/ActuatorSettings: Default values are all 1000 now so that an

Browse Source 
unconfigured motor can't turn on.

git-svn-id: svn://svn.openpilot.org/OpenPilot/trunk@1823 ebee16cc-31ac-478f-84a7-5cbb03baadba
This commit is contained in:
peabody124 2010-10-01 13:45:26 +00:00 committed by peabody124
parent 4766e11882
commit c076a695ce
3 changed files with 34 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
flight/OpenPilot/UAVObjects/actuatorsettings.c
View File

@ -120,22 +120,22 @@ static void setDefaults(UAVObjHandle obj, uint16_t instId)
data.CCPMTailRotor = 8; data.CCPMTailRotor = 8;
data.ChannelUpdateFreq[0] = 50; data.ChannelUpdateFreq[0] = 50;
data.ChannelUpdateFreq[1] = 50; data.ChannelUpdateFreq[1] = 50;
data.ChannelMax[0] = 2000; data.ChannelMax[0] = 1000;
data.ChannelMax[1] = 2000; data.ChannelMax[1] = 1000;
data.ChannelMax[2] = 2000; data.ChannelMax[2] = 1000;
data.ChannelMax[3] = 2000; data.ChannelMax[3] = 1000;
data.ChannelMax[4] = 2000; data.ChannelMax[4] = 1000;
data.ChannelMax[5] = 2000; data.ChannelMax[5] = 1000;
data.ChannelMax[6] = 2000; data.ChannelMax[6] = 1000;
data.ChannelMax[7] = 2000; data.ChannelMax[7] = 1000;
data.ChannelNeutral[0] = 1500; data.ChannelNeutral[0] = 1000;
data.ChannelNeutral[1] = 1500; data.ChannelNeutral[1] = 1000;
data.ChannelNeutral[2] = 1500; data.ChannelNeutral[2] = 1000;
data.ChannelNeutral[3] = 1500; data.ChannelNeutral[3] = 1000;
data.ChannelNeutral[4] = 1500; data.ChannelNeutral[4] = 1000;
data.ChannelNeutral[5] = 1500; data.ChannelNeutral[5] = 1000;
data.ChannelNeutral[6] = 1500; data.ChannelNeutral[6] = 1000;
data.ChannelNeutral[7] = 1500; data.ChannelNeutral[7] = 1000;
data.ChannelMin[0] = 1000; data.ChannelMin[0] = 1000;
data.ChannelMin[1] = 1000; data.ChannelMin[1] = 1000;
data.ChannelMin[2] = 1000; data.ChannelMin[2] = 1000;

32
ground/src/plugins/uavobjects/actuatorsettings.cpp
View File

@ -453,22 +453,22 @@ void ActuatorSettings::setDefaultFieldValues()
data.CCPMTailRotor = 8; data.CCPMTailRotor = 8;
data.ChannelUpdateFreq[0] = 50; data.ChannelUpdateFreq[0] = 50;
data.ChannelUpdateFreq[1] = 50; data.ChannelUpdateFreq[1] = 50;
data.ChannelMax[0] = 2000; data.ChannelMax[0] = 1000;
data.ChannelMax[1] = 2000; data.ChannelMax[1] = 1000;
data.ChannelMax[2] = 2000; data.ChannelMax[2] = 1000;
data.ChannelMax[3] = 2000; data.ChannelMax[3] = 1000;
data.ChannelMax[4] = 2000; data.ChannelMax[4] = 1000;
data.ChannelMax[5] = 2000; data.ChannelMax[5] = 1000;
data.ChannelMax[6] = 2000; data.ChannelMax[6] = 1000;
data.ChannelMax[7] = 2000; data.ChannelMax[7] = 1000;
data.ChannelNeutral[0] = 1500; data.ChannelNeutral[0] = 1000;
data.ChannelNeutral[1] = 1500; data.ChannelNeutral[1] = 1000;
data.ChannelNeutral[2] = 1500; data.ChannelNeutral[2] = 1000;
data.ChannelNeutral[3] = 1500; data.ChannelNeutral[3] = 1000;
data.ChannelNeutral[4] = 1500; data.ChannelNeutral[4] = 1000;
data.ChannelNeutral[5] = 1500; data.ChannelNeutral[5] = 1000;
data.ChannelNeutral[6] = 1500; data.ChannelNeutral[6] = 1000;
data.ChannelNeutral[7] = 1500; data.ChannelNeutral[7] = 1000;
data.ChannelMin[0] = 1000; data.ChannelMin[0] = 1000;
data.ChannelMin[1] = 1000; data.ChannelMin[1] = 1000;
data.ChannelMin[2] = 1000; data.ChannelMin[2] = 1000;

4
ground/src/shared/uavobjectdefinition/actuatorsettings.xml
View File

@ -32,8 +32,8 @@
<field name="CCPMThrottle" units="channel" type="enum" elements="1" options="Channel0,Channel1,Channel2,Channel3,Channel4,Channel5,Channel6,Channel7,None" defaultvalue="None"/> <field name="CCPMThrottle" units="channel" type="enum" elements="1" options="Channel0,Channel1,Channel2,Channel3,Channel4,Channel5,Channel6,Channel7,None" defaultvalue="None"/>
<field name="CCPMTailRotor" units="channel" type="enum" elements="1" options="Channel0,Channel1,Channel2,Channel3,Channel4,Channel5,Channel6,Channel7,None" defaultvalue="None"/> <field name="CCPMTailRotor" units="channel" type="enum" elements="1" options="Channel0,Channel1,Channel2,Channel3,Channel4,Channel5,Channel6,Channel7,None" defaultvalue="None"/>
<field name="ChannelUpdateFreq" units="Hz" type="int16" elements="2" defaultvalue="50"/> <field name="ChannelUpdateFreq" units="Hz" type="int16" elements="2" defaultvalue="50"/>
<field name="ChannelMax" units="us" type="int16" elements="8" defaultvalue="2000"/> <field name="ChannelMax" units="us" type="int16" elements="8" defaultvalue="1000"/>
<field name="ChannelNeutral" units="us" type="int16" elements="8" defaultvalue="1500"/> <field name="ChannelNeutral" units="us" type="int16" elements="8" defaultvalue="1000"/>
<field name="ChannelMin" units="us" type="int16" elements="8" defaultvalue="1000"/> <field name="ChannelMin" units="us" type="int16" elements="8" defaultvalue="1000"/>
<access gcs="readwrite" flight="readwrite"/> <access gcs="readwrite" flight="readwrite"/>
<telemetrygcs acked="true" updatemode="onchange" period="0"/> <telemetrygcs acked="true" updatemode="onchange" period="0"/>