Subversion Repositories Projects

Compare Revisions

Ignore whitespace Rev 1805 → Rev 1806

/dongfang_FC_rewrite_tool/configsets/templates/parameterset_v4.xml
1,4 → 1,4
<parametertemplate eepromVersion="4" length="79">
<parametertemplate eepromVersion="4" length="81">
<section name="config" title="Configuration">
<parameter name="bitConfig" type="bitset">
<bit name="CFG_SIMPLE_HEIGHT_CONTROL" />
43,6 → 43,9
<parameter name="minThrottle" />
<parameter name="maxThrottle" />
 
<parameter name="absoluteMinThrottle" />
<parameter name="absoluteMaxThrottle" />
 
<parameter name="compassMode" type="dynamic" />
<parameter name="compassYawCorrection" />
<parameter name="compassBendingReturnSpeed" />
/dongfang_FC_rewrite_tool/configsets/woodpecker.xml
1,4 → 1,4
<parameterset eepromVersion="4" length="79">
<parameterset eepromVersion="4" length="81">
<parameter name="bitConfig">
<bit name="CFG_SIMPLE_HEIGHT_CONTROL" value="0"/>
<bit name="CFG_SIMPLE_HC_HOLD_SWITCH" value="0"/>
12,52 → 12,43
<parameter name="flightMode" value="var0"/>
<parameter name="levelCorrectionPitch" value="var1"/>
<parameter name="levelCorrectionRoll" value="var2"/>
<parameter name="attGyroP" value="100"/>
<parameter name="attGyroI" value="100"/>
<parameter name="attGyroIMax" value="0"/>
<parameter name="attGyroD" value="100"/>
<parameter name="rateGyroP" value="100"/>
<parameter name="rateGyroI" value="100"/>
<parameter name="rateGyroIMax" value="0"/>
<parameter name="rateGyroD" value="100"/>
<parameter name="rateGyroD" value="100"/>
<parameter name="yawGyroP" value="100"/>
<parameter name="yawGyroI" value="100"/>
<parameter name="yawGyroD" value="100"/>
<parameter name="externalControl" value="0"/>
<parameter name="attitudeControl" value="0"/>
<parameter name="dynamicStability" value="80"/>
 
<parameter name="stickP" value="8"/>
<parameter name="stickD" value="0"/>
<parameter name="stickYawP" value="8"/>
 
<parameter name="stickThrottleD" value="4"/>
<parameter name="minThrottle" value="8"/>
<parameter name="maxThrottle" value="230"/>
<parameter name="absoluteMinThrottle" value="1"/>
<parameter name="absoluteMaxThrottle" value="255"/>
<parameter name="compassMode" value="0"/>
<parameter name="compassYawCorrection" value="64"/>
<parameter name="compassBendingReturnSpeed" value="255"/>
<parameter name="compassP" value="100"/>
<parameter name="batteryVoltageWarning" value="101"/>
<parameter name="emergencyThrottle" value="35"/>
<parameter name="emergencyFlightDuration" value="30"/>
<parameter name="airpressureFilterConstant" value="8"/>
<parameter name="airpressureWindowLength" value="0"/>
<parameter name="airpressureDWindowLength" value="24"/>
<parameter name="airpressureAccZCorrection" value="184"/>
<parameter name="heightP" value="10"/>
<parameter name="heightI" value="var7"/>
<parameter name="heightD" value="30"/>
<parameter name="heightSetting" value="var3"/>
 
<parameter name="heightControlMaxIntegralIn" value="125"/>
<parameter name="heightControlMaxIntegralOut" value="75"/>
<parameter name="heightMaxThrottleChange" value="75"/>
66,7 → 57,7
<parameter name="servoCount" value="7"/>
<parameter name="servoManualMaxSpeed" value="10"/>
<parameter name="pitchServoControl" value="128"/>
<parameter name="pitchServoStabilization" value="0"/>
<parameter name="pitchServoStabilization" value="50"/>
<parameter name="pitchServoMinValue" value="32"/>
<parameter name="pitchServoMaxValue" value="224"/>
<parameter name="pitchServoFlags">
80,7 → 71,7
<bit name="Unused" value="0"/>
</parameter>
<parameter name="rollServoControl" value="128"/>
<parameter name="rollServoStabilization" value="0"/>
<parameter name="rollServoStabilization" value="50"/>
<parameter name="rollServoMinValue" value="32"/>
<parameter name="rollServoMaxValue" value="224"/>
<parameter name="rollServoFlags">
116,9 → 107,9
</parameter>
<parameter name="output1Timing" value="15"/>
<parameter name="outputDebugMask">
<bit name="DEBUG_MAINLOOP_TIMER" value="1"/>
<bit name="DEBUG_MAINLOOP_TIMER" value="0"/>
<bit name="DEBUG_HEIGHT_DIFF" value="0"/>
<bit name="DEBUG_HOVERTHROTTLE" value="0"/>
<bit name="DEBUG_HOVERTHROTTLE" value="1"/>
<bit name="DEBUG_ACC0THORDER" value="0"/>
<bit name="DEBUG_SIGNAL" value="0"/>
<bit name="DEBUG_PRESSURERANGE" value="0"/>
/dongfang_FC_rewrite_tool/src/dongfang/mkt/main/ParameterSetConfigurator.java
248,7 → 248,7
if ("w".equals(args[0]) && (args.length!=3 && args.length!=4)) help();
if ("r".equals(args[0]) && (args.length!=3 && args.length!=4)) help();
 
String portIdentifier = null;
String portIdentifier = "COM10";
if ("r".equals(args[0])) {
readConfiguration(portIdentifier, args[1]);