ihm/menu: fix compilation of test with hostsim

add hostsim dependency (for host_wait_ms) to ihm/menu test.

Signed-off-by: Gregor Riepl <onitake@gmail.com>

diff --git a/modules/ihm/menu/test/.config b/modules/ihm/menu/test/.config
index 6a5e8250d4f66a8cdd1ba6838201e40755d6de83..7970559cd9e2fab5134c6a655a34691643e69196 100644 (file)
--- a/modules/ihm/menu/test/.config
+++ b/modules/ihm/menu/test/.config
@@ -1,5 +1,5 @@
 #
-# Automatically generated make config: don't edit
+# Automatically generated by make menuconfig: don't edit
 #
 
 #
@@ -11,6 +11,7 @@
 # CONFIG_MCU_AT90S2343 is not set
 # CONFIG_MCU_ATTINY22 is not set
 # CONFIG_MCU_ATTINY26 is not set
+# CONFIG_MCU_ATTINY45 is not set
 # CONFIG_MCU_AT90S4414 is not set
 # CONFIG_MCU_AT90S4433 is not set
 # CONFIG_MCU_AT90S4434 is not set
@@ -40,14 +41,21 @@
 # CONFIG_MCU_ATMEGA32 is not set
 # CONFIG_MCU_ATMEGA323 is not set
 # CONFIG_MCU_ATMEGA325 is not set
+# CONFIG_MCU_ATMEGA328P is not set
 # CONFIG_MCU_ATMEGA3250 is not set
 # CONFIG_MCU_ATMEGA64 is not set
 # CONFIG_MCU_ATMEGA645 is not set
 # CONFIG_MCU_ATMEGA6450 is not set
 CONFIG_MCU_ATMEGA128=y
+# CONFIG_MCU_ATMEGA1281 is not set
 # CONFIG_MCU_AT90CAN128 is not set
 # CONFIG_MCU_AT94K is not set
 # CONFIG_MCU_AT90S1200 is not set
+# CONFIG_MCU_ATMEGA2560 is not set
+# CONFIG_MCU_ATMEGA256 is not set
+# CONFIG_MCU_ATXMEGA128A1 is not set
+# CONFIG_MCU_ATMEGA168P is not set
+# CONFIG_MCU_ATMEGA1284P is not set
 CONFIG_QUARTZ=12000000
 
 #
@@ -60,6 +68,7 @@ CONFIG_QUARTZ=12000000
 CONFIG_OPTM_S=y
 CONFIG_MATH_LIB=y
 # CONFIG_FDEVOPEN_COMPAT is not set
+# CONFIG_NO_PRINTF is not set
 # CONFIG_MINIMAL_PRINTF is not set
 CONFIG_STANDARD_PRINTF=y
 # CONFIG_ADVANCED_PRINTF is not set
@@ -70,31 +79,32 @@ CONFIG_FORMAT_IHEX=y
 #
 # Base modules
 #
-
-#
-# Enable math library in generation options to see all modules
-#
 CONFIG_MODULE_CIRBUF=y
 # CONFIG_MODULE_CIRBUF_LARGE is not set
 # CONFIG_MODULE_FIXED_POINT is not set
 # CONFIG_MODULE_VECT2 is not set
+# CONFIG_MODULE_GEOMETRY is not set
+CONFIG_MODULE_HOSTSIM=y
 # CONFIG_MODULE_SCHEDULER is not set
+# CONFIG_MODULE_SCHEDULER_STATS is not set
 # CONFIG_MODULE_SCHEDULER_CREATE_CONFIG is not set
 # CONFIG_MODULE_SCHEDULER_USE_TIMERS is not set
 CONFIG_MODULE_SCHEDULER_TIMER0=y
 # CONFIG_MODULE_SCHEDULER_MANUAL is not set
+# CONFIG_MODULE_CALLOUT is not set
 # CONFIG_MODULE_TIME is not set
 # CONFIG_MODULE_TIME_CREATE_CONFIG is not set
+# CONFIG_MODULE_TIME_EXT is not set
+# CONFIG_MODULE_TIME_EXT_CREATE_CONFIG is not set
 
 #
 # Communication modules
 #
-
-#
-# uart needs circular buffer, mf2 client may need scheduler
-#
 CONFIG_MODULE_UART=y
+# CONFIG_MODULE_UART_9BITS is not set
 CONFIG_MODULE_UART_CREATE_CONFIG=y
+# CONFIG_MODULE_SPI is not set
+# CONFIG_MODULE_SPI_CREATE_CONFIG is not set
 # CONFIG_MODULE_I2C is not set
 # CONFIG_MODULE_I2C_MASTER is not set
 # CONFIG_MODULE_I2C_MULTIMASTER is not set
@@ -113,6 +123,7 @@ CONFIG_MODULE_UART_CREATE_CONFIG=y
 # CONFIG_MODULE_TIMER_DYNAMIC is not set
 # CONFIG_MODULE_PWM is not set
 # CONFIG_MODULE_PWM_CREATE_CONFIG is not set
+# CONFIG_MODULE_PWM_NG is not set
 # CONFIG_MODULE_ADC is not set
 # CONFIG_MODULE_ADC_CREATE_CONFIG is not set
 
@@ -126,6 +137,7 @@ CONFIG_MODULE_MENU=y
 # CONFIG_MODULE_RDLINE_KILL_BUF is not set
 # CONFIG_MODULE_RDLINE_HISTORY is not set
 # CONFIG_MODULE_PARSE is not set
+# CONFIG_MODULE_PARSE_NO_FLOAT is not set
 
 #
 # External devices modules
@@ -134,6 +146,8 @@ CONFIG_MODULE_MENU=y
 # CONFIG_MODULE_LCD_CREATE_CONFIG is not set
 # CONFIG_MODULE_MULTISERVO is not set
 # CONFIG_MODULE_MULTISERVO_CREATE_CONFIG is not set
+# CONFIG_MODULE_AX12 is not set
+# CONFIG_MODULE_AX12_CREATE_CONFIG is not set
 
 #
 # Brushless motor drivers (you should enable pwm modules to see all)
@@ -144,31 +158,32 @@ CONFIG_MODULE_MENU=y
 # CONFIG_MODULE_BRUSHLESS_3PHASE_DIGITAL_HALL_DOUBLE_CREATE_CONFIG is not set
 
 #
-# Encoders
+# Encoders (you need comm/spi for encoders_spi)
 #
 # CONFIG_MODULE_ENCODERS_MICROB is not set
 # CONFIG_MODULE_ENCODERS_MICROB_CREATE_CONFIG is not set
 # CONFIG_MODULE_ENCODERS_EIRBOT is not set
 # CONFIG_MODULE_ENCODERS_EIRBOT_CREATE_CONFIG is not set
+# CONFIG_MODULE_ENCODERS_SPI is not set
+# CONFIG_MODULE_ENCODERS_SPI_CREATE_CONFIG is not set
 
 #
-# Robot specific modules
+# Robot specific modules (fixed point lib may be needed)
 #
 # CONFIG_MODULE_ROBOT_SYSTEM is not set
+# CONFIG_MODULE_ROBOT_SYSTEM_USE_F64 is not set
 # CONFIG_MODULE_ROBOT_SYSTEM_MOT_AND_EXT is not set
 # CONFIG_MODULE_POSITION_MANAGER is not set
+# CONFIG_MODULE_COMPENSATE_CENTRIFUGAL_FORCE is not set
 # CONFIG_MODULE_TRAJECTORY_MANAGER is not set
 # CONFIG_MODULE_BLOCKING_DETECTION_MANAGER is not set
 # CONFIG_MODULE_OBSTACLE_AVOIDANCE is not set
+# CONFIG_MODULE_OBSTACLE_AVOIDANCE_CREATE_CONFIG is not set
 
 #
 # Control system modules
 #
 # CONFIG_MODULE_CONTROL_SYSTEM_MANAGER is not set
-
-#
-# Filters
-#
 # CONFIG_MODULE_PID is not set
 # CONFIG_MODULE_PID_CREATE_CONFIG is not set
 # CONFIG_MODULE_RAMP is not set
@@ -177,11 +192,16 @@ CONFIG_MODULE_MENU=y
 # CONFIG_MODULE_BIQUAD is not set
 
 #
-# Crypto modules
+# Radio devices
 #
+# CONFIG_MODULE_CC2420 is not set
+# CONFIG_MODULE_CC2420_CREATE_CONFIG is not set
+# CONFIG_MODULE_XBEE is not set
+# CONFIG_MODULE_XBEE_STATS is not set
+# CONFIG_MODULE_XBEE_ATCMD_HELP is not set
 
 #
-# Crypto modules depend on utils module
+# Crypto modules
 #
 # CONFIG_MODULE_AES is not set
 # CONFIG_MODULE_AES_CTR is not set
@@ -192,20 +212,12 @@ CONFIG_MODULE_MENU=y
 #
 # Encodings modules
 #
-
-#
-# Encoding modules depend on utils module
-#
 # CONFIG_MODULE_BASE64 is not set
 # CONFIG_MODULE_HAMMING is not set
 
 #
 # Debug modules
 #
-
-#
-# Debug modules depend on utils module
-#
 # CONFIG_MODULE_DIAGNOSTIC is not set
 # CONFIG_MODULE_DIAGNOSTIC_CREATE_CONFIG is not set
 CONFIG_MODULE_ERROR=y
@@ -232,12 +244,17 @@ CONFIG_AVRDUDE_PROG_STK200=y
 # CONFIG_AVRDUDE_PROG_PAVR is not set
 # CONFIG_AVRDUDE_PROG_BUTTERFLY is not set
 # CONFIG_AVRDUDE_PROG_AVR910 is not set
+# CONFIG_AVRDUDE_PROG_AVR911 is not set
 # CONFIG_AVRDUDE_PROG_STK500 is not set
 # CONFIG_AVRDUDE_PROG_AVRISP is not set
 # CONFIG_AVRDUDE_PROG_BSD is not set
 # CONFIG_AVRDUDE_PROG_DAPA is not set
 # CONFIG_AVRDUDE_PROG_JTAG1 is not set
+# CONFIG_AVRDUDE_PROG_AVR109 is not set
+# CONFIG_AVRDUDE_PROG_AVRISPMKII is not set
+# CONFIG_AVRDUDE_PROG_ARDUINO is not set
 CONFIG_AVRDUDE_PORT="/dev/parport0"
+CONFIG_AVRDUDE_BAUDRATE=19200
 
 #
 # Avarice
@@ -246,3 +263,4 @@ CONFIG_AVARICE_PORT="/dev/ttyS0"
 CONFIG_AVARICE_DEBUG_PORT=1234
 CONFIG_AVARICE_PROG_MKI=y
 # CONFIG_AVARICE_PROG_MKII is not set
+# CONFIG_AVRDUDE_CHECK_SIGNATURE is not set

diff --git a/modules/ihm/menu/test/main.c b/modules/ihm/menu/test/main.c
index fe0974f9c30ba2e5b2b6e0a9204753d43c5a71da..1d94e7d548ef6bcfaff8e5fe3bf28b0aac6d0c04 100644 (file)
--- a/modules/ihm/menu/test/main.c
+++ b/modules/ihm/menu/test/main.c
@@ -30,6 +30,10 @@
 #include <uart.h>
 #include <menu.h>
 
+#ifdef HOST_VERSION
+#include <hostsim.h>
+#endif
+
 int myparam=0;
 
 void f(void * data)