Skip to content

Commit

Permalink
[modules] config_mkk_v2 settings to module
Browse files Browse the repository at this point in the history
  • Loading branch information
dewagter committed Nov 20, 2014
1 parent 6250317 commit f3845ef
Show file tree
Hide file tree
Showing 3 changed files with 20 additions and 21 deletions.
6 changes: 4 additions & 2 deletions conf/airframes/CDW/conf.xml
Expand Up @@ -6,7 +6,8 @@
radio="radios/R6107SP_7ch.xml"
telemetry="telemetry/default_rotorcraft.xml"
flight_plan="flight_plans/rotorcraft_basic.xml"
settings=" settings/rotorcraft_basic.xml settings/control/stabilization_att_int.xml settings/modules/config_asctec_v2.xml settings/modules/imu_quality_assessment.xml"
settings="settings/rotorcraft_basic.xml settings/control/stabilization_att_int.xml settings/modules/config_asctec_v2.xml"
settings_modules="modules/imu_quality_assessment.xml modules/gps_ubx_ucenter.xml"
gui_color="white"
/>
<aircraft
Expand All @@ -16,7 +17,8 @@
radio="radios/R6107SP_7ch.xml"
telemetry="telemetry/default_rotorcraft.xml"
flight_plan="flight_plans/rotorcraft_basic.xml"
settings=" settings/rotorcraft_basic.xml settings/control/stabilization_att_int.xml settings/modules/config_mkk_v2.xml settings/modules/imu_quality_assessment.xml"
settings="settings/rotorcraft_basic.xml settings/control/stabilization_att_int.xml"
settings_modules="modules/configure_actuators_mkk_v2.xml modules/imu_quality_assessment.xml"
gui_color="blue"
/>
</conf>
16 changes: 16 additions & 0 deletions conf/modules/configure_actuators_mkk_v2.xml
Expand Up @@ -4,6 +4,22 @@
<doc>
<description>Configure Mikrokopter MKK v2.0 BLDC motor controllers (requires subsystem actuators_mkk_v2)</description>
</doc>
<settings>
<dl_settings>
<dl_settings NAME="mkk">
<dl_setting var="config_mkk_v2.addr" min="0" step="1" max="3" module="modules/config/config_mkk_v2" shortname="Get" values="0x52|0x54|0x56|0x58" handler="GetConfig"/>
<dl_setting var="config_mkk_v2.nb_err" min="0" step="1" max="3000" shortname="err" />
<dl_setting var="config_mkk_v2_eeprom.revision" min="0" step="1" max="255" shortname="ee.rev" />
<dl_setting var="config_mkk_v2_eeprom.SetMask" min="0" step="1" max="255" module="modules/config/config_mkk_v2" shortname="ee.reset" handler="ResetDefault" />
<dl_setting var="config_mkk_v2_eeprom.PwmScaling" min="0" step="1" max="255" module="modules/config/config_mkk_v2" shortname="ee.pwm" handler="SetPwmScaling" />
<dl_setting var="config_mkk_v2_eeprom.CurrentLimit" min="0" step="1" max="255" module="modules/config/config_mkk_v2" shortname="ee.amp.lim" handler="SetCurrentLimit" />
<dl_setting var="config_mkk_v2_eeprom.TempLimit" min="0" step="1" max="255" module="modules/config/config_mkk_v2" shortname="ee.tmp.lim" handler="SetTempLimit" />
<dl_setting var="config_mkk_v2_eeprom.CurrentScaling" min="0" step="1" max="255" module="modules/config/config_mkk_v2" shortname="ee.amp.scl" handler="SetCurrentScaling" />
<dl_setting var="config_mkk_v2_eeprom.BitConfig" min="4" step="1" max="5" module="modules/config/config_mkk_v2" shortname="ee.bit.msk" values="Normal|Reversed" handler="SetBitConfig" />
<dl_setting var="config_mkk_v2_eeprom.crc" min="0" step="1" max="255" shortname="ee.crc" />
</dl_settings>
</dl_settings>
</settings>
<header>
<file name="config_mkk_v2.h"/>
</header>
Expand Down
19 changes: 0 additions & 19 deletions conf/settings/modules/config_mkk_v2.xml

This file was deleted.

0 comments on commit f3845ef

Please sign in to comment.