Rename DIN and DOUT to GIO IN and GIO OUT

diff --git a/rpp/blocks/rpp_lib.slx b/rpp/blocks/rpp_lib.slx
index 6ff7bc128ff05ea5fead0066676e9d0864028026..3ffb0129cece538c69123b3dcad8ca12a61d71e6 100644 (file)
Binary files a/rpp/blocks/rpp_lib.slx and b/rpp/blocks/rpp_lib.slx differ

diff --git a/rpp/blocks/sfunction_din.c b/rpp/blocks/sfunction_gio_in.c
similarity index 92%
rename from rpp/blocks/sfunction_din.c
rename to rpp/blocks/sfunction_gio_in.c
index b3dfe19159f1ee52c2835797078b2a354d727720..16d259339e58f0782c59572913e7c81337f15a6f 100644 (file)
--- a/rpp/blocks/sfunction_din.c
+++ b/rpp/blocks/sfunction_gio_in.c
@@ -1,5 +1,3 @@
-/* TODO: Přejmenovat na sfunction_gio_in.c */
-
 /* Copyright (C) 2013, 2014, 2015 Czech Technical University in Prague
  *
  * Authors:
@@ -10,7 +8,7 @@
  * document, and communication of its contents is not permitted
  * without prior written authorization.
  *
- * File : sfunction_ain.c
+ * File : sfunction_gio_in.c
  * Abstract:
  *     C-MEX S-function block for reading from RPP GPIO ports.
  *
@@ -19,16 +17,16 @@
  *     trailer.c
  *
  * Compile with:
- *     <matlabroot>/bin/mex sfunction_din.c
+ *     <matlabroot>/bin/mex sfunction_gio_in.c
  */
 
 /*
 %YAML 1.2
 ---
-Name: Digital Input
+Name: Global Pourpose Digital Input
 Category: IO blocks
 Header: rpp/gio.h
-Mnemonic: DIN
+Mnemonic: GIOIN
 
 Inputs:
 
@@ -44,8 +42,8 @@ Description: &desc |
   Reads a value from a GPIO pin. The block supports GIOA, GIOB and NHET1 ports.
   Any pin can be configured as tri-state, pull up or pull down.
 
-  It is not allowed to read from one pin by using more then one DIN blocks.
-  It is not allowed to use DIN and DOUT blocks together configured for one GPIO pin.
+  It is not allowed to read from one pin by using more then one GIOIN blocks.
+  It is not allowed to use GIOIN and DOUT blocks together configured for one GPIO pin.
 
 Help: *desc
 
@@ -62,7 +60,7 @@ Relevant demos:
 */
 
 
-#define S_FUNCTION_NAME sfunction_din
+#define S_FUNCTION_NAME sfunction_gio_in
 #include "header.c"
 
 #define PARAM_NAME_PORT_TYPE           "port_type"

diff --git a/rpp/blocks/sfunction_dout.c b/rpp/blocks/sfunction_gio_out.c
similarity index 92%
rename from rpp/blocks/sfunction_dout.c
rename to rpp/blocks/sfunction_gio_out.c
index 354501fcfbf163ada55c6cfdbc21a8b7b324efa8..df5db89af7fae5c5d9dfd979977fdbe2bde020ce 100644 (file)
--- a/rpp/blocks/sfunction_dout.c
+++ b/rpp/blocks/sfunction_gio_out.c
@@ -8,7 +8,7 @@
  * document, and communication of its contents is not permitted
  * without prior written authorization.
  *
- * File : sfunction_ain.c
+ * File : sfunction_gio_out.c
  * Abstract:
  *     C-MEX S-function block for writting to RPP GPIO ports.
  *
@@ -17,16 +17,16 @@
  *     trailer.c
  *
  * Compile with:
- *     <matlabroot>/bin/mex sfunction_dout.c
+ *     <matlabroot>/bin/mex sfunction_gio_out.c
  */
 
 /*
 %YAML 1.2
 ---
-Name: Digital Output
+Name: Global Pourpose Digital Output
 Category: IO blocks
 Header: rpp/gio.h
-Mnemonic: DOUT
+Mnemonic: GIOOUT
 
 Inputs:
   - { name: "Digital Output value", type: "bool" }
@@ -47,8 +47,8 @@ Description: &desc |
   when the GPIO module is initialized and stays there until the first
   block execution.
 
-  It is not allowed to write to one pin by using more then one DOUT blocks.
-  It is not allowed to use DOUT and DIN blocks on one GPIO pin.
+  It is not allowed to write to one pin by using more then one GIOOUT blocks.
+  It is not allowed to use GIOOUT and DIN blocks on one GPIO pin.
 
 Help: *desc
 
@@ -65,7 +65,7 @@ Relevant demos:
 */
 
 
-#define S_FUNCTION_NAME sfunction_dout
+#define S_FUNCTION_NAME sfunction_gio_out
 #include "header.c"
 
 #define PARAM_NAME_PORT_TYPE           "port_type"

diff --git a/rpp/blocks/tlc_c/sfunction_din.tlc b/rpp/blocks/tlc_c/sfunction_gio_in.tlc
similarity index 97%
rename from rpp/blocks/tlc_c/sfunction_din.tlc
rename to rpp/blocks/tlc_c/sfunction_gio_in.tlc
index d7c9bb565fc192a5d73e708e7f545d9c0e74bc07..ddf2b72b2f91b3f314ff3ad2f711fdba1ab84ac4 100644 (file)
--- a/rpp/blocks/tlc_c/sfunction_din.tlc
+++ b/rpp/blocks/tlc_c/sfunction_gio_in.tlc
@@ -9,7 +9,7 @@
 %% document, and communication of its contents is not permitted
 %% without prior written authorization.
 %%
-%% File : sfunction_din.tlc
+%% File : sfunction_gio_in.tlc
 %% Abstract:
 %%     TLC file for inlining RPP digital input block.
 %%
@@ -19,7 +19,7 @@
 %%     Outputs()        : rtw_tlc.pdf p. 281
 
 
-%implements sfunction_din "C"
+%implements sfunction_gio_in "C"
 
 %include "common.tlc"
 
@@ -30,7 +30,7 @@
        %% Ensure required header files are included
        %<RppCommonBlockTypeSetup(block, system)>
        %<LibAddToCommonIncludes("rpp/rpp.h")>
-       %assign ::rpp_din_present = 1
+       %assign ::rpp_gio_in_present = 1
 
 %endfunction
 

diff --git a/rpp/blocks/tlc_c/sfunction_dout.tlc b/rpp/blocks/tlc_c/sfunction_gio_out.tlc
similarity index 97%
rename from rpp/blocks/tlc_c/sfunction_dout.tlc
rename to rpp/blocks/tlc_c/sfunction_gio_out.tlc
index dc725462c3f9407a5d67a08fc7d87100a45fa6fb..f79ffc91371503f2a0ec279d480db23d8fc09414 100644 (file)
--- a/rpp/blocks/tlc_c/sfunction_dout.tlc
+++ b/rpp/blocks/tlc_c/sfunction_gio_out.tlc
@@ -9,7 +9,7 @@
 %% document, and communication of its contents is not permitted
 %% without prior written authorization.
 %%
-%% File : sfunction_dout.tlc
+%% File : sfunction_gio_out.tlc
 %% Abstract:
 %%     TLC file for inlining RPP digital output block.
 %%
@@ -19,7 +19,7 @@
 %%     Outputs()        : rtw_tlc.pdf p. 281
 
 
-%implements sfunction_dout "C"
+%implements sfunction_gio_out "C"
 
 %include "common.tlc"
 
@@ -30,7 +30,7 @@
        %% Ensure required header files are included
        %<RppCommonBlockTypeSetup(block, system)>
        %<LibAddToCommonIncludes("rpp/rpp.h")>
-       %assign ::rpp_dout_present = 1
+       %assign ::rpp_gio_out_present = 1
 
 %endfunction