Skip to content

Commit

Permalink
[mkk2] Since reading data moved to the core driver, the module does o…
Browse files Browse the repository at this point in the history
…nly configure. And since only v2 can be configured it is renamed and finshed.
  • Loading branch information
dewagter committed Mar 4, 2013
1 parent fc1dcbf commit c2b5f5f
Show file tree
Hide file tree
Showing 8 changed files with 358 additions and 336 deletions.
18 changes: 0 additions & 18 deletions conf/modules/configure_actuators_mkk.xml

This file was deleted.

18 changes: 18 additions & 0 deletions conf/modules/configure_actuators_mkk_v2.xml
@@ -0,0 +1,18 @@
<!DOCTYPE module SYSTEM "module.dtd">

<module name="config">
<doc>
<description>Configure Mikrokopter MKK v2.0 BLDC motor controllers (requires subsystem actuators_mkk_v2)</description>
</doc>
<header>
<file name="config_mkk_v2.h"/>
</header>
<init fun="config_mkk_v2_init()"/>
<periodic fun="config_mkk_v2_periodic_read_status()" period="0.1" autorun="TRUE"/>
<periodic fun="config_mkk_v2_periodic_telemetry()" period="1" autorun="TRUE"/>
<makefile>
<define name="SOME_DEFINE" value="2"/>
<file name="config_mkk_v2.c"/>
</makefile>
</module>

19 changes: 19 additions & 0 deletions conf/settings/modules/config_mkk_v2.xml
@@ -0,0 +1,19 @@
<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="5" max="255" 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>

20 changes: 0 additions & 20 deletions conf/settings/modules/configure_mkk.xml

This file was deleted.

214 changes: 0 additions & 214 deletions sw/airborne/modules/config/config_mkk.c

This file was deleted.

84 changes: 0 additions & 84 deletions sw/airborne/modules/config/config_mkk.h

This file was deleted.

0 comments on commit c2b5f5f

Please sign in to comment.