]> rtime.felk.cvut.cz Git - pes-rpp/rpp-simulink.git/commitdiff
Fixed block diagram that missed the SCI module.
authorCarlos Jenkins <carlos@jenkins.co.cr>
Thu, 13 Jun 2013 21:56:59 +0000 (23:56 +0200)
committerCarlos Jenkins <carlos@jenkins.co.cr>
Thu, 13 Jun 2013 21:56:59 +0000 (23:56 +0200)
rpp/lib/rpp/doc/api/content/blocks.png
rpp/lib/rpp/doc/api/content/blocks_map.html
rpp/lib/rpp/doc/api/content/main_page.dox
rpp/lib/rpp/doc/api/doxygen.conf
rpp/lib/rpp/doc/blocks.png
rpp/lib/rpp/doc/blocks.svg
rpp/lib/rpp/doc/rpp.txt

index 1cf82ff4ee182266fa729b2e3069423f03b44cb0..1df77c4e1ef55c603c81cc37d8b06ead1f5c690f 100644 (file)
Binary files a/rpp/lib/rpp/doc/api/content/blocks.png and b/rpp/lib/rpp/doc/api/content/blocks.png differ
index 544cedb1375e07ba12937c9740736c5c76b3ca07..2c33b9f240b6b94633cda93880da31c835a19f02 100644 (file)
@@ -2,19 +2,19 @@
 <div id="blocks_map_div" style="float: left; margin-right: 20px;">
     <img usemap="#blocks_map" src="blocks.png">
     <map name="blocks_map">
-        <area shape="rect" title="Digital Output" alt="Digital Output" href="lout_8h.html" coords="125,5,247,96">
-        <area shape="rect" title="Digital Input" alt="Digital Input" href="din_8h.html" coords="125,122,247,213">
-        <area shape="rect" title="Analog Output" alt="Analog Output" href="aout_8h.html" coords="126,356,248,447">
-        <area shape="rect" title="Analog Input" alt="Analog Input" href="ain_8h.html" coords="125,239,247,330">
-        <area shape="rect" title="Ethernet" alt="Ethernet" href="eth_8h.html" coords="126,472,248,563">
-        <area shape="rect" title="SD-Card" alt="SD-Card" href="sdc_8h.html" coords="445,5,567,96">
-        <area shape="rect" title="Power Output" alt="Power Output" href="mout_8h.html" coords="605,6,727,97">
-        <area shape="rect" title="High-Power Output" alt="High-Power Output" href="hout_8h.html" coords="606,122,728,213">
-        <area shape="rect" title="H-Bridge" alt="H-Bridge" href="hbr_8h.html" coords="606,239,728,330">
-        <area shape="rect" title="LIN" alt="LIN" href="lin_8h.html" coords="606,396,728,487">
-        <area shape="rect" title="FlexRay" alt="FlexRay" href="fr_8h.html" coords="606,513,728,604">
-        <area shape="rect" title="CAN" alt="CAN" href="can_8h.html" coords="606,628,728,719">
-        <area shape="rect" title="SD-RAM" alt="SD-RAM" href="sdr_8h.html" coords="286,5,408,96">
+        <area shape="rect" title="Digital Output" alt="Digital Output" href="lout_8h.html" coords="125,5,247,96" />
+        <area shape="rect" title="Digital Input" alt="Digital Input" href="din_8h.html" coords="125,122,247,213" />
+        <area shape="rect" title="Analog Output" alt="Analog Output" href="aout_8h.html" coords="126,356,248,447" />
+        <area shape="rect" title="Analog Input" alt="Analog Input" href="ain_8h.html" coords="125,239,247,330" />
+        <area shape="rect" title="Ethernet" alt="Ethernet" href="eth_8h.html" coords="126,472,248,563" />
+        <area shape="rect" title="SD-Card" alt="SD-Card" href="sdc_8h.html" coords="445,5,567,96" />
+        <area shape="rect" title="Power Output" alt="Power Output" href="mout_8h.html" coords="605,6,727,97" />
+        <area shape="rect" title="High-Power Output" alt="High-Power Output" href="hout_8h.html" coords="606,122,728,213" />
+        <area shape="rect" title="H-Bridge" alt="H-Bridge" href="hbr_8h.html" coords="606,239,728,330" />
+        <area shape="rect" title="LIN" alt="LIN" href="lin_8h.html" coords="606,396,728,487" />
+        <area shape="rect" title="FlexRay" alt="FlexRay" href="fr_8h.html" coords="606,513,728,604" />
+        <area shape="rect" title="CAN" alt="CAN" href="can_8h.html" coords="606,628,728,719" />
+        <area shape="rect" title="SD-RAM" alt="SD-RAM" href="sdr_8h.html" coords="286,5,408,96" />
+        <area shape="rect" title="Serial Communication Interface" alt="UART" href="sci_8h.html" coords="365,472,487,563" />
     </map>
 </div>
-<div style="clear: both;"></div>
index 9f5f934a7e0bd7171080f19a0117b3067ec54460..44a2d99c51d5188908910bf4a128600ae456ef27 100644 (file)
@@ -30,26 +30,22 @@ Click on a block in the following diagram to see the API for that module.
 CATEGORY            NAME                                MNEMONIC
 ----------------------------------------------------------------
 
-Logic IO
-                    Digital Input                       [DIN ]
+Logic IO            Digital Input                       [DIN ]
                     Digital (Logic) Output              [LOUT]
                     Analog Input                        [AIN ]
                     Analog Output                       [AOUT]
 
-Power output
-                    H-Bridge output                     [HBR ]
+Power output        H-Bridge output                     [HBR ]
                     Power output (12V, 2A)              [MOUT]
                     High-Power output (12V, 10A)        [HOUT]
 
-Communication
-                    CAN Bus                             [CAN ]
+Communication       CAN Bus                             [CAN ]
                     LIN (Local Interconnect Network)    [LIN ]
                     FlexRay                             [FR  ]
                     Serial Communication Interface      [SCI ]
-                    Ethernet                            [ETHR]
+                    Ethernet                            [ETH ]
 
-Logging
-                    SD Card                             [SDC ]
+Logging             SD Card                             [SDC ]
                     SD-RAM                              [SDR ]
 \endverbatim
 \htmlonly
@@ -102,7 +98,7 @@ void main(void)
 
     /* Spawn tasks */
     if(xTaskCreate(my_task, (const signed char*)"my_task",
-            512, NULL, CONTROL_PRIORITY, NULL) != pdPASS) {
+            512, NULL, 0, NULL) != pdPASS) {
         #ifdef DEBUG
         rpp_sci_printf((const char*)
             "ERROR: cannot spawn control task.\r\n"
index 3802e8412d0ea17a07221f6ba6e0462f1fbd3046..3a7fe9deea733ff288d333919264296d243d4717 100644 (file)
@@ -1135,7 +1135,7 @@ USE_INLINE_TREES       = NO
 # used to set the initial width (in pixels) of the frame in which the tree
 # is shown.
 
-TREEVIEW_WIDTH         = 250
+TREEVIEW_WIDTH         = 180
 
 # When the EXT_LINKS_IN_WINDOW option is set to YES doxygen will open
 # links to external symbols imported via tag files in a separate window.
index 1cf82ff4ee182266fa729b2e3069423f03b44cb0..1df77c4e1ef55c603c81cc37d8b06ead1f5c690f 100644 (file)
Binary files a/rpp/lib/rpp/doc/blocks.png and b/rpp/lib/rpp/doc/blocks.png differ
index 2b8163962beca36f7f1db93d4e73cd7e82405620..8ca6265450a9bc148a2054740448e985fdb3965e 100644 (file)
@@ -25,7 +25,7 @@
      borderopacity="1.0"
      inkscape:pageopacity="1"
      inkscape:pageshadow="2"
-     inkscape:zoom="1.2694677"
+     inkscape:zoom="0.85685629"
      inkscape:cx="427.45175"
      inkscape:cy="363.53821"
      inkscape:document-units="px"
@@ -33,8 +33,8 @@
      showgrid="false"
      borderlayer="true"
      inkscape:showpageshadow="false"
-     inkscape:window-width="1920"
-     inkscape:window-height="1144"
+     inkscape:window-width="1600"
+     inkscape:window-height="844"
      inkscape:window-x="0"
      inkscape:window-y="27"
      inkscape:window-maximized="1"
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
       </cc:Work>
     </rdf:RDF>
   </metadata>
     </g>
     <g
        id="g3709"
-       transform="matrix(1.2301807,0,0,1.2302405,-338.00309,-78.730241)">
+       transform="matrix(1.2301807,0,0,1.2302405,-338.00309,-184.53092)">
       <rect
          style="fill:#44aa00;stroke:#000000;stroke-width:0.40643445"
          id="rect3695"
     </g>
     <g
        id="g3806"
-       transform="matrix(1.2301807,0,0,1.2302405,37.202019,-200.52405)">
+       transform="matrix(1.2301807,0,0,1.2302405,37.202021,-200.52405)">
       <rect
          y="677.25"
          x="309.25"
            sodipodi:role="line">TMS570LS3137</tspan></text>
     </g>
     <g
-       id="g3813"
-       transform="matrix(1.2301807,0,0,1.2302405,43.352922,-202.98454)">
-      <g
-         id="g4497">
-        <rect
-           y="794.25"
-           x="304.25"
-           height="75"
-           width="100"
-           id="rect3042"
-           style="fill:#44aa00;stroke:#000000;stroke-width:0.40643445" />
-        <text
-           sodipodi:linespacing="125%"
-           id="text3046"
-           y="836.83997"
-           x="338.65222"
-           style="font-size:12px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:DejaVu Sans;-inkscape-font-specification:DejaVu Sans"
-           xml:space="preserve"><tspan
-             style="font-size:14px;font-weight:bold;-inkscape-font-specification:DejaVu Sans Bold"
-             y="836.83997"
-             x="338.65222"
-             id="tspan3048"
-             sodipodi:role="line">RTC</tspan></text>
-      </g>
+       id="g3192">
+      <rect
+         style="fill:#44aa00;stroke:#000000;stroke-width:0.49999997"
+         id="rect3042"
+         width="35.2719"
+         height="26.45521"
+         x="461.6033"
+         y="742.96143" />
+      <text
+         transform="scale(0.9999757,1.0000243)"
+         xml:space="preserve"
+         style="font-size:14px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:DejaVu Sans;-inkscape-font-specification:DejaVu Sans Bold"
+         x="464.0751"
+         y="761.26685"
+         id="text3046"
+         sodipodi:linespacing="125%"><tspan
+           sodipodi:role="line"
+           id="tspan3048"
+           x="464.0751"
+           y="761.26685"
+           style="font-size:14px;font-weight:bold;-inkscape-font-specification:DejaVu Sans Bold">RTC</tspan></text>
     </g>
     <g
        id="g3775"
            sodipodi:role="line">COMMUNICATION CONNECTOR</tspan></text>
     </g>
     <g
-       id="g4525"
+       id="g4519"
        transform="matrix(1.2301807,0,0,1.2302405,0.29659847,-92.262887)">
-      <g
-         id="g4519">
-        <rect
-           rx="8.1284914"
-           ry="8.1288872"
-           y="-244.00543"
-           x="963.5141"
-           height="99.5"
-           width="49.5"
-           id="rect4504"
-           style="fill:#cccccc;stroke:#000000;stroke-width:0.40643448"
-           transform="matrix(0,1,-1,0,0,0)" />
-        <text
-           sodipodi:linespacing="125%"
-           id="text4506"
-           y="984.51801"
-           x="194.06744"
-           style="font-size:14px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:center;line-height:125%;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;font-family:DejaVu Sans;-inkscape-font-specification:DejaVu Sans"
-           xml:space="preserve"><tspan
-             y="984.51801"
-             x="196.29596"
-             id="tspan4508"
-             sodipodi:role="line">ETHERNET </tspan><tspan
-             y="1002.018"
-             x="194.06744"
-             sodipodi:role="line"
-             id="tspan4513">CONNECTOR</tspan></text>
-      </g>
+      <rect
+         transform="matrix(0,1,-1,0,0,0)"
+         style="fill:#cccccc;stroke:#000000;stroke-width:0.40643448"
+         id="rect4504"
+         width="49.5"
+         height="99.5"
+         x="963.5141"
+         y="-244.00543"
+         ry="8.1288872"
+         rx="8.1284914" />
       <text
-         sodipodi:linespacing="125%"
-         id="text4515"
-         y="1028.3622"
-         x="143.89801"
-         style="font-size:12px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:DejaVu Sans;-inkscape-font-specification:DejaVu Sans"
-         xml:space="preserve"><tspan
-           y="1028.3622"
-           x="143.89801"
-           id="tspan4517"
-           sodipodi:role="line">* Only in-box accessible.</tspan></text>
+         xml:space="preserve"
+         style="font-size:14px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:center;line-height:125%;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;font-family:DejaVu Sans;-inkscape-font-specification:DejaVu Sans"
+         x="194.06744"
+         y="984.51801"
+         id="text4506"
+         sodipodi:linespacing="125%"><tspan
+           sodipodi:role="line"
+           id="tspan4508"
+           x="196.29596"
+           y="984.51801">ETHERNET </tspan><tspan
+           id="tspan4513"
+           sodipodi:role="line"
+           x="194.06744"
+           y="1002.018">CONNECTOR</tspan></text>
     </g>
+    <text
+       xml:space="preserve"
+       style="font-size:10px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:DejaVu Sans;-inkscape-font-specification:DejaVu Sans"
+       x="177.49107"
+       y="1172.8414"
+       id="text4515"
+       sodipodi:linespacing="125%"
+       transform="scale(0.9999757,1.0000243)"><tspan
+         sodipodi:role="line"
+         id="tspan4517"
+         x="177.49107"
+         y="1172.8414"
+         style="font-size:11px">* Only in-box accessible.</tspan></text>
     <path
        style="fill:none;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-end:url(#Arrow2Mend)"
        d="m 176.81966,505.01888 -57.81062,0"
        style="fill:none;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-end:url(#Arrow2Mend)" />
     <path
        style="fill:none;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-end:url(#Arrow2Mend)"
-       d="m 839.89347,811.34876 -274.32884,0 0,150.08934 -23.37343,0"
+       d="m 839.89347,811.34876 -274.32884,0 -3.9e-4,43.05796 -23.37304,0"
        id="path6144"
        inkscape:connector-curvature="0"
        sodipodi:nodetypes="cccc" />
        sodipodi:nodetypes="cc"
        inkscape:connector-curvature="0"
        id="path6934"
-       d="m 479.45198,725.23193 0,47.97949"
+       d="m 479.45198,725.23193 0,17.97949"
        style="fill:none;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-start:url(#Arrow2Mstart);marker-end:none" />
     <path
        sodipodi:nodetypes="cc"
        style="fill:none;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-start:url(#Arrow2Mstart);marker-end:url(#Arrow2Mend)" />
     <path
        style="fill:none;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-start:url(#Arrow2Mstart);marker-mid:none;marker-end:url(#Arrow2Mend)"
-       d="m 415.48265,648.95704 -97.18434,0 0,-120.56357 -17.22253,0"
+       d="m 416.30024,647.72628 -98.00193,1.23076 0,-120.56357 -17.22253,0"
        id="path8284"
        inkscape:connector-curvature="0"
        sodipodi:nodetypes="cccc" />
     <path
        style="fill:none;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-start:url(#Arrow2Mstart);marker-mid:none;marker-end:url(#Arrow2Mend)"
-       d="m 415.48265,662.48969 -114.40687,0"
+       d="m 416.30024,658.80136 -113.965,0"
        id="path8286"
        inkscape:connector-curvature="0"
        sodipodi:nodetypes="cc" />
     <path
        style="fill:none;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-start:url(#Arrow2Mstart);marker-mid:none;marker-end:url(#Arrow2Mend)"
-       d="m 415.48265,677.25257 -97.18434,0 0,60.28179 -17.22253,0"
+       d="m 416.30024,671.10128 -98.00193,0 0,66.43308 -15.96307,0"
        id="path8288"
        inkscape:connector-curvature="0"
        sodipodi:nodetypes="cccc" />
     <path
        style="fill:none;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-start:url(#Arrow2Mstart);marker-mid:none;marker-end:url(#Arrow2Mend)"
-       d="m 301.07578,854.4072 29.52434,0 0,-162.39174 84.88253,0"
+       d="m 302.33524,854.4072 28.26488,-4.8e-4 0,-171.00466 85.70012,0"
        id="path8290"
        inkscape:connector-curvature="0"
        sodipodi:nodetypes="cccc" />
     <path
        style="fill:none;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-start:url(#Arrow2Mstart);marker-mid:none;marker-end:url(#Arrow2Mend)"
-       d="m 301.07578,971.28005 41.82614,0 0,-264.50171 72.58073,0"
+       d="m 302.33524,971.28005 40.567,-3.3e-4 -3.2e-4,-275.57297 73.39832,0"
        id="path8292"
        inkscape:connector-curvature="0"
        sodipodi:nodetypes="cccc" />
          x="806.78979"
          id="tspan9288"
          sodipodi:role="line">9</tspan></text>
+    <text
+       sodipodi:linespacing="125%"
+       id="text3221"
+       y="1172.8414"
+       x="417.38214"
+       style="font-size:11px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:DejaVu Sans;-inkscape-font-specification:DejaVu Sans"
+       xml:space="preserve"
+       transform="scale(0.9999757,1.0000243)"><tspan
+         y="1172.8414"
+         x="417.38214"
+         id="tspan3223"
+         sodipodi:role="line">* Only in-box accessible.</tspan></text>
+    <g
+       id="g3277">
+      <rect
+         y="926.68384"
+         x="417.63541"
+         height="92.268036"
+         width="123.01807"
+         id="rect3199"
+         style="fill:#80b3ff;stroke:#000000;stroke-width:0.49999997" />
+      <text
+         transform="scale(0.9999757,1.0000243)"
+         sodipodi:linespacing="125%"
+         id="text3201"
+         y="955.11694"
+         x="463.59824"
+         style="font-size:14.76252747px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:DejaVu Sans;-inkscape-font-specification:DejaVu Sans"
+         xml:space="preserve"><tspan
+           style="font-size:17.22294807px;font-weight:bold;-inkscape-font-specification:DejaVu Sans Bold"
+           y="955.11694"
+           x="463.59824"
+           id="tspan3203"
+           sodipodi:role="line">SCI</tspan></text>
+      <text
+         transform="scale(0.9999757,1.0000243)"
+         xml:space="preserve"
+         style="font-size:14.76252747px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:center;line-height:125%;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;font-family:DejaVu Sans;-inkscape-font-specification:DejaVu Sans"
+         x="479.37595"
+         y="974.77753"
+         id="text3205"
+         sodipodi:linespacing="125%"><tspan
+           id="tspan3250"
+           sodipodi:role="line"
+           x="479.37595"
+           y="974.77753">1 x UART</tspan></text>
+    </g>
+    <rect
+       transform="matrix(0,1,-1,0,0,0)"
+       style="fill:#cccccc;stroke:#000000;stroke-width:0.5"
+       id="rect3213"
+       width="60.896904"
+       height="122.40298"
+       x="1093.0912"
+       y="-540.3526"
+       ry="10"
+       rx="9.999999" />
+    <text
+       xml:space="preserve"
+       style="font-size:17.22294807px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:center;line-height:125%;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;font-family:DejaVu Sans;-inkscape-font-specification:DejaVu Sans"
+       x="478.93152"
+       y="1118.9038"
+       id="text3215"
+       sodipodi:linespacing="125%"
+       transform="scale(0.9999757,1.0000243)"><tspan
+         sodipodi:role="line"
+         id="tspan3217"
+         x="481.67307"
+         y="1118.9038">SCI </tspan><tspan
+         id="tspan3219"
+         sodipodi:role="line"
+         x="478.93152"
+         y="1140.4325">CONNECTOR</tspan></text>
+    <path
+       sodipodi:nodetypes="cc"
+       inkscape:connector-curvature="0"
+       id="path3225"
+       d="m 478.2218,1020.4896 0,71.3448"
+       style="fill:none;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-start:url(#Arrow2Mstart);marker-end:url(#Arrow2Mend)" />
+    <path
+       sodipodi:nodetypes="cccc"
+       inkscape:connector-curvature="0"
+       id="path3316"
+       d="m 416.30024,971.27972 -59.3,0 0,-263.27219 59.3,0"
+       style="fill:none;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-start:url(#Arrow2Mstart);marker-mid:none;marker-end:url(#Arrow2Mend)" />
   </g>
 </svg>
index d02155072b25fe542d8ecb6f56dcf058f80c8edc..56b935228b8a9691d485d14b9c40f4a11c6915d3 100644 (file)
@@ -29,7 +29,7 @@ This library include functions for the following hardware modules:
                         LIN (Local Interconnect Network)    [LIN ]
                         FlexRay                             [FR  ]
                         Serial Communication Interface      [SCI ]
-                        Ethernet                            [ETHR]
+                        Ethernet                            [ETH ]
 
     Logging
                         SD Card                             [SDC ]