From: Martin Vajnar Date: Fri, 24 Jul 2015 11:34:19 +0000 (+0200) Subject: Merge branch 'cmd_echoserver' of git@rtime.felk.cvut.cz:rpp-test-sw into personal... X-Git-Tag: eaton-0.5.5~15 X-Git-Url: http://rtime.felk.cvut.cz/gitweb/pes-rpp/rpp-test-sw.git/commitdiff_plain/c819e48705ec746db6164253394f2cf2a595b1b4 Merge branch 'cmd_echoserver' of git@rtime.felk.cvut.cz:rpp-test-sw into personal/vajnamar/merge-fixes --- c819e48705ec746db6164253394f2cf2a595b1b4 diff --cc rpp-test-sw/commands/cmd.c index 5a01bb6,0e53579..b02c1e5 --- a/rpp-test-sw/commands/cmd.c +++ b/rpp-test-sw/commands/cmd.c @@@ -36,7 -32,10 +36,8 @@@ #include "cmd_lin.h" #include "cmd_lout.h" #include "cmd_nc.h" + #include "cmd_echoserver.h" #include "cmd_netstats.h" -#include "cmd_pin.h" -#include "cmd_port.h" #include "cmd_sdram.h" #include "cmd_spi.h" #include "cmd_vbat.h" @@@ -157,13 -155,11 +158,14 @@@ cmd_des_t const *cmd_list_main[] = CMD_DES_INCLUDE_SUBLIST(cmd_list_hout), CMD_DES_INCLUDE_SUBLIST(cmd_list_lin), CMD_DES_INCLUDE_SUBLIST(cmd_list_lout), + CMD_DES_INCLUDE_SUBLIST(cmd_list_motor_example), CMD_DES_INCLUDE_SUBLIST(cmd_list_nc), + CMD_DES_INCLUDE_SUBLIST(cmd_list_es), CMD_DES_INCLUDE_SUBLIST(cmd_list_netstats), +#endif CMD_DES_INCLUDE_SUBLIST(cmd_list_pin), CMD_DES_INCLUDE_SUBLIST(cmd_list_port), +#ifdef TARGET_TMS570_RPP CMD_DES_INCLUDE_SUBLIST(cmd_list_sdram), CMD_DES_INCLUDE_SUBLIST(cmd_list_spi), CMD_DES_INCLUDE_SUBLIST(cmd_list_vbat),