Fixing some problems and re-generating examples.

diff --git a/boards/stm32_stm3210c/examples/com_simple/com_simple_stm3210c.arxml b/boards/stm32_stm3210c/examples/com_simple/com_simple_stm3210c.arxml
index 2eca33c74c25f6d3805875f39e2b8a17c46d8f75..51013c1d1b3e6a3413e4d6b88baebd14d30e03f8 100644 (file)
--- a/boards/stm32_stm3210c/examples/com_simple/com_simple_stm3210c.arxml
+++ b/boards/stm32_stm3210c/examples/com_simple/com_simple_stm3210c.arxml
@@ -1108,6 +1108,10 @@
                   <DEFINITION-REF DEST="BOOLEAN-PARAM-DEF">/ArcCore/Com/ComGeneral/ComConfigurationUseDet</DEFINITION-REF>\r
                   <VALUE>false</VALUE>\r
                 </BOOLEAN-VALUE>\r
+                <BOOLEAN-VALUE>\r
+                  <DEFINITION-REF DEST="BOOLEAN-PARAM-DEF">/ArcCore/Com/ComGeneral/ArcComBitPositionVersionAutosar4</DEFINITION-REF>\r
+                  <VALUE>false</VALUE>\r
+                </BOOLEAN-VALUE>\r
               </PARAMETER-VALUES>\r
             </CONTAINER>\r
           </CONTAINERS>\r
@@ -1690,14 +1694,6 @@
                   <DEFINITION-REF DEST="BOOLEAN-PARAM-DEF">/ArcCore/PduR/PduRGeneral/PduRSbTxBufferSupport</DEFINITION-REF>\r
                   <VALUE>false</VALUE>\r
                 </BOOLEAN-VALUE>\r
-                <ENUMERATION-VALUE>\r
-                  <DEFINITION-REF DEST="ENUMERATION-PARAM-DEF">/ArcCore/PduR/PduRGeneral/PduRSingleIf</DEFINITION-REF>\r
-                  <VALUE />\r
-                </ENUMERATION-VALUE>\r
-                <ENUMERATION-VALUE>\r
-                  <DEFINITION-REF DEST="ENUMERATION-PARAM-DEF">/ArcCore/PduR/PduRGeneral/PduRSingleTp</DEFINITION-REF>\r
-                  <VALUE />\r
-                </ENUMERATION-VALUE>\r
                 <BOOLEAN-VALUE>\r
                   <DEFINITION-REF DEST="BOOLEAN-PARAM-DEF">/ArcCore/PduR/PduRGeneral/PduRVersionInfoApi</DEFINITION-REF>\r
                   <VALUE>false</VALUE>\r
@@ -1706,6 +1702,10 @@
                   <DEFINITION-REF DEST="BOOLEAN-PARAM-DEF">/ArcCore/PduR/PduRGeneral/PduRZeroCostOperation</DEFINITION-REF>\r
                   <VALUE>false</VALUE>\r
                 </BOOLEAN-VALUE>\r
+                <BOOLEAN-VALUE>\r
+                  <DEFINITION-REF DEST="BOOLEAN-PARAM-DEF">/ArcCore/PduR/PduRGeneral/ArcPduRJ1939TpSupport</DEFINITION-REF>\r
+                  <VALUE>false</VALUE>\r
+                </BOOLEAN-VALUE>\r
               </PARAMETER-VALUES>\r
             </CONTAINER>\r
             <CONTAINER UUID="0c6068ee-d328-4886-9e18-cfb4e87132d0">\r
@@ -1772,6 +1772,11 @@
                     </CONTAINER>\r
                     <CONTAINER UUID="d8e6f448-bb3a-400f-b482-c0626a728371">\r
                       <SHORT-NAME>CanDB_Message_2</SHORT-NAME>\r
+                      <ADMIN-DATA>\r
+                        <SDGS>\r
+                          <SDG GID="Arccore::IdentifiableOptions" />\r
+                        </SDGS>\r
+                      </ADMIN-DATA>\r
                       <DEFINITION-REF DEST="PARAM-CONF-CONTAINER-DEF">/ArcCore/PduR/PduRGlobalConfig/PduRRoutingTable/PduRRoutingPath</DEFINITION-REF>\r
                       <PARAMETER-VALUES>\r
                         <INTEGER-VALUE>\r

diff --git a/boards/stm32_stm3210c/examples/os_simple/config/Mcu_Cfg.c b/boards/stm32_stm3210c/examples/os_simple/config/Mcu_Cfg.c
index d89b4b6fd29f3535607dbfe7552505d5e969314a..ca0d6eb3a0b66ff330febf306b003f40a423ef83 100644 (file)
--- a/boards/stm32_stm3210c/examples/os_simple/config/Mcu_Cfg.c
+++ b/boards/stm32_stm3210c/examples/os_simple/config/Mcu_Cfg.c
@@ -10,7 +10,6 @@
 * Generator version:       2.0.3\r
 *\r
 * Generated by Arctic Studio (http://arccore.com) \r
-*           on Thu May 26 16:39:14 CEST 2011\r
 */\r
 \r
 \r
@@ -20,7 +19,7 @@
 #include "Mcu.h"\r
 \r
 \r
-Mcu_RamSectorSettingConfigType Mcu_RamSectorSettingConfigData[MCU_NBR_OF_RAM_SECTIONS] = {\r
+Mcu_RamSectorSettingConfigType Mcu_RamSectorSettingConfigData[] = {\r
 };\r
 \r
 Mcu_ClockSettingConfigType Mcu_ClockSettingConfigData[] =\r

diff --git a/boards/stm32_stm3210c/examples/os_simple/config/Mcu_Cfg.h b/boards/stm32_stm3210c/examples/os_simple/config/Mcu_Cfg.h
index 69b8944d30db47edb3deb6e3256eb87e6b2e88ca..5e620a71c1c45f3962ef32211062a4d910cfaec8 100644 (file)
--- a/boards/stm32_stm3210c/examples/os_simple/config/Mcu_Cfg.h
+++ b/boards/stm32_stm3210c/examples/os_simple/config/Mcu_Cfg.h
@@ -10,7 +10,6 @@
 * Generator version:       2.0.3\r
 *\r
 * Generated by Arctic Studio (http://arccore.com) \r
-*           on Thu May 26 16:39:14 CEST 2011\r
 */\r
 \r
 

diff --git a/boards/stm32_stm3210c/examples/os_simple/config/Os_Cfg.c b/boards/stm32_stm3210c/examples/os_simple/config/Os_Cfg.c
index 3fbafd50db7c94ecf4af8fb9ce6bb4c3aeef73ba..427f36462fa988eede9e5c4fb1ce8ad1022e4c32 100644 (file)
--- a/boards/stm32_stm3210c/examples/os_simple/config/Os_Cfg.c
+++ b/boards/stm32_stm3210c/examples/os_simple/config/Os_Cfg.c
@@ -10,7 +10,6 @@
 * Generator version:       2.0.34\r
 *\r
 * Generated by Arctic Studio (http://arccore.com) \r
-*           on Thu May 26 16:39:14 CEST 2011\r
 */\r
 \r
        \r

diff --git a/boards/stm32_stm3210c/examples/os_simple/config/Os_Cfg.h b/boards/stm32_stm3210c/examples/os_simple/config/Os_Cfg.h
index 889f37eb32920661ecfb65d80d4bb3fcc1932ea5..ba91c78704a59c6a9b49d5b727b5a510c63ec80e 100644 (file)
--- a/boards/stm32_stm3210c/examples/os_simple/config/Os_Cfg.h
+++ b/boards/stm32_stm3210c/examples/os_simple/config/Os_Cfg.h
@@ -10,7 +10,6 @@
 * Generator version:       2.0.34\r
 *\r
 * Generated by Arctic Studio (http://arccore.com) \r
-*           on Thu May 26 16:39:14 CEST 2011\r
 */\r
 \r
 
@@ -36,16 +35,16 @@
 #define OSMAXALLOWEDVALUE              UINT_MAX// NOT CONFIGURABLE IN TOOLS\r
 #define OSTICKSPERBASE                 1       // NOT CONFIGURABLE IN TOOLS\r
 #define OSMINCYCLE                             1               // NOT CONFIGURABLE IN TOOLS\r
-#define OSTICKDURATION                 1000000    // Time between ticks in nano seconds\r
+#define OSTICKDURATION                 1000000UL    // Time between ticks in nano seconds\r
 \r
 // Counter macros\r
 #define OSMAXALLOWEDVALUE_Counter1             OSMAXALLOWEDVALUE\r
 #define OSTICKSPERBASE_Counter1                        1 // NOT CONFIGURABLE IN TOOLS\r
 #define OSMINCYCLE_Counter1                            1\r
-#define OS_TICKS2SEC_Counter1(_ticks)          ( (OSTICKDURATION * _ticks * OSTICKSPERBASE_Counter1)/1000000000UL )\r
-#define OS_TICKS2MS_Counter1(_ticks)           ( (OSTICKDURATION * _ticks * OSTICKSPERBASE_Counter1)/1000000UL )\r
-#define OS_TICKS2US_Counter1(_ticks)           ( (OSTICKDURATION * _ticks * OSTICKSPERBASE_Counter1)/1000UL )\r
-#define OS_TICKS2NS_Counter1(_ticks)           (OSTICKDURATION * _ticks * OSTICKSPERBASE_Counter1)\r
+#define OS_TICKS2SEC_Counter1(_ticks)          ( (OSTICKDURATION * _ticks)/1000000000UL )\r
+#define OS_TICKS2MS_Counter1(_ticks)           ( (OSTICKDURATION * _ticks)/1000000UL )\r
+#define OS_TICKS2US_Counter1(_ticks)           ( (OSTICKDURATION * _ticks)/1000UL )\r
+#define OS_TICKS2NS_Counter1(_ticks)           (OSTICKDURATION * _ticks)\r
 \r
 \r
 \r
@@ -100,8 +99,8 @@ void eTask2( void );
 //#define OS_SC3                                       STD_ON  /* NOT CONFIGURABLE IN TOOLS */  \r
 #define OS_STACK_MONITORING                    STD_ON\r
 #define OS_STATUS_EXTENDED                     STD_ON\r
-#define OS_USE_GET_SERVICE_ID          STD_ON\r
-#define OS_USE_PARAMETER_ACCESS                STD_ON\r
+#define OS_USE_GET_SERVICE_ID          STD_ON  /* NOT CONFIGURABLE IN TOOLS */\r
+#define OS_USE_PARAMETER_ACCESS                STD_ON  /* NOT CONFIGURABLE IN TOOLS */\r
 #define OS_RES_SCHEDULER                       STD_ON  /* NOT CONFIGURABLE IN TOOLS */\r
 \r
 #define OS_ISR_CNT                     0\r

diff --git a/boards/stm32_stm3210c/examples/os_simple/os_simple_stm32_stm3210c.arxml b/boards/stm32_stm3210c/examples/os_simple/os_simple_stm32_stm3210c.arxml
index 1a776f4e78f8036b3785040bf63836f4522ded7a..4113daff98aa03fa4bd66638e88917640a519556 100644 (file)
--- a/boards/stm32_stm3210c/examples/os_simple/os_simple_stm32_stm3210c.arxml
+++ b/boards/stm32_stm3210c/examples/os_simple/os_simple_stm32_stm3210c.arxml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>\r
-<AUTOSAR xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://autosar.org/3.1.5" xsi:schemaLocation="http://autosar.org/3.1.5 autosar_3-1-5.xsd"><TOP-LEVEL-PACKAGES>\r
+<AUTOSAR xmlns="http://autosar.org/3.1.5" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://autosar.org/3.1.5 autosar_3-1-5.xsd">\r
+  <TOP-LEVEL-PACKAGES>\r
     <AR-PACKAGE>\r
       <SHORT-NAME>os_simple_stm32_stm3210c</SHORT-NAME>\r
       <ELEMENTS>\r
@@ -7,7 +8,7 @@
           <SHORT-NAME>os_simple_stm32_stm3210c</SHORT-NAME>\r
           <ADMIN-DATA>\r
             <DOC-REVISIONS>\r
-              <DOC-REVISION/>\r
+              <DOC-REVISION />\r
             </DOC-REVISIONS>\r
             <SDGS>\r
               <SDG GID="Arccore::EcuOptions">\r
@@ -29,7 +30,7 @@
           <SHORT-NAME>Mcu</SHORT-NAME>\r
           <ADMIN-DATA>\r
             <SDGS>\r
-              <SDG/>\r
+              <SDG />\r
               <SDG GID="Arccore::ModuleOptions">\r
                 <SD GID="GENERATE_AND_VALIDATE">true</SD>\r
                 <SD GID="ARCCORE_EDITOR_VERSION">2.0.2</SD>\r
@@ -146,7 +147,7 @@
                       <SHORT-NAME>EXT_REF_25MHZ</SHORT-NAME>\r
                       <ADMIN-DATA>\r
                         <SDGS>\r
-                          <SDG GID="Arccore::IdentifiableOptions"/>\r
+                          <SDG GID="Arccore::IdentifiableOptions" />\r
                         </SDGS>\r
                       </ADMIN-DATA>\r
                       <DEFINITION-REF DEST="PARAM-CONF-CONTAINER-DEF">/ArcCore/Mcu/McuModuleConfiguration/McuClockSettingConfig/McuClockReferencePoint</DEFINITION-REF>\r
@@ -189,7 +190,7 @@
           <SHORT-NAME>Os</SHORT-NAME>\r
           <ADMIN-DATA>\r
             <SDGS>\r
-              <SDG/>\r
+              <SDG />\r
               <SDG GID="Arccore::ModuleOptions">\r
                 <SD GID="GENERATE_AND_VALIDATE">true</SD>\r
                 <SD GID="ARCCORE_EDITOR_VERSION">2.0.22</SD>\r
@@ -304,7 +305,7 @@
               <SHORT-NAME>Alarm1</SHORT-NAME>\r
               <ADMIN-DATA>\r
                 <SDGS>\r
-                  <SDG GID="Arccore::IdentifiableOptions"/>\r
+                  <SDG GID="Arccore::IdentifiableOptions" />\r
                 </SDGS>\r
               </ADMIN-DATA>\r
               <DEFINITION-REF DEST="PARAM-CONF-CONTAINER-DEF">/ArcCore/Os/OsAlarm</DEFINITION-REF>\r
@@ -353,13 +354,27 @@
                     </INTEGER-VALUE>\r
                   </PARAMETER-VALUES>\r
                 </CONTAINER>\r
+                <CONTAINER UUID="a7fd5600-6224-4c9c-8755-10dd33096776">\r
+                  <SHORT-NAME>OsAlarmSetEvent</SHORT-NAME>\r
+                  <DEFINITION-REF DEST="PARAM-CONF-CONTAINER-DEF">/ArcCore/Os/OsAlarm/OsAlarmAction/OsAlarmSetEvent</DEFINITION-REF>\r
+                  <REFERENCE-VALUES>\r
+                    <REFERENCE-VALUE>\r
+                      <DEFINITION-REF DEST="REFERENCE-PARAM-DEF">/ArcCore/Os/OsAlarm/OsAlarmAction/OsAlarmSetEvent/OsAlarmSetEventRef</DEFINITION-REF>\r
+                      <VALUE-REF DEST="CONTAINER">/os_simple_stm32_stm3210c/Os/Event2</VALUE-REF>\r
+                    </REFERENCE-VALUE>\r
+                    <REFERENCE-VALUE>\r
+                      <DEFINITION-REF DEST="REFERENCE-PARAM-DEF">/ArcCore/Os/OsAlarm/OsAlarmAction/OsAlarmSetEvent/OsAlarmSetEventTaskRef</DEFINITION-REF>\r
+                      <VALUE-REF DEST="CONTAINER">/os_simple_stm32_stm3210c/Os/eTask1</VALUE-REF>\r
+                    </REFERENCE-VALUE>\r
+                  </REFERENCE-VALUES>\r
+                </CONTAINER>\r
               </SUB-CONTAINERS>\r
             </CONTAINER>\r
             <CONTAINER UUID="c58fe505-4564-412a-9fcd-3a2d56284eb9">\r
               <SHORT-NAME>Counter1</SHORT-NAME>\r
               <ADMIN-DATA>\r
                 <SDGS>\r
-                  <SDG GID="Arccore::IdentifiableOptions"/>\r
+                  <SDG GID="Arccore::IdentifiableOptions" />\r
                 </SDGS>\r
               </ADMIN-DATA>\r
               <DEFINITION-REF DEST="PARAM-CONF-CONTAINER-DEF">/ArcCore/Os/OsCounter</DEFINITION-REF>\r
@@ -386,7 +401,7 @@
               <SHORT-NAME>bTask3</SHORT-NAME>\r
               <ADMIN-DATA>\r
                 <SDGS>\r
-                  <SDG GID="Arccore::IdentifiableOptions"/>\r
+                  <SDG GID="Arccore::IdentifiableOptions" />\r
                 </SDGS>\r
               </ADMIN-DATA>\r
               <DEFINITION-REF DEST="PARAM-CONF-CONTAINER-DEF">/ArcCore/Os/OsTask</DEFINITION-REF>\r
@@ -417,7 +432,7 @@
               <SHORT-NAME>eTask1</SHORT-NAME>\r
               <ADMIN-DATA>\r
                 <SDGS>\r
-                  <SDG GID="Arccore::IdentifiableOptions"/>\r
+                  <SDG GID="Arccore::IdentifiableOptions" />\r
                 </SDGS>\r
               </ADMIN-DATA>\r
               <DEFINITION-REF DEST="PARAM-CONF-CONTAINER-DEF">/ArcCore/Os/OsTask</DEFINITION-REF>\r
@@ -460,7 +475,7 @@
               <SHORT-NAME>eTask2</SHORT-NAME>\r
               <ADMIN-DATA>\r
                 <SDGS>\r
-                  <SDG GID="Arccore::IdentifiableOptions"/>\r
+                  <SDG GID="Arccore::IdentifiableOptions" />\r
                 </SDGS>\r
               </ADMIN-DATA>\r
               <DEFINITION-REF DEST="PARAM-CONF-CONTAINER-DEF">/ArcCore/Os/OsTask</DEFINITION-REF>\r
@@ -503,7 +518,7 @@
               <SHORT-NAME>Event1</SHORT-NAME>\r
               <ADMIN-DATA>\r
                 <SDGS>\r
-                  <SDG GID="Arccore::IdentifiableOptions"/>\r
+                  <SDG GID="Arccore::IdentifiableOptions" />\r
                 </SDGS>\r
               </ADMIN-DATA>\r
               <DEFINITION-REF DEST="PARAM-CONF-CONTAINER-DEF">/ArcCore/Os/OsEvent</DEFINITION-REF>\r
@@ -526,7 +541,7 @@
               <SHORT-NAME>Event2</SHORT-NAME>\r
               <ADMIN-DATA>\r
                 <SDGS>\r
-                  <SDG GID="Arccore::IdentifiableOptions"/>\r
+                  <SDG GID="Arccore::IdentifiableOptions" />\r
                 </SDGS>\r
               </ADMIN-DATA>\r
               <DEFINITION-REF DEST="PARAM-CONF-CONTAINER-DEF">/ArcCore/Os/OsEvent</DEFINITION-REF>\r
@@ -549,7 +564,7 @@
               <SHORT-NAME>OsApplication1</SHORT-NAME>\r
               <ADMIN-DATA>\r
                 <SDGS>\r
-                  <SDG GID="Arccore::IdentifiableOptions"/>\r
+                  <SDG GID="Arccore::IdentifiableOptions" />\r
                 </SDGS>\r
               </ADMIN-DATA>\r
               <DEFINITION-REF DEST="PARAM-CONF-CONTAINER-DEF">/ArcCore/Os/OsApplication</DEFINITION-REF>\r
@@ -610,4 +625,6 @@
         </MODULE-CONFIGURATION>\r
       </ELEMENTS>\r
     </AR-PACKAGE>\r
-  </TOP-LEVEL-PACKAGES></AUTOSAR>\r
+  </TOP-LEVEL-PACKAGES>\r
+</AUTOSAR>\r
+\r