Merge branch 'master' of ssh://rtime.felk.cvut.cz/rpp-test-sw

Conflicts:
	.cproject

diff --git a/.cproject b/.cproject
index c3f50740371080b07f368714341bf072b36a407b..5d5e9943e3ac6b2a858c94491518a0449ef247ce 100644 (file)
--- a/.cproject
+++ b/.cproject
@@ -14,7 +14,7 @@
                                </extensions>
                        </storageModule>
                        <storageModule moduleId="cdtBuildSystem" version="4.0.0">
-                               <configuration artifactExtension="out" artifactName="${ProjName}" buildProperties="" cleanCommand="${CG_CLEAN_CMD}" description="" id="com.ti.ccstudio.buildDefinitions.TMS470.Debug.1456715682" name="Debug" parent="com.ti.ccstudio.buildDefinitions.TMS470.Debug">
+                               <configuration artifactExtension="out" artifactName="${ProjName}" buildProperties="" cleanCommand="${CG_CLEAN_CMD}" description="" id="com.ti.ccstudio.buildDefinitions.TMS470.Debug.1456715682" name="Debug" parent="com.ti.ccstudio.buildDefinitions.TMS470.Debug" postannouncebuildStep="" postbuildStep="" preannouncebuildStep="Get version from git" prebuildStep="echo &quot;#define GIT_VERSION \&quot;$(shell git describe --always)\&quot;&quot; &gt; version.h">
                                        <folderInfo id="com.ti.ccstudio.buildDefinitions.TMS470.Debug.1456715682." name="/" resourcePath="">
                                                <toolChain id="com.ti.ccstudio.buildDefinitions.TMS470_4.9.exe.DebugToolchain.2124995458" name="TI Build Tools" superClass="com.ti.ccstudio.buildDefinitions.TMS470_4.9.exe.DebugToolchain" targetTool="com.ti.ccstudio.buildDefinitions.TMS470_4.9.exe.linkerDebug.972405208">
                                                        <option id="com.ti.ccstudio.buildDefinitions.core.OPT_TAGS.546456820" superClass="com.ti.ccstudio.buildDefinitions.core.OPT_TAGS" valueType="stringList">
@@ -24,10 +24,11 @@
                                                                <listOptionValue builtIn="false" value="CCS_MBS_VERSION=5.1.0.01"/>
                                                                <listOptionValue builtIn="false" value="RUNTIME_SUPPORT_LIBRARY=rtsv7R4_T_be_v3D16_eabi.lib"/>
                                                                <listOptionValue builtIn="false" value="OUTPUT_TYPE=executable"/>
+                                                               <listOptionValue builtIn="false" value="LINK_ORDER="/>
                                                        </option>
                                                        <option id="com.ti.ccstudio.buildDefinitions.core.OPT_CODEGEN_VERSION.2087481517" name="Compiler version" superClass="com.ti.ccstudio.buildDefinitions.core.OPT_CODEGEN_VERSION" value="4.9.1" valueType="string"/>
                                                        <targetPlatform id="com.ti.ccstudio.buildDefinitions.TMS470_4.9.exe.targetPlatformDebug.1287550254" name="Platform" superClass="com.ti.ccstudio.buildDefinitions.TMS470_4.9.exe.targetPlatformDebug"/>
-                                                       <builder buildPath="${BuildDirectory}" id="com.ti.ccstudio.buildDefinitions.TMS470_4.9.exe.builderDebug.1748795988" keepEnvironmentInBuildfile="false" name="GNU Make" superClass="com.ti.ccstudio.buildDefinitions.TMS470_4.9.exe.builderDebug"/>
+                                                       <builder autoBuildTarget="all" buildPath="${BuildDirectory}" cleanBuildTarget="clean" enableAutoBuild="true" enableCleanBuild="true" enabledIncrementalBuild="true" id="com.ti.ccstudio.buildDefinitions.TMS470_4.9.exe.builderDebug.1748795988" incrementalBuildTarget="all" keepEnvironmentInBuildfile="false" managedBuildOn="true" name="GNU Make" parallelBuildOn="false" superClass="com.ti.ccstudio.buildDefinitions.TMS470_4.9.exe.builderDebug"/>
                                                        <tool command="&quot;${CG_TOOL_CL}&quot;" id="com.ti.ccstudio.buildDefinitions.TMS470_4.9.exe.compilerDebug.948543449" name="ARM Compiler" superClass="com.ti.ccstudio.buildDefinitions.TMS470_4.9.exe.compilerDebug">
                                                                <option id="com.ti.ccstudio.buildDefinitions.TMS470_4.9.compilerID.CODE_STATE.1294730861" name="Designate code state, 16-bit (thumb) or 32-bit (--code_state)" superClass="com.ti.ccstudio.buildDefinitions.TMS470_4.9.compilerID.CODE_STATE" value="com.ti.ccstudio.buildDefinitions.TMS470_4.9.compilerID.CODE_STATE.32" valueType="enumerated"/>
                                                                <option id="com.ti.ccstudio.buildDefinitions.TMS470_4.9.compilerID.SILICON_VERSION.916756117" name="Target processor version (--silicon_version, -mv)" superClass="com.ti.ccstudio.buildDefinitions.TMS470_4.9.compilerID.SILICON_VERSION" value="com.ti.ccstudio.buildDefinitions.TMS470_4.9.compilerID.SILICON_VERSION.7R4" valueType="enumerated"/>
@@ -44,6 +45,7 @@
                                                                        <listOptionValue builtIn="false" value="&quot;${CG_TOOL_ROOT}/include&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/rpp/lib/rpp/include}&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/rpp/lib/os/7.0.2_tms570/include}&quot;"/>
+                                                                       <listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/${ConfigName}}&quot;"/>
                                                                </option>
                                                                <option id="com.ti.ccstudio.buildDefinitions.TMS470_4.9.compilerID.GCC.2008975510" name="Enable support for GCC extensions (--gcc)" superClass="com.ti.ccstudio.buildDefinitions.TMS470_4.9.compilerID.GCC" value="true" valueType="boolean"/>
                                                                <inputType id="com.ti.ccstudio.buildDefinitions.TMS470_4.9.compiler.inputType__C_SRCS.1617334105" name="C Sources" superClass="com.ti.ccstudio.buildDefinitions.TMS470_4.9.compiler.inputType__C_SRCS"/>
@@ -70,7 +72,12 @@
                                                </toolChain>
                                        </folderInfo>
                                        <fileInfo id="com.ti.ccstudio.buildDefinitions.TMS470.Debug.1456715682.350360411" name="docgen.c" rcbsApplicability="disable" resourcePath="commands/doc/docgen.c" toolsToInvoke="com.ti.ccstudio.buildDefinitions.TMS470_4.9.exe.compilerDebug.948543449.2057512487">
--                                              <tool id="com.ti.ccstudio.buildDefinitions.TMS470_4.9.exe.compilerDebug.948543449.2057512487" name="ARM Compiler" superClass="com.ti.ccstudio.buildDefinitions.TMS470_4.9.exe.compilerDebug.948543449"/>
+                                               <tool id="com.ti.ccstudio.buildDefinitions.TMS470_4.9.exe.compilerDebug.948543449.2057512487" name="ARM Compiler" superClass="com.ti.ccstudio.buildDefinitions.TMS470_4.9.exe.compilerDebug.948543449">
+                                                       <inputType id="com.ti.ccstudio.buildDefinitions.TMS470_4.9.compiler.inputType__C_SRCS.732805611" name="C Sources" superClass="com.ti.ccstudio.buildDefinitions.TMS470_4.9.compiler.inputType__C_SRCS"/>
+                                                       <inputType id="com.ti.ccstudio.buildDefinitions.TMS470_4.9.compiler.inputType__CPP_SRCS.1457149119" name="C++ Sources" superClass="com.ti.ccstudio.buildDefinitions.TMS470_4.9.compiler.inputType__CPP_SRCS"/>
+                                                       <inputType id="com.ti.ccstudio.buildDefinitions.TMS470_4.9.compiler.inputType__ASM_SRCS.1847429483" name="Assembly Sources" superClass="com.ti.ccstudio.buildDefinitions.TMS470_4.9.compiler.inputType__ASM_SRCS"/>
+                                                       <inputType id="com.ti.ccstudio.buildDefinitions.TMS470_4.9.compiler.inputType__ASM2_SRCS.252679747" name="Assembly Sources" superClass="com.ti.ccstudio.buildDefinitions.TMS470_4.9.compiler.inputType__ASM2_SRCS"/>
+                                               </tool>
                                                <tool customBuildStep="true" id="org.eclipse.cdt.managedbuilder.ui.rcbs.1088553770" name="Resource Custom Build Step">
                                                        <inputType id="org.eclipse.cdt.managedbuilder.ui.rcbs.inputtype.1177985543" name="Resource Custom Build Step Input Type">
                                                                <additionalInput kind="additionalinputdependency" paths=""/>

diff --git a/commands/cmd_adc.c b/commands/cmd_adc.c
index 51cae24325f0dc1dda74e54fa2bb8a369fed9cf0..a6639ed36942d7fec9395cd8cf78f4fda2acbb84 100644 (file)
--- a/commands/cmd_adc.c
+++ b/commands/cmd_adc.c
@@ -68,7 +68,7 @@ cmd_des_t const cmd_des_read_adc1={
     "\n"
     "=== Command syntax ===\n"
     "\n"
-    "   --> readadc\n",
+    "   readadc\n",
     CMD_HANDLER(cmd_do_read_adc1_values), (void *)&cmd_list_adc
 };
 

diff --git a/commands/cmd_can.c b/commands/cmd_can.c
index 6c64df726e956eae73d11bf7516dbfa56df16570..6118a6a7410fa9e31cbf4b12199199aac7850fb5 100644 (file)
--- a/commands/cmd_can.c
+++ b/commands/cmd_can.c
@@ -263,7 +263,7 @@ cmd_des_t const cmd_des_test_can_loopback={
     "\n"
     "=== Command syntax ===\n"
     "\n"
-    "   --> testcan SOURCE DESTINATION\n"
+    "   testcan SOURCE DESTINATION\n"
     "where SOURCE and DESTINATION is a number in the range 1-3 and SOURCE\n"
     "is not equal DESTINATION.\n"
     "\n"

diff --git a/commands/cmd_dac.c b/commands/cmd_dac.c
index 21af7faaca994367046e31e9cac996c947fc9cca..6a5fa6a563394dac2e3caa53e9c20b1e38c8a944 100644 (file)
--- a/commands/cmd_dac.c
+++ b/commands/cmd_dac.c
@@ -170,7 +170,7 @@ cmd_des_t const cmd_des_dac_pin_setup = {
        "\n"
        "=== Command syntax ===\n"
        "\n"
-       "   --> dacpinsetupPIN[:][VALUE] \n"
+       "   dacpinsetupPIN[:][VALUE] \n"
        "where\n"
        "* PIN is in range 1-4\n"
        "* : means set value VALUE to pin PIN\n"
@@ -201,7 +201,7 @@ cmd_des_t const cmd_des_dac_pin_set_val = {
        "\n"
        "=== Command syntax ===\n"
        "\n"
-       "   --> dacpinvalPIN[:][VALUE] \n"
+       "   dacpinvalPIN[:][VALUE] \n"
        "where\n"
        "* PIN is in range 1-4\n"
        "* : means set raw value VALUE to pin PIN\n"
@@ -231,7 +231,7 @@ cmd_des_t const cmd_des_dac_pin_set_voltage = {
        "\n"
        "=== Command syntax ===\n"
        "\n"
-       "   --> dacpinvoltage[:][VALUE] \n"
+       "   dacpinvoltage[:][VALUE] \n"
        "where\n"
        "* PIN is in range 1-4\n"
        "* : means set voltage VALUE to pin PIN\n"

diff --git a/commands/cmd_din.c b/commands/cmd_din.c
index 4d4fbce849879fc702af126c34d729e450401847..51a1ef6b13a37e5d664aeb958c791e8cf535512c 100644 (file)
--- a/commands/cmd_din.c
+++ b/commands/cmd_din.c
@@ -181,7 +181,7 @@ cmd_des_t const cmd_des_din_setup={
        "\n"
        "=== Command syntax ===\n"
        "\n"
-       "   --> dinsetupPIN[:](A,B,C) \n"
+       "   dinsetupPIN[:](A,B,C) \n"
        "where\n"
        "* PIN is in range 1-16\n"
        "* : means setup the PIN\n"
@@ -218,7 +218,7 @@ cmd_des_t const cmd_des_din_get={
        "\n"
        "=== Command syntax ===\n"
        "\n"
-       "   --> dingetPIN[:]TR \n"
+       "   dingetPIN[:]TR \n"
        "where\n"
        "* PIN is in range 1-16\n"
        "* TR is not yet implemented\n"
@@ -245,7 +245,7 @@ cmd_des_t const cmd_des_din_diag={
        "\n"
        "=== Command syntax ===\n"
        "\n"
-       "   --> dindiagPIN[?] \n"
+       "   dindiagPIN[?] \n"
        "where PIN is in range 1-16\n"
        "\n"
        "=== Example ===\n"

diff --git a/commands/cmd_emac.c b/commands/cmd_emac.c
index aa38608417801b5b4c12ce1d2a129629f0175be5..1aab27bc153f58785a3d9656ff61f7d2159e5156 100644 (file)
--- a/commands/cmd_emac.c
+++ b/commands/cmd_emac.c
@@ -272,7 +272,7 @@ cmd_des_t const cmd_des_test_ethernet={
     "\n"
     "=== Command syntax ===\n"
     "\n"
-    "   --> ethernet\n",
+    "   ethernet\n",
     CMD_HANDLER(emac_test), (void *)&cmd_list_emac
 };
 

diff --git a/commands/cmd_fray.c b/commands/cmd_fray.c
index 2dc17dbeae22406e9a8fb0ec7c1dd7f98cc83bd5..bbd97903ea27424c277abacb073fdaba7be89c5d 100644 (file)
--- a/commands/cmd_fray.c
+++ b/commands/cmd_fray.c
@@ -431,7 +431,7 @@ cmd_des_t const cmd_des_fray_stat={
        "\n"
        "=== Command syntax ===\n"
        "\n"
-       "   --> fraystatPORT\n"
+       "   fraystatPORT\n"
        "where PORT is in range 1-2\n"
        "\n"
        "=== Example ===\n"
@@ -457,7 +457,7 @@ cmd_des_t const cmd_des_test_fray_a={
            "in the end.\n"
            "=== Command syntax ===\n"
            "\n"
-           "   --> testfrayA\n",
+           "   testfrayA\n",
            CMD_HANDLER(cmd_do_test_frayA), (void *)&cmd_list_fray
 };
 
@@ -476,7 +476,7 @@ cmd_des_t const cmd_des_test_fray_b={
            "in the end.\n"
            "=== Command syntax ===\n"
            "\n"
-           "   --> testfrayB\n",
+           "   testfrayB\n",
            CMD_HANDLER(cmd_do_test_frayB), (void *)&cmd_list_fray
 };
 

diff --git a/commands/cmd_hbr.c b/commands/cmd_hbr.c
index d4ddf93bd227dc07339f4a4a2c79fd2991f229d5..99bbb442e6208d8c9c306b7257399ee62e0f36e2 100644 (file)
--- a/commands/cmd_hbr.c
+++ b/commands/cmd_hbr.c
@@ -133,7 +133,7 @@ cmd_des_t const cmd_des_hbr_enable = {
        "\n"
        "=== Command syntax ===\n"
        "\n"
-       "   --> hbrenable:X\n"
+       "   hbrenable:X\n"
        "where X is PWM period in us\n"
        "\n"
        "=== Example ===\n"
@@ -164,7 +164,7 @@ cmd_des_t const cmd_des_hbr_control = {
        "\n"
        "=== Command syntax ===\n"
        "\n"
-       "   --> hbrcontrol:X\n"
+       "   hbrcontrol:X\n"
        "where X specifies direction and PWM duty cycle in % (thus in range -100 - 100)\n"
        "\n"
        "=== Example ===\n"
@@ -199,7 +199,7 @@ cmd_des_t const cmd_des_hbr_disable = {
        "\n"
        "=== Command syntax ===\n"
        "\n"
-       "   --> hbrdisable\n"
+       "   hbrdisable\n"
        "\n"
        "=== Example ===\n"
        "\n"

diff --git a/commands/cmd_hout.c b/commands/cmd_hout.c
index 0618da8b8a607d14ddf90d27e56dcfc30a2c5c76..7554a3d8ecb082f064a7d771d52274670993ee11 100644 (file)
--- a/commands/cmd_hout.c
+++ b/commands/cmd_hout.c
@@ -206,7 +206,7 @@ cmd_des_t const cmd_des_test_hout_fail = {
     "\n"
     "=== Command syntax ===\n"
     "\n"
-    "   --> houtfail PIN\n"
+    "   houtfail PIN\n"
     "where PIN is in range 1-6\n"
     "=== Example ===\n"
     "\n"
@@ -227,7 +227,7 @@ cmd_des_t const cmd_des_read_hifbk={
     "\n"
     "=== Command syntax ===\n"
     "\n"
-    "   --> readhifbk\n",
+    "   readhifbk\n",
     CMD_HANDLER(cmd_do_read_hout_ifbk_values), (void *)&cmd_list_hout
 };
 
@@ -245,7 +245,7 @@ cmd_des_t const cmd_des_hout_pwm={
     "\n"
     "=== Command syntax ===\n"
     "\n"
-    "   --> houtpwmPIN[:|?][(PER,DUTY)]\n"
+    "   houtpwmPIN[:|?][(PER,DUTY)]\n"
     "where\n"
     "* PIN is in range 1-6\n"
     "* : means set parameters and parameters in brackets are mandatory, ? means get parameters\n"
@@ -277,7 +277,7 @@ cmd_des_t const cmd_des_hout_pwm_start={
     "\n"
     "=== Command syntax ===\n"
     "\n"
-    "   --> houtpwmstartPIN\n"
+    "   houtpwmstartPIN\n"
     "where PIN is in range 1-6\n"
     "\n"
     "=== Example ===\n"
@@ -299,7 +299,7 @@ cmd_des_t const cmd_des_hout_pwm_stop={
     "\n"
     "=== Command syntax ===\n"
     "\n"
-    "   --> houtpwmstopPIN\n"
+    "   houtpwmstopPIN\n"
     "where PIN is in range 1-6\n"
     "\n"
     "=== Example ===\n"

diff --git a/commands/cmd_lin.c b/commands/cmd_lin.c
index 02d1992726138722018774760263efd753ab349a..01bf87c0d2129af93a06b180a56a6814a911a842 100644 (file)
--- a/commands/cmd_lin.c
+++ b/commands/cmd_lin.c
@@ -123,7 +123,7 @@ cmd_des_t const cmd_des_lin_loop_back={
     "\n"
     "=== Command syntax ===\n"
     "\n"
-    "   --> testlin\n",
+    "   testlin\n",
     CMD_HANDLER(cmd_do_lin_loop_back), (void *)&cmd_list_lin
 };
 

diff --git a/commands/cmd_lout.c b/commands/cmd_lout.c
index 88a408fb493541e387af57a7fa45c08d1a85b4fd..46a844b14fe225abb22bbc2e0ca74fa23ceb7fa4 100644 (file)
--- a/commands/cmd_lout.c
+++ b/commands/cmd_lout.c
@@ -121,7 +121,7 @@ cmd_des_t const cmd_des_lout_set={
     "\n"
     "=== Command syntax ===\n"
     "\n"
-    "   --> loutsetPIN:VALUE\n"
+    "   loutsetPIN:VALUE\n"
     "where\n"
     "* PIN is in range 1-8\n"
     "* : means set VALUE on PIN\n"
@@ -151,7 +151,7 @@ cmd_des_t const cmd_des_lout_diag={
     "\n"
     "=== Command syntax ===\n"
     "\n"
-    "   --> loutdiagPIN?\n"
+    "   loutdiagPIN?\n"
     "where\n"
     "* PIN is in range 1-8\n"
     "* ? means get value from PIN\n"

diff --git a/commands/cmd_motor_example.c b/commands/cmd_motor_example.c
index b27a3a2bad627bc945f13f0b79ea11bb3f1239da..3948f01be5a7d990e8cb23e041344c0531a1addd 100644 (file)
--- a/commands/cmd_motor_example.c
+++ b/commands/cmd_motor_example.c
@@ -378,7 +378,7 @@ cmd_des_t const cmd_des_control={
            "\n"
            "=== Command syntax ===\n"
            "\n"
-           "   --> control\n",
+           "   control\n",
                CMD_HANDLER(cmd_do_control), (void *)&cmd_list_motor_example
        };
 
@@ -397,7 +397,7 @@ cmd_des_t const cmd_des_motor={
            "\n"
            "=== Command syntax ===\n"
            "\n"
-           "   --> motor\n",
+           "   motor\n",
                CMD_HANDLER(cmd_do_motor), (void *)&cmd_list_motor_example
        };
 

diff --git a/commands/cmd_pin.c b/commands/cmd_pin.c
index 414788fe7553b263ffc9771dcfa3b4345b4e6733..c0db481bf57d3b4396ade4655e83b94297706ae3 100644 (file)
--- a/commands/cmd_pin.c
+++ b/commands/cmd_pin.c
@@ -146,7 +146,7 @@ cmd_des_t const cmd_des_pin_list = {
     "\n"
     "=== Command syntax ===\n"
     "\n"
-    "   --> pinlist\n",
+    "   pinlist\n",
     CMD_HANDLER(cmd_do_pin_list), (void *)&cmd_list_pin
 };
 
@@ -169,7 +169,7 @@ cmd_des_t const cmd_des_pin_val={
        "serves as supplement to highlevel commands for testing purpose.\n"
        "=== Command syntax ===\n"
        "\n"
-       "   --> pinvalNAME[:|?][VAL]\n"
+       "   pinvalNAME[:|?][VAL]\n"
        "where\n"
        "* NAME is a string\n"
        "* : means assign VAL to pin NAME and ? means get value from pin NAME\n"
@@ -205,7 +205,7 @@ cmd_des_t const cmd_des_pin_dir={
        "serves as supplement to highlevel commands for testing purpose.\n"
        "=== Command syntax ===\n"
        "\n"
-       "   --> pinvdirNAME[:|?][DIR]\n"
+       "   pinvdirNAME[:|?][DIR]\n"
        "where\n"
        "* NAME is a string\n"
        "* : means assign DIR to pin NAME and ? means get direction from pin NAME\n"

diff --git a/commands/cmd_port.c b/commands/cmd_port.c
index 8857c0efc5b83b0fa02d334b5967b8d92067d05b..c27c0ea4a64db9724624602a84baa0c49bc484c0 100644 (file)
--- a/commands/cmd_port.c
+++ b/commands/cmd_port.c
@@ -110,7 +110,7 @@ cmd_des_t const cmd_des_port_val={
     "\n"
     "=== Command syntax ===\n"
     "\n"
-    "   --> portvalNAME:(VAL)\n"
+    "   portvalNAME:(VAL)\n"
     "where\n"
     "* NAME is a string\n"
     "* : means assign VAL to port NAME, ? means get value from port NAME\n"
@@ -142,7 +142,7 @@ cmd_des_t const cmd_des_port_list={
     "\n"
     "=== Command syntax ===\n"
     "\n"
-    "   --> portlist\n",
+    "   portlist\n",
     CMD_HANDLER(cmd_do_port_list), (void *)&cmd_list_port
 };
 

diff --git a/commands/cmd_sdram.c b/commands/cmd_sdram.c
index e9871711122f7d3a2208daffe2c66f7f816abab8..8a96a1a08eaa30a02166386e88233f1a510eb0af 100644 (file)
--- a/commands/cmd_sdram.c
+++ b/commands/cmd_sdram.c
@@ -245,7 +245,7 @@ cmd_des_t const cmd_des_test_sdram={
     "\n"
     "=== Command syntax ===\n"
     "\n"
-    "   --> testsdram\n",
+    "   testsdram\n",
     CMD_HANDLER(cmd_do_test_ram), (void *)&cmd_list_sdram
 };
 
@@ -260,7 +260,7 @@ cmd_des_t const cmd_des_test_log={
     "\n"
     "=== Command syntax ===\n"
     "\n"
-    "   --> testlog\n",
+    "   testlog\n",
     CMD_HANDLER(cmd_do_test_log), (void *)&cmd_list_sdram
 };
 

diff --git a/commands/cmd_spi.c b/commands/cmd_spi.c
index 61e4229e8da8ef579c66c1eef87162d16c8cf50a..92c4444c84dee8e1bef4d66fd9501323acf335bf 100644 (file)
--- a/commands/cmd_spi.c
+++ b/commands/cmd_spi.c
@@ -208,7 +208,7 @@ cmd_des_t const cmd_des_spi_translate={
        "\n"
        "=== Command syntax ===\n"
        "\n"
-       "   --> spitrNAME?(CMD,RESP)\n"
+       "   spitrNAME?(CMD,RESP)\n"
        "where\n"
        "* NAME is a string\n"
        "* CMD is in range 0 - FFFFFFFF\n"
@@ -239,7 +239,7 @@ cmd_des_t const cmd_des_spimst = {
        "\n"
        "=== Command syntax ===\n"
        " \n"
-       "   --> spimstSPI:ADDR([DATA])\n"
+       "   spimstSPI:ADDR([DATA])\n"
        "where\n"
        "* SPI is in range 0 - 3\n"
        "* ADDR is in range 0 - 3\n"

diff --git a/commands/cmd_vbat.c b/commands/cmd_vbat.c
index ee005b7f8cee4dac3c594c3bdaf7dd1bdb24da4e..2c48a013c3daa7bf8c9ca29ed84e62cd568219e6 100644 (file)
--- a/commands/cmd_vbat.c
+++ b/commands/cmd_vbat.c
@@ -132,7 +132,7 @@ cmd_des_t const cmd_des_power_on = {
     "\n"
     "=== Command syntax ===\n"
     "\n"
-    "   --> poweron\n",
+    "   poweron\n",
     CMD_HANDLER(cmd_do_power_on), (void *)&cmd_list_vbat
 };
 
@@ -146,7 +146,7 @@ cmd_des_t const cmd_des_power_off = {
     "\n"
     "=== Command syntax ===\n"
     "\n"
-    "   --> poweroff\n",
+    "   poweroff\n",
     CMD_HANDLER(cmd_do_power_off), (void *)&cmd_list_vbat
 };
 

diff --git a/commands/main.c b/commands/main.c
index 8948280fe3595c86a2df275b28bda4b522cfcb10..e88ba40e05cbb21c794c9a1d00a8cddddea32659 100644 (file)
--- a/commands/main.c
+++ b/commands/main.c
@@ -30,6 +30,7 @@
 /* Include Files */\r
 #include "rpp/rpp.h"\r
 #include "cmdproc_freertos_tms570.h"\r
+#include "version.h" // Generated by Eclipse in the pre-build step\r
 \r
 /** @fn void main(void)\r
 *   @brief Application main function\r
@@ -39,8 +40,12 @@
 void main(void)\r
 {\r
        rpp_init();\r
+\r
+       // Speed up the SCI\r
+       rpp_sci_setup(115200);\r
+\r
        _enable_IRQ();\r
-       initCmdProc(0, (uint8_t*)"\r\n----\r\n  Rapid Prototyping Platform v00.02-001\r\n  Porsche Engineering 06/2013\r\n----\r\n\r\nType commands", (uint8_t *)"\r\n--> ");\r
+       initCmdProc(0, (uint8_t*)"\r\n----\r\n  Rapid Prototyping Platform v00.02-001\r\n  SW ver " GIT_VERSION " \r\n  Porsche Engineering 06/2013\r\n----\r\n\r\nType commands", (uint8_t *)"\r\n--> ");\r
        vTaskStartScheduler();\r
 \r
        //We should never get here\r

diff --git a/rpp/lib/cmdproc/src/cmdproc.c b/rpp/lib/cmdproc/src/cmdproc.c
index 999adc927a19f39b66aeb84c045baa574a796add..33385bafbea2ef9665d5e0e676ff1311ad6f4fec 100644 (file)
--- a/rpp/lib/cmdproc/src/cmdproc.c
+++ b/rpp/lib/cmdproc/src/cmdproc.c
@@ -335,6 +335,8 @@ int cmd_do_help(cmd_io_t *cmd_io, const struct cmd_des *des, char *param[])
         cmd_io_puts(cmd_io," - ");
         cmd_io_puts(cmd_io,help);
         cmd_io_puts(cmd_io, "\r\n");
+        if (filt)
+         cmd_io_puts(cmd_io, des->long_help);
       }
     }
   }

diff --git a/rpp/lib/rpp/src/drv/sci.c b/rpp/lib/rpp/src/drv/sci.c
index 7bb3f94dcb2b3b47fdc96386067e173ef16b3d28..54ffc12e4554365cc975e194c118f9c53366b097 100644 (file)
--- a/rpp/lib/rpp/src/drv/sci.c
+++ b/rpp/lib/rpp/src/drv/sci.c
@@ -55,9 +55,23 @@ int8_t drv_sci_receive(uint32_t amount, uint8_t* buffer, portTickType wait)
     return SUCCESS;
 }
 
+static int crlf_conv(uint8_t ch_in, uint8_t *ch_out)
+{
+       static bool was_cr = false;
+       if (ch_in == '\n' && !was_cr) {
+               *ch_out = '\r';
+               was_cr = true;
+               return 0; // Retry the same char next time
+       }
+       *ch_out = ch_in;
+       was_cr = (ch_in == '\r');
+       return 1; // Move to the next character
+}
+
 
 int8_t drv_sci_send(uint32_t length, uint8_t* data, portTickType wait)
 {
+       uint8_t ch;
     if(sciOutBuffer.buf == NULL) {
         return FAILURE;
     }
@@ -67,20 +81,24 @@ int8_t drv_sci_send(uint32_t length, uint8_t* data, portTickType wait)
     }
 
     portBASE_TYPE ret = pdTRUE;
-    while(length-- > 0) {
+    while(length > 0) {
+        int ofs = crlf_conv(*data, &ch);
+        length -= ofs;
+        data += ofs;
 
         if(!sciOutBuffer.flags & BUF_TRANSFER_IN_PROGRESS) {
                 taskENTER_CRITICAL();
                 if (!sciOutBuffer.flags & BUF_TRANSFER_IN_PROGRESS) {
                     sciOutBuffer.flags |= BUF_TRANSFER_IN_PROGRESS;
                     sciREG->SETINT = SCI_TX_INT;    // Start new transfer by sending first byte
-                    sciREG->TD     = *data++;
+                    sciREG->TD     = ch;
+                    taskEXIT_CRITICAL();
+                    continue;
                 }
                 taskEXIT_CRITICAL();
-                continue;
         }
 
-        ret = xQueueSend(sciOutBuffer.buf, (void*)data++, wait);
+        ret = xQueueSend(sciOutBuffer.buf, (void*)&ch, wait);
         if(ret != pdTRUE) {
             xSemaphoreGive(sciOutBuffer.mutex);
             return FAILURE;
@@ -117,4 +135,3 @@ int8_t drv_sci_flush(boolean_t buf)
     }
     return drv_sci_flush_buffer(&sciOutBuffer);
 }
-