Changed Overrun block shortcut to TROR and removing it from unimplemented list in...

diff --git a/doc/rpp_simulink.tex b/doc/rpp_simulink.tex
index 3d3358292701febda75eaf530a8a919d3961c477..da560c4377d45054a336c9063f93015b60651206 100644 (file)
--- a/doc/rpp_simulink.tex
+++ b/doc/rpp_simulink.tex
@@ -2279,7 +2279,6 @@ System blocks & Configuration block & \texttt{X} & \texttt{[CONF]} & \texttt{Rpp
  & Ethernet receive block & \texttt{X} & \texttt{[ETHR]} & \texttt{rpp\_eth.h} \\
  & Ethernet send msg block & \texttt{X} & \texttt{[ETHS]} & - Idem - \\
  & SDRAM write block & \texttt{X} & \texttt{[SDRW]} & \texttt{rpp\_sdr.h} \\
-Trigger blocks & Overrun detected block & \texttt{X} & \texttt{[TROR]} & - None - \\
  & Stack overflow detected block & \texttt{X} & \texttt{[TRSO]} & - None - \\
  & Malloc Failed detected block & \texttt{X} & \texttt{[TRMF]} & - None - \\
 \end{tabular}\end{center}

diff --git a/rpp/blocks/rpp_lib.slx b/rpp/blocks/rpp_lib.slx
index c4261e1eeba29b5f18f8decad3f2c77a6f4d704f..0cd7a8900f3ae050d1194ef5c8d21f5404af9942 100644 (file)
Binary files a/rpp/blocks/rpp_lib.slx and b/rpp/blocks/rpp_lib.slx differ

diff --git a/rpp/blocks/sfunction_ovrn.c b/rpp/blocks/sfunction_tror.c
similarity index 93%
rename from rpp/blocks/sfunction_ovrn.c
rename to rpp/blocks/sfunction_tror.c
index aedf8f7bf37b75b74d2dab7aee13d91af9bcae56..fcccfa2a3e02130b73d46fc5c0060c5ac9f8119f 100644 (file)
--- a/rpp/blocks/sfunction_ovrn.c
+++ b/rpp/blocks/sfunction_tror.c
@@ -7,7 +7,7 @@
  * document, and communication of its contents is not permitted
  * without prior written authorization.
  *
- * File : sfunction_ovrn.c
+ * File : sfunction_tror.c
  * Abstract:
  *     C-MEX S-function block for RPP overrun.
  *
@@ -16,7 +16,7 @@
  *     trailer.c
  *
  * Compile with:
- *     <matlabroot>/bin/mex sfunction_ovrn.c
+ *     <matlabroot>/bin/mex sfunction_tror.c
  */
 
 /*
@@ -25,7 +25,7 @@
 Name: Overrun Detection
 Category: Trigger blocks
 Header: No header
-Mnemonic: OVRN
+Mnemonic: TROR
 
 Inputs:
 
@@ -52,7 +52,7 @@ Relevant demos:
 ...
 */
 
-#define S_FUNCTION_NAME sfunction_ovrn
+#define S_FUNCTION_NAME sfunction_tror
 #include "header.c"
 
 

diff --git a/rpp/blocks/tlc_c/sfunction_ovrn.tlc b/rpp/blocks/tlc_c/sfunction_tror.tlc
similarity index 96%
rename from rpp/blocks/tlc_c/sfunction_ovrn.tlc
rename to rpp/blocks/tlc_c/sfunction_tror.tlc
index b08bb2206c601d0d62207eabe2ea5f060501f626..cdc4dbe332ab5cf8a80a39a574e579ac6835d095 100644 (file)
--- a/rpp/blocks/tlc_c/sfunction_ovrn.tlc
+++ b/rpp/blocks/tlc_c/sfunction_tror.tlc
@@ -7,7 +7,7 @@
 %% document, and communication of its contents is not permitted
 %% without prior written authorization.
 %%
-%% File : sfunction_ovrn.tlc
+%% File : sfunction_tror.tlc
 %% Abstract:
 %%     TLC file for inlining RPP Overrun block.
 %%
@@ -17,7 +17,7 @@
 %%     Outputs()        : rtw_tlc.pdf p. 281
 
 
-%implements sfunction_ovrn "C"
+%implements sfunction_tror "C"
 
 %include "common.tlc"