Port GPIO control commands

Refs #1024

diff --git a/rpp-test-sw/commands/cmd_pin.c b/rpp-test-sw/commands/cmd_pin.c
index 88e94387fce8613b6f52e12dd4f644c78cffe6c9..65fd0a245b7e3b683182f1411441705b1bb7275f 100644 (file)
--- a/rpp-test-sw/commands/cmd_pin.c
+++ b/rpp-test-sw/commands/cmd_pin.c
@@ -156,54 +156,54 @@ cmd_des_t const cmd_des_pin_list = {
        "\n"
        "    --> pinlist\n"
        "    List of all defined pins. Those names can be used by pinval command.\n"
-       "    FANCTRL\n"
-       "    ETHRST\n"
-       "    VBAT1EN\n"
-       "    VBAT2EN\n"
-       "    VBAT3EN\n"
-       "    VBATEN\n"
-       "    SPICSA\n"
-       "    SPICSB\n"
-       "    MOUT1EN\n"
-       "    MOUT2EN\n"
-       "    CANNSTB\n"
-       "    CANEN\n"
-       "    LIN2NSLP\n"
-       "    LIN1NSLP\n"
-       "    DININT\n"
-       "    DIN8\n"
-       "    DIN9\n"
-       "    DIN10\n"
-       "    DIN11\n"
-       "    DIN12\n"
-       "    DIN13\n"
-       "    DIN14\n"
-       "    DIN15\n"
-       "    MOUT6EN\n"
-       "    MOUT5EN\n"
-       "    MOUT6IN\n"
-       "    MOUT5IN\n"
-       "    MOUT4EN\n"
-       "    MOUT3EN\n"
-       "    MOUT4IN\n"
-       "    MOUT3IN\n"
-       "    HBREN\n"
-       "    HBRDIR\n"
-       "    HBRPWM\n"
-       "    MOUT1IN\n"
-       "    MOUT2IN\n"
-       "    HOUT1IN\n"
-       "    HOUT1DIAG\n"
-       "    HOUT2IN\n"
-       "    HOUT2DIAG\n"
-       "    HOUT3IN\n"
-       "    HOUT3DIAG\n"
-       "    HOUT4IN\n"
-       "    HOUT4DIAG\n"
-       "    HOUT5IN\n"
-       "    HOUT5DIAG\n"
-       "    HOUT6IN\n"
-       "    HOUT6DIAG\n",
+       "    GIOA0\n"
+       "    GIOA1\n"
+       "    GIOA2\n"
+       "    GIOA3\n"
+       "    GIOA4\n"
+       "    GIOA5\n"
+       "    GIOA6\n"
+       "    GIOA7\n"
+       "    GIOB0\n"
+       "    GIOB1\n"
+       "    GIOB2\n"
+       "    GIOB3\n"
+       "    GIOB4\n"
+       "    GIOB5\n"
+       "    GIOB6\n"
+       "    GIOB7\n"
+       "    NHET10\n"
+       "    NHET11\n"
+       "    NHET12\n"
+       "    NHET13\n"
+       "    NHET14\n"
+       "    NHET15\n"
+       "    NHET16\n"
+       "    NHET17\n"
+       "    NHET18\n"
+       "    NHET19\n"
+       "    NHET110\n"
+       "    NHET111\n"
+       "    NHET112\n"
+       "    NHET113\n"
+       "    NHET114\n"
+       "    NHET115\n"
+       "    NHET116\n"
+       "    NHET117\n"
+       "    NHET118\n"
+       "    NHET119\n"
+       "    NHET120\n"
+       "    NHET121\n"
+       "    NHET122\n"
+       "    NHET123\n"
+       "    NHET124\n"
+       "    NHET125\n"
+       "    NHET126\n"
+       "    NHET127\n"
+       "    NHET128\n"
+       "    NHET129\n"
+       "    NHET130\n"
+       "    NHET131\n",
        CMD_HANDLER(cmd_do_pin_list), (void *)&cmd_list_pin
 };
 
@@ -226,22 +226,17 @@ cmd_des_t const cmd_des_pin_val = {
        "\n"
        "The list of valid pin names can be obtained with pinlist command.\n"
        "\n"
-       "Most of the pins are accessible indirectly via other highlevel\n"
-       "commands. HBR_EN is, for example, controlled by the hbrenable command.\n"
-       "This command serves as supplement to highlevel commands for testing\n"
-       "purpose.\n"
-       "\n"
        "### Example ###\n"
        "\n"
-       "    --> pinvalHBREN 1\n"
-       "    pinvalHBREN=1\n"
+       "    --> pinvalGIOB0 1\n"
+       "    pinvalGIOB0=1\n"
        "\n"
-       "Sets the HBR_EN pin to 1.\n"
+       "Sets the GIOB0 pin to 1.\n"
        "\n"
-       "    --> pinvalHBREN\n"
-       "    pinvalHBREN=1\n"
+       "    --> pinvalGIOB0\n"
+       "    pinvalGIOB0=1\n"
        "\n"
-       "Gets a value of the HBR_EN pin.\n",
+       "Gets a value of the GIOB0 pin.\n",
        CMD_HANDLER(cmd_do_pin_val), (void *)&cmd_list_pin
 };
 
@@ -264,22 +259,17 @@ cmd_des_t const cmd_des_pin_dir = {
        "\n"
        "The list of valid pin names can be obtained with pinlist command.\n"
        "\n"
-       "Most of the pins are accessible indirectly via other highlevel\n"
-       "commands HBR_EN is, for example, controlled by the hbrenable command.\n"
-       "This command serves as supplement to highlevel commands for testing\n"
-       "purpose.\n"
-       "\n"
        "### Example ###\n"
        "\n"
-       "    --> pindirHBREN 1\n"
-       "    pindirHBREN=1\n"
+       "    --> pindirGIOB0 1\n"
+       "    pindirGIOB0=1\n"
        "\n"
-       "Sets the HBR_EN pin as output.\n"
+       "Sets the GIOB0 pin as output.\n"
        "\n"
-       "    --> pindirHBREN\n"
-       "    pindirHBREN=1\n"
+       "    --> pindirGIOB0\n"
+       "    pindirGIOB0=1\n"
        "\n"
-       "Gets the direction of the HBR_EN pin.\n",
+       "Gets the direction of the GIOB0 pin.\n",
        CMD_HANDLER(cmd_do_pin_dir), (void *)&cmd_list_pin
 };
 

diff --git a/rpp-test-sw/commands/cmd_port.c b/rpp-test-sw/commands/cmd_port.c
index 695adf6cd16724edf8bd58c65195165a17947f88..bbad320753b398492887b6fcebb17137adbd92a1 100644 (file)
--- a/rpp-test-sw/commands/cmd_port.c
+++ b/rpp-test-sw/commands/cmd_port.c
@@ -116,7 +116,7 @@ int cmd_do_port_val(cmd_io_t *cmd_io, const struct cmd_des *des, char *param[])
                                rpp_sci_printf("%d\r\n", values[i]);
                        }
                }
-               rpp_sci_printf("portval%s=%x", portName, ret);
+               rpp_sci_printf("portval%s=%x\n", portName, ret);
                return 0;
        }
 }
@@ -157,14 +157,11 @@ cmd_des_t const cmd_des_port_val = {
        "Port names and interface type can be obtained with the portlist\n"
        "command.\n"
        "\n"
-       "NOTE: For successful communication with the HBR, HBR_EN pin must\n"
-       "be set first.\n"
-       "\n"
        "### Example ###\n"
        "\n"
-       "     --> portvalMOUTIN 3A\n"
-       "     portvalMOUTIN=0\n"
-       "     --> portvalMOUTIN\n"
+       "     --> portvalGIOB 3A\n"
+       "     portvalGIOB=0\n"
+       "     --> portvalGIOB\n"
        "     0\n"
        "     1\n"
        "     0\n"
@@ -172,13 +169,13 @@ cmd_des_t const cmd_des_port_val = {
        "     1\n"
        "     1\n"
        "\n"
-       "This pair of commands sets:\nMOUT1IN"
-       "MOUT1IN=0\n"
-       "MOUT2IN=1\n"
-       "MOUT3IN=0\n"
-       "MOUT4IN=1\n"
-       "MOUT5IN=1\n"
-       "MOUT6IN=1\n"
+       "This pair of commands sets:\nGIOB"
+       "GIOB=0\n"
+       "GIOB=1\n"
+       "GIOB=0\n"
+       "GIOB=1\n"
+       "GIOB=1\n"
+       "GIOB=1\n"
        "Which is shown in getter output\n",
        CMD_HANDLER(cmd_do_port_val), (void *)&cmd_list_port
 };
@@ -203,21 +200,10 @@ cmd_des_t const cmd_des_port_list = {
        "\n"
        "     --> portlist\n"
        "     List of all defined ports with its type. Those names can be used by portval command.\n"
-       "     DINMCU, GPIO\n"
-       "     DINSPI, SPI\n"
-       "     HOUTDIAG, GPIO\n"
-       "     HOUTIN, GPIO\n"
-       "     HOUTIFBK, ADC\n"
-       "     ADC, ADC\n"
-       "     LOUT, SPI\n"
-       "     DAC12, SPI\n"
-       "     DAC34, SPI\n"
-       "     DACDREF, SPI\n"
-       "     HBR, SPI\n"
-       "     FRAY1, SPI\n"
-       "     FRAY2, SPI\n"
-       "     MOUTEN, GPIO\n"
-       "     MOUTIN, GPIO\n",
+       "     GIOA, GPIO\n"
+       "     GIOB, GPIO\n"
+       "     NHET1, GPIO\n"
+       "     ADC, ADC\n",
        CMD_HANDLER(cmd_do_port_list), (void *)&cmd_list_port
 };
 

diff --git a/rpp-test-sw/commands/main.c b/rpp-test-sw/commands/main.c
index b1f38ef218762c72273766c2705053fb6dd5e51f..4b56961d549c9a031d9b828d3244d02da74c1e27 100644 (file)
--- a/rpp-test-sw/commands/main.c
+++ b/rpp-test-sw/commands/main.c
@@ -21,6 +21,8 @@
 \r
 /* Include Files */\r
 #include "rpp/sci.h"\r
+#include "rpp/adc.h"\r
+#include "rpp/gio.h"\r
 #include "os/os.h"\r
 #include "cmdproc_freertos_tms570.h"\r
 #include "version.h" // Generated by Eclipse in the pre-build step\r
@@ -32,6 +34,8 @@
  */\r
 void main(void)\r
 {\r
+       rpp_adc_init();\r
+       rpp_gio_init(RPP_GIO_PORT_ALL);\r
        rpp_sci_init();\r
 \r
        // Speed up the SCI\r