Skip to content

Commit

Permalink
[modules] convert radio_control subsystems to modules
Browse files Browse the repository at this point in the history
- calling init functions will be done later, it needs to be attached to
  the FBW part
- add 'cond' attribute option to more nodes in module makefile section
  • Loading branch information
gautierhattenberger committed Jan 12, 2017
1 parent 9f3b407 commit c9c0789
Show file tree
Hide file tree
Showing 14 changed files with 290 additions and 264 deletions.
38 changes: 0 additions & 38 deletions conf/firmwares/subsystems/shared/radio_control_datalink.makefile

This file was deleted.

48 changes: 0 additions & 48 deletions conf/firmwares/subsystems/shared/radio_control_ppm.makefile

This file was deleted.

38 changes: 0 additions & 38 deletions conf/firmwares/subsystems/shared/radio_control_sbus.makefile

This file was deleted.

48 changes: 0 additions & 48 deletions conf/firmwares/subsystems/shared/radio_control_sbus_dual.makefile

This file was deleted.

53 changes: 0 additions & 53 deletions conf/firmwares/subsystems/shared/radio_control_spektrum.makefile

This file was deleted.

This file was deleted.

9 changes: 6 additions & 3 deletions conf/modules/module.dtd
Expand Up @@ -63,7 +63,8 @@ fun CDATA #REQUIRED>

<!ATTLIST makefile
target CDATA #IMPLIED
firmware CDATA #IMPLIED>
firmware CDATA #IMPLIED
cond CDATA #IMPLIED>

<!ATTLIST section
name CDATA #REQUIRED
Expand Down Expand Up @@ -95,11 +96,13 @@ value CDATA #REQUIRED>

<!ATTLIST file
name CDATA #REQUIRED
dir CDATA #IMPLIED>
dir CDATA #IMPLIED
cond CDATA #IMPLIED>

<!ATTLIST file_arch
name CDATA #REQUIRED
dir CDATA #IMPLIED>
dir CDATA #IMPLIED
cond CDATA #IMPLIED>

<!ATTLIST settings_file
name CDATA #REQUIRED
Expand Down
34 changes: 34 additions & 0 deletions conf/modules/radio_control_datalink.xml
@@ -0,0 +1,34 @@
<!DOCTYPE module SYSTEM "module.dtd">

<module name="radio_control_datalink" dir="radio_control">
<doc>
<description>
Radio control over datalink
</description>
<configure name="RADIO_CONTROL_LED" value="none|num" description="LED number or 'none' to disable"/>
<configure name="RADIO_CONTROL_DATALINK_LED" value="none|num" description="LED number or 'none' to disable"/>
</doc>
<header>
<file name="rc_datalink.h" dir="subsystems/radio_control"/>
</header>
<makefile target="ap|fbw|sim|nps">
<configure name="RADIO_CONTROL_LED" default="none"/>
<configure name="RADIO_CONTROL_DATALINK_LED" default="none"/>
<define name="RADIO_CONTROL_LED" value="$(RADIO_CONTROL_LED)" cond="ifneq ($(RADIO_CONTROL_LED),none)"/>
<define name="RADIO_CONTROL_DATALINK_LED" value="$(RADIO_CONTROL_DATALINK_LED)" cond="ifneq ($(RADIO_CONTROL_DATALINK_LED),none)"/>
<define name="RADIO_CONTROL_TYPE_H" value="subsystems/radio_control/rc_datalink.h" type="string"/>
</makefile>
<makefile target="fbw|sim|nps">
<define name="RADIO_CONTROL"/>
<define name="RADIO_CONTROL_TYPE_DATALINK"/>
<file name="radio_control.c" dir="subsystems"/>
<file name="rc_datalink.c" dir="subsystems/radio_control"/>
</makefile>
<makefile target="ap" cond="ifeq (,$(findstring $(SEPARATE_FBW),1 TRUE))">
<define name="RADIO_CONTROL"/>
<define name="RADIO_CONTROL_TYPE_DATALINK"/>
<file name="radio_control.c" dir="subsystems"/>
<file name="rc_datalink.c" dir="subsystems/radio_control"/>
</makefile>
</module>

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

<module name="radio_control_ppm" dir="radio_control">
<doc>
<description>
Radio control based on PPM input

Some STM32 boards have the option to configure RADIO_CONTROL_PPM_PIN.
See the board makefile for configure options of the pins.
If they set the PPM_CONFIG makefile variable, add it to the target.
The PPM_CONFIG define is then used in the _board_.h file to set the configuration.
</description>
<configure name="RADIO_CONTROL_LED" value="none|num" description="LED number or 'none' to disable"/>
<configure name="PPM_CONFIG" value="num" description="Select PPM config, as some boards can used different mapping for the ppm input pin"/>
</doc>
<header>
<file name="ppm.h" dir="subsystems/radio_control"/>
</header>
<makefile target="ap|fbw|sim|nps">
<configure name="RADIO_CONTROL_LED" default="none"/>
<define name="RADIO_CONTROL_LED" value="$(RADIO_CONTROL_LED)" cond="ifneq ($(RADIO_CONTROL_LED),none)"/>
<define name="RADIO_CONTROL_TYPE_H" value="subsystems/radio_control/ppm.h" type="string"/>
<define name="PPM_CONFIG" value="$(PPM_CONFIG)" cond="ifdef PPM_CONFIG"/>
</makefile>
<makefile target="fbw|sim|nps">
<define name="RADIO_CONTROL"/>
<define name="RADIO_CONTROL_TYPE_PPM"/>
<file name="radio_control.c" dir="subsystems"/>
<file name="ppm.c" dir="subsystems/radio_control"/>
<file name="ppm_arch.c" dir="$(SRC_ARCH)/subsystems/radio_control"/>
</makefile>
<makefile target="ap" cond="ifeq (,$(findstring $(SEPARATE_FBW),1 TRUE))">
<define name="RADIO_CONTROL"/>
<define name="RADIO_CONTROL_TYPE_PPM"/>
<file name="radio_control.c" dir="subsystems"/>
<file name="ppm.c" dir="subsystems/radio_control"/>
<file name="ppm_arch.c" dir="$(SRC_ARCH)/subsystems/radio_control"/>
</makefile>
</module>

0 comments on commit c9c0789

Please sign in to comment.