Replace the function that returns the current run time counter value with a macro...

git-svn-id: https://svn.code.sf.net/p/freertos/code/trunk@1232 1d2547de-c912-0410-9cb9-b8ca96c0e9e2

diff --git a/Demo/Cortex_STM32L152_IAR/FreeRTOSConfig.h b/Demo/Cortex_STM32L152_IAR/FreeRTOSConfig.h
index a7d59f1ea4b3572d4f16dd7b9213beb709410d29..74acd46741f10e4340d6a9aa90d3247a8b5e1ecb 100644 (file)
--- a/Demo/Cortex_STM32L152_IAR/FreeRTOSConfig.h
+++ b/Demo/Cortex_STM32L152_IAR/FreeRTOSConfig.h
@@ -125,8 +125,12 @@ is included from an asm file. */
 #endif /* __ICCARM__ */\r
 \r
 #define portCONFIGURE_TIMER_FOR_RUN_TIME_STATS() vConfigureTimerForRunTimeStats()\r
-#define portGET_RUN_TIME_COUNTER_VALUE() ( ( ulTIM6_OverflowCount << 16UL ) | ( unsigned long ) TIM6->CNT )\r
-\r
+#define portALT_GET_RUN_TIME_COUNTER_VALUE( ulCountValue )                                                                     \\r
+       {                                                                                                                                                                               \\r
+               TIM_Cmd( TIM6, DISABLE );                                                                                                                       \\r
+               ulCountValue = ( ( ulTIM6_OverflowCount << 16UL ) | ( unsigned long ) TIM6->CNT );      \\r
+               TIM_Cmd( TIM6, ENABLE );                                                                                                                        \\r
+       }\r
 \r
 #endif /* FREERTOS_CONFIG_H */\r
 \r

diff --git a/Demo/Cortex_STM32L152_IAR/RTOSDemo.ewd b/Demo/Cortex_STM32L152_IAR/RTOSDemo.ewd
index cf5aac8e7e83625ac43a8a8346a153bec7eaed65..91555229d5c7ff7bafacf45e2e17a926bb9c9d58 100644 (file)
--- a/Demo/Cortex_STM32L152_IAR/RTOSDemo.ewd
+++ b/Demo/Cortex_STM32L152_IAR/RTOSDemo.ewd
@@ -845,14 +845,14 @@
     <toolchain>\r
       <name>ARM</name>\r
     </toolchain>\r
-    <debug>0</debug>\r
+    <debug>1</debug>\r
     <settings>\r
       <name>C-SPY</name>\r
       <archiveVersion>2</archiveVersion>\r
       <data>\r
         <version>22</version>\r
         <wantNonLocal>1</wantNonLocal>\r
-        <debug>0</debug>\r
+        <debug>1</debug>\r
         <option>\r
           <name>CInput</name>\r
           <state>1</state>\r
@@ -883,7 +883,7 @@
         </option>\r
         <option>\r
           <name>MemFile</name>\r
-          <state></state>\r
+          <state>$TOOLKIT_DIR$\CONFIG\debugger\ST\iostm32l152xx.ddf</state>\r
         </option>\r
         <option>\r
           <name>RunToEnable</name>\r
@@ -923,11 +923,11 @@
         </option>\r
         <option>\r
           <name>OCDynDriverList</name>\r
-          <state>ARMSIM_ID</state>\r
+          <state>JLINK_ID</state>\r
         </option>\r
         <option>\r
           <name>OCLastSavedByProductVersion</name>\r
-          <state></state>\r
+          <state>6.10.1.52170</state>\r
         </option>\r
         <option>\r
           <name>OCDownloadAttachToProgram</name>\r
@@ -935,7 +935,7 @@
         </option>\r
         <option>\r
           <name>UseFlashLoader</name>\r
-          <state>0</state>\r
+          <state>1</state>\r
         </option>\r
         <option>\r
           <name>CLowLevel</name>\r
@@ -955,7 +955,7 @@
         </option>\r
         <option>\r
           <name>FlashLoadersV3</name>\r
-          <state></state>\r
+          <state>$TOOLKIT_DIR$\config\flashloader\ST\FlashSTM32L15xxB.board</state>\r
         </option>\r
         <option>\r
           <name>OCImagesSuppressCheck1</name>\r
@@ -1017,7 +1017,7 @@
       <data>\r
         <version>1</version>\r
         <wantNonLocal>1</wantNonLocal>\r
-        <debug>0</debug>\r
+        <debug>1</debug>\r
         <option>\r
           <name>OCSimDriverInfo</name>\r
           <state>1</state>\r
@@ -1042,7 +1042,7 @@
       <data>\r
         <version>0</version>\r
         <wantNonLocal>1</wantNonLocal>\r
-        <debug>0</debug>\r
+        <debug>1</debug>\r
         <option>\r
           <name>CCAngelHeartbeat</name>\r
           <state>1</state>\r
@@ -1085,7 +1085,7 @@
       <data>\r
         <version>0</version>\r
         <wantNonLocal>1</wantNonLocal>\r
-        <debug>0</debug>\r
+        <debug>1</debug>\r
         <option>\r
           <name>OCDriverInfo</name>\r
           <state>1</state>\r
@@ -1122,7 +1122,7 @@
       <data>\r
         <version>1</version>\r
         <wantNonLocal>1</wantNonLocal>\r
-        <debug>0</debug>\r
+        <debug>1</debug>\r
         <option>\r
           <name>CRomLogFileCheck</name>\r
           <state>0</state>\r
@@ -1153,7 +1153,7 @@
       <data>\r
         <version>12</version>\r
         <wantNonLocal>1</wantNonLocal>\r
-        <debug>0</debug>\r
+        <debug>1</debug>\r
         <option>\r
           <name>JLinkSpeed</name>\r
           <state>32</state>\r
@@ -1253,7 +1253,7 @@
         </option>\r
         <option>\r
           <name>CCJLinkInterfaceRadio</name>\r
-          <state>0</state>\r
+          <state>1</state>\r
         </option>\r
         <option>\r
           <name>OCJLinkAttachSlave</name>\r
@@ -1262,7 +1262,7 @@
         <option>\r
           <name>CCJLinkResetList</name>\r
           <version>4</version>\r
-          <state>5</state>\r
+          <state>7</state>\r
         </option>\r
         <option>\r
           <name>CCJLinkInterfaceCmdLine</name>\r
@@ -1316,7 +1316,7 @@
       <data>\r
         <version>2</version>\r
         <wantNonLocal>1</wantNonLocal>\r
-        <debug>0</debug>\r
+        <debug>1</debug>\r
         <option>\r
           <name>OCDriverInfo</name>\r
           <state>1</state>\r
@@ -1349,7 +1349,7 @@
       <data>\r
         <version>3</version>\r
         <wantNonLocal>1</wantNonLocal>\r
-        <debug>0</debug>\r
+        <debug>1</debug>\r
         <option>\r
           <name>jtag</name>\r
           <version>0</version>\r
@@ -1438,7 +1438,7 @@
       <data>\r
         <version>0</version>\r
         <wantNonLocal>1</wantNonLocal>\r
-        <debug>0</debug>\r
+        <debug>1</debug>\r
         <option>\r
           <name>OCDriverInfo</name>\r
           <state>1</state>\r
@@ -1502,7 +1502,7 @@
       <data>\r
         <version>1</version>\r
         <wantNonLocal>1</wantNonLocal>\r
-        <debug>0</debug>\r
+        <debug>1</debug>\r
         <option>\r
           <name>CRDIDriverDll</name>\r
           <state>###Uninitialized###</state>\r
@@ -1563,7 +1563,7 @@
       <data>\r
         <version>1</version>\r
         <wantNonLocal>1</wantNonLocal>\r
-        <debug>0</debug>\r
+        <debug>1</debug>\r
         <option>\r
           <name>OCDriverInfo</name>\r
           <state>1</state>\r
@@ -1584,7 +1584,7 @@
       <data>\r
         <version>0</version>\r
         <wantNonLocal>1</wantNonLocal>\r
-        <debug>0</debug>\r
+        <debug>1</debug>\r
         <option>\r
           <name>CThirdPartyDriverDll</name>\r
           <state>###Uninitialized###</state>\r
@@ -1622,7 +1622,7 @@
       </plugin>\r
       <plugin>\r
         <file>$TOOLKIT_DIR$\plugins\rtos\OpenRTOS\OpenRTOSPlugin.ewplugin</file>\r
-        <loadFlag>0</loadFlag>\r
+        <loadFlag>1</loadFlag>\r
       </plugin>\r
       <plugin>\r
         <file>$TOOLKIT_DIR$\plugins\rtos\PowerPac\PowerPacRTOS.ewplugin</file>\r

diff --git a/Demo/Cortex_STM32L152_IAR/RTOSDemo.ewp b/Demo/Cortex_STM32L152_IAR/RTOSDemo.ewp
index bcf5088254823910aec5f8880d157cb686fbcdc6..78e645fbc402f1bd90208093e2c6d9bb885dd89d 100644 (file)
--- a/Demo/Cortex_STM32L152_IAR/RTOSDemo.ewp
+++ b/Demo/Cortex_STM32L152_IAR/RTOSDemo.ewp
@@ -48,11 +48,11 @@
         <option>\r
           <name>Output variant</name>\r
           <version>0</version>\r
-          <state>3</state>\r
+          <state>2</state>\r
         </option>\r
         <option>\r
           <name>Output description</name>\r
-          <state>No specifier a, A, no specifier n, no float nor long long, no flags.</state>\r
+          <state>No specifier a, A, no specifier n, no float nor long long.</state>\r
         </option>\r
         <option>\r
           <name>GOutputBinary</name>\r
@@ -873,14 +873,14 @@
     <toolchain>\r
       <name>ARM</name>\r
     </toolchain>\r
-    <debug>0</debug>\r
+    <debug>1</debug>\r
     <settings>\r
       <name>General</name>\r
       <archiveVersion>3</archiveVersion>\r
       <data>\r
         <version>18</version>\r
         <wantNonLocal>1</wantNonLocal>\r
-        <debug>0</debug>\r
+        <debug>1</debug>\r
         <option>\r
           <name>ExePath</name>\r
           <state>Release\Exe</state>\r
@@ -896,7 +896,7 @@
         <option>\r
           <name>Variant</name>\r
           <version>17</version>\r
-          <state>0</state>\r
+          <state>37</state>\r
         </option>\r
         <option>\r
           <name>GEndianMode</name>\r
@@ -905,20 +905,20 @@
         <option>\r
           <name>Input variant</name>\r
           <version>1</version>\r
-          <state>0</state>\r
+          <state>3</state>\r
         </option>\r
         <option>\r
           <name>Input description</name>\r
-          <state>Full formatting.</state>\r
+          <state>No specifier n, no float nor long long, no scan set, no assignment suppressing.</state>\r
         </option>\r
         <option>\r
           <name>Output variant</name>\r
           <version>0</version>\r
-          <state>0</state>\r
+          <state>2</state>\r
         </option>\r
         <option>\r
           <name>Output description</name>\r
-          <state>Full formatting.</state>\r
+          <state>No specifier a, A, no specifier n, no float nor long long.</state>\r
         </option>\r
         <option>\r
           <name>GOutputBinary</name>\r
@@ -931,7 +931,7 @@
         </option>\r
         <option>\r
           <name>OGCoreOrChip</name>\r
-          <state>0</state>\r
+          <state>1</state>\r
         </option>\r
         <option>\r
           <name>GRuntimeLibSelect</name>\r
@@ -953,7 +953,7 @@
         </option>\r
         <option>\r
           <name>OGLastSavedByProductVersion</name>\r
-          <state>5.10.0.159</state>\r
+          <state>6.10.1.52170</state>\r
         </option>\r
         <option>\r
           <name>GeneralEnableMisra</name>\r
@@ -965,23 +965,23 @@
         </option>\r
         <option>\r
           <name>OGChipSelectEditMenu</name>\r
-          <state>default       None</state>\r
+          <state>STM32L152xB   ST STM32L152xB</state>\r
         </option>\r
         <option>\r
           <name>GenLowLevelInterface</name>\r
-          <state>0</state>\r
+          <state>1</state>\r
         </option>\r
         <option>\r
           <name>GEndianModeBE</name>\r
-          <state>0</state>\r
+          <state>1</state>\r
         </option>\r
         <option>\r
           <name>OGBufferedTerminalOutput</name>\r
-          <state>0</state>\r
+          <state>1</state>\r
         </option>\r
         <option>\r
           <name>GenStdoutInterface</name>\r
-          <state>0</state>\r
+          <state>1</state>\r
         </option>\r
         <option>\r
           <name>GeneralMisraRules98</name>\r
@@ -1009,10 +1009,11 @@
       <data>\r
         <version>26</version>\r
         <wantNonLocal>1</wantNonLocal>\r
-        <debug>0</debug>\r
+        <debug>1</debug>\r
         <option>\r
           <name>CCDefines</name>\r
-          <state>NDEBUG</state>\r
+          <state>USE_STM32L152_EVAL</state>\r
+          <state>USE_STDPERIPH_DRIVER</state>\r
         </option>\r
         <option>\r
           <name>CCPreprocFile</name>\r
@@ -1052,7 +1053,7 @@
         </option>\r
         <option>\r
           <name>CCDiagSuppress</name>\r
-          <state></state>\r
+          <state>Pa082</state>\r
         </option>\r
         <option>\r
           <name>CCDiagRemark</name>\r
@@ -1077,7 +1078,7 @@
         </option>\r
         <option>\r
           <name>CCDebugInfo</name>\r
-          <state>0</state>\r
+          <state>1</state>\r
         </option>\r
         <option>\r
           <name>IEndianMode</name>\r
@@ -1141,7 +1142,15 @@
         </option>\r
         <option>\r
           <name>CCIncludePath2</name>\r
-          <state></state>\r
+          <state>$PROJ_DIR$\system_and_ST_code</state>\r
+          <state>$PROJ_DIR$\system_and_ST_code\CMSIS\CM3\DeviceSupport\ST\STM32L1xx</state>\r
+          <state>$PROJ_DIR$\system_and_ST_code\CMSIS\CM3\CoreSupport</state>\r
+          <state>$PROJ_DIR$\system_and_ST_code\STM32L1xx_StdPeriph_Driver\inc</state>\r
+          <state>$PROJ_DIR$\system_and_ST_code\STM32L152_EVAL</state>\r
+          <state>$PROJ_DIR$\..\Common\include</state>\r
+          <state>$PROJ_DIR$\..\..\Source\include</state>\r
+          <state>$PROJ_DIR$\..\..\Source\portable\IAR\ARM_CM3</state>\r
+          <state>$PROJ_DIR$</state>\r
         </option>\r
         <option>\r
           <name>CCStdIncCheck</name>\r
@@ -1153,7 +1162,7 @@
         </option>\r
         <option>\r
           <name>IInterwork2</name>\r
-          <state>1</state>\r
+          <state>0</state>\r
         </option>\r
         <option>\r
           <name>IProcessorMode2</name>\r
@@ -1238,7 +1247,7 @@
       <data>\r
         <version>8</version>\r
         <wantNonLocal>1</wantNonLocal>\r
-        <debug>0</debug>\r
+        <debug>1</debug>\r
         <option>\r
           <name>AObjPrefix</name>\r
           <state>1</state>\r
@@ -1278,7 +1287,7 @@
         </option>\r
         <option>\r
           <name>ADebug</name>\r
-          <state>0</state>\r
+          <state>1</state>\r
         </option>\r
         <option>\r
           <name>AltRegisterNames</name>\r
@@ -1382,7 +1391,8 @@
         </option>\r
         <option>\r
           <name>AUserIncludes</name>\r
-          <state></state>\r
+          <state>$PROJ_DIR$</state>\r
+          <state>$PROJ_DIR$\system_and_ST_code\CMSIS\CM3\DeviceSupport\ST\STM32L1xx</state>\r
         </option>\r
         <option>\r
           <name>AExtraOptionsCheckV2</name>\r
@@ -1400,7 +1410,7 @@
       <data>\r
         <version>1</version>\r
         <wantNonLocal>1</wantNonLocal>\r
-        <debug>0</debug>\r
+        <debug>1</debug>\r
         <option>\r
           <name>OOCOutputFormat</name>\r
           <version>2</version>\r
@@ -1451,7 +1461,7 @@
       <data>\r
         <version>11</version>\r
         <wantNonLocal>1</wantNonLocal>\r
-        <debug>0</debug>\r
+        <debug>1</debug>\r
         <option>\r
           <name>IlinkOutputFile</name>\r
           <state>c.out</state>\r
@@ -1526,11 +1536,11 @@
         </option>\r
         <option>\r
           <name>IlinkIcfOverride</name>\r
-          <state>0</state>\r
+          <state>1</state>\r
         </option>\r
         <option>\r
           <name>IlinkIcfFile</name>\r
-          <state>$TOOLKIT_DIR$\CONFIG\generic.icf</state>\r
+          <state>$PROJ_DIR$\system_and_ST_code\stm32l1xx_flash.icf</state>\r
         </option>\r
         <option>\r
           <name>IlinkIcfFileSlave</name>\r
@@ -1590,7 +1600,7 @@
         </option>\r
         <option>\r
           <name>IlinkProgramEntryLabel</name>\r
-          <state></state>\r
+          <state>__iar_program_start</state>\r
         </option>\r
         <option>\r
           <name>DoFill</name>\r
@@ -1685,7 +1695,7 @@
         </option>\r
         <option>\r
           <name>IlinkOptInline</name>\r
-          <state>1</state>\r
+          <state>0</state>\r
         </option>\r
         <option>\r
           <name>IlinkOptExceptionsAllow</name>\r
@@ -1703,7 +1713,7 @@
       <data>\r
         <version>0</version>\r
         <wantNonLocal>1</wantNonLocal>\r
-        <debug>0</debug>\r
+        <debug>1</debug>\r
         <option>\r
           <name>IarchiveInputs</name>\r
           <state></state>\r

diff --git a/Demo/Cortex_STM32L152_IAR/main.c b/Demo/Cortex_STM32L152_IAR/main.c
index 4457cd0823bcf7613a2732d9942ada6d2b46f403..694a8c3ac5980f75c5caf1e8367d64bdc04f923d 100644 (file)
--- a/Demo/Cortex_STM32L152_IAR/main.c
+++ b/Demo/Cortex_STM32L152_IAR/main.c
@@ -160,11 +160,15 @@ of the same message and indicate what the status actually is. */
 #define mainERROR_GEN_QUEUE_TEST               ( pdPASS + 3 )\r
 \r
 /* Baud rate used by the comtest tasks. */\r
-#define mainCOM_TEST_BAUD_RATE         ( 115200 )\r
+#define mainCOM_TEST_BAUD_RATE                 ( 115200 )\r
 \r
 /* The LED used by the comtest tasks. See the comtest.c file for more\r
 information. */\r
-#define mainCOM_TEST_LED                       ( 3 )\r
+#define mainCOM_TEST_LED                               ( 3 )\r
+\r
+/* The LCD task uses printf() so requires more stack than most of the other\r
+tasks. */\r
+#define mainLCD_TASK_STACK_SIZE                        ( configMINIMAL_STACK_SIZE * 2 )\r
 \r
 /*-----------------------------------------------------------*/\r
 \r
@@ -237,7 +241,7 @@ void main( void )
                \r
                /* Create the LCD and button poll tasks, as described at the top of this\r
                file. */\r
-               xTaskCreate( prvLCDTask, ( signed char * ) "LCD", configMINIMAL_STACK_SIZE, NULL, mainLCD_TASK_PRIORITY, NULL );\r
+               xTaskCreate( prvLCDTask, ( signed char * ) "LCD", mainLCD_TASK_STACK_SIZE, NULL, mainLCD_TASK_PRIORITY, NULL );\r
                xTaskCreate( prvButtonPollTask, ( signed char * ) "ButPoll", configMINIMAL_STACK_SIZE, NULL, tskIDLE_PRIORITY, NULL );\r
                \r
                /* Create a subset of the standard demo tasks. */\r

diff --git a/Demo/Cortex_STM32L152_IAR/settings/RTOSDemo.dbgdt b/Demo/Cortex_STM32L152_IAR/settings/RTOSDemo.dbgdt
index febe4e617bd8aadd2af110beda84779df9194d8b..8673d4a96fe6690bafd520151e98555e97dd244c 100644 (file)
--- a/Demo/Cortex_STM32L152_IAR/settings/RTOSDemo.dbgdt
+++ b/Demo/Cortex_STM32L152_IAR/settings/RTOSDemo.dbgdt
@@ -23,20 +23,20 @@
       </Workspace>\r
       <Disassembly>\r
         <PreferedWindows>\r
-          <Position>2</Position>\r
-          <ScreenPosX>0</ScreenPosX>\r
-          <ScreenPosY>0</ScreenPosY>\r
-          <Windows/>\r
-        </PreferedWindows>\r
-        <MixedMode>1</MixedMode>\r
-        <CodeCovShow>1</CodeCovShow>\r
-        <InstrProfShow>1</InstrProfShow>\r
-      </Disassembly>\r
+          \r
+          \r
+          \r
+          \r
+        <Position>2</Position><ScreenPosX>0</ScreenPosX><ScreenPosY>0</ScreenPosY><Windows/></PreferedWindows>\r
+        \r
+        \r
+        \r
+      <MixedMode>1</MixedMode><CodeCovShow>1</CodeCovShow><InstrProfShow>1</InstrProfShow></Disassembly>\r
     <Watch><Format><struct_types/><watch_formats><Fmt><Key>{W}Watch-0:tmppre</Key><Value>1</Value></Fmt></watch_formats></Format><PreferedWindows><Position>2</Position><ScreenPosX>0</ScreenPosX><ScreenPosY>0</ScreenPosY><Windows/></PreferedWindows><Column0>151</Column0><Column1>148</Column1><Column2>100</Column2><Column3>100</Column3></Watch><QuickWatch><PreferedWindows><Position>2</Position><ScreenPosX>0</ScreenPosX><ScreenPosY>0</ScreenPosY><Windows/></PreferedWindows><Column0>208</Column0><Column1>100</Column1><Column2>100</Column2><Column3>100</Column3></QuickWatch><TerminalIO><PreferedWindows><Position>2</Position><ScreenPosX>0</ScreenPosX><ScreenPosY>0</ScreenPosY><Windows/></PreferedWindows><InputSource>1</InputSource><InputMode>10</InputMode><Filename>$PROJ_DIR$\TermIOInput.txt</Filename><InputEcho>1</InputEcho><ShowReset>0</ShowReset></TerminalIO><TASKVIEW><Column0>200</Column0><Column1>100</Column1><Column2>100</Column2><Column3>100</Column3><Column4>100</Column4><Column5>100</Column5><Column6>100</Column6><Column7>150</Column7></TASKVIEW><QUEUEVIEW><Column0>300</Column0><Column1>100</Column1><Column2>100</Column2><Column3>100</Column3><Column4>100</Column4><Column5>100</Column5><Column6>100</Column6></QUEUEVIEW><Register><PreferedWindows><Position>2</Position><ScreenPosX>0</ScreenPosX><ScreenPosY>0</ScreenPosY><Windows/></PreferedWindows></Register><CallStack><PreferedWindows><Position>1</Position><ScreenPosX>0</ScreenPosX><ScreenPosY>0</ScreenPosY><Windows/></PreferedWindows><ViewArgs>1</ViewArgs></CallStack></Static>\r
     <Windows>\r
       \r
       \r
-    <Wnd4>\r
+    <Wnd0>\r
         <Tabs>\r
           <Tab>\r
             <Identity>TabID-15530-21362</Identity>\r
@@ -48,20 +48,20 @@
           </Tab>\r
         </Tabs>\r
         \r
-      <SelectedTab>0</SelectedTab></Wnd4><Wnd5><Tabs><Tab><Identity>TabID-10464-23570</Identity><TabName>Tasks</TabName><Factory>TASKVIEW</Factory><Session/></Tab></Tabs><SelectedTab>0</SelectedTab></Wnd5><Wnd6><Tabs><Tab><Identity>TabID-31438-23586</Identity><TabName>Queues</TabName><Factory>QUEUEVIEW</Factory><Session/></Tab></Tabs><SelectedTab>0</SelectedTab></Wnd6><Wnd7><Tabs><Tab><Identity>TabID-15541-875</Identity><TabName>Terminal I/O</TabName><Factory>TerminalIO</Factory><Session/></Tab></Tabs><SelectedTab>0</SelectedTab></Wnd7></Windows>\r
+      <SelectedTab>0</SelectedTab></Wnd0><Wnd1><Tabs><Tab><Identity>TabID-10464-23570</Identity><TabName>Tasks</TabName><Factory>TASKVIEW</Factory><Session/></Tab></Tabs><SelectedTab>0</SelectedTab></Wnd1><Wnd2><Tabs><Tab><Identity>TabID-31438-23586</Identity><TabName>Queues</TabName><Factory>QUEUEVIEW</Factory><Session/></Tab></Tabs><SelectedTab>0</SelectedTab></Wnd2><Wnd3><Tabs><Tab><Identity>TabID-15541-875</Identity><TabName>Terminal I/O</TabName><Factory>TerminalIO</Factory><Session/></Tab></Tabs><SelectedTab>0</SelectedTab></Wnd3></Windows>\r
     <Editor>\r
       \r
       \r
       \r
       \r
-    <Pane><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\main.c</Filename><XPos>0</XPos><YPos>208</YPos><SelStart>10723</SelStart><SelEnd>10723</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\..\..\Source\portable\IAR\ARM_CM3\port.c</Filename><XPos>0</XPos><YPos>161</YPos><SelStart>6971</SelStart><SelEnd>6971</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\..\..\Source\queue.c</Filename><XPos>0</XPos><YPos>1075</YPos><SelStart>36766</SelStart><SelEnd>36766</SelEnd></Tab><ActiveTab>2</ActiveTab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\..\Common\Minimal\dynamic.c</Filename><XPos>0</XPos><YPos>359</YPos><SelStart>14991</SelStart><SelEnd>14991</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\FreeRTOSConfig.h</Filename><XPos>0</XPos><YPos>99</YPos><SelStart>5506</SelStart><SelEnd>5506</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\serial.c</Filename><XPos>0</XPos><YPos>191</YPos><SelStart>8005</SelStart><SelEnd>8022</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\..\Common\Minimal\comtest.c</Filename><XPos>0</XPos><YPos>150</YPos><SelStart>7894</SelStart><SelEnd>7903</SelEnd></Tab></Pane><ActivePane>0</ActivePane><Sizes><Pane><X>1000000</X><Y>1000000</Y></Pane></Sizes><SplitMode>1</SplitMode></Editor>\r
+    <Pane><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\main.c</Filename><XPos>0</XPos><YPos>210</YPos><SelStart>10728</SelStart><SelEnd>10728</SelEnd></Tab><ActiveTab>0</ActiveTab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\FreeRTOSConfig.h</Filename><XPos>0</XPos><YPos>91</YPos><SelStart>6131</SelStart><SelEnd>6131</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\..\..\Source\portable\IAR\ARM_CM3\portasm.s</Filename><XPos>0</XPos><YPos>93</YPos><SelStart>4554</SelStart><SelEnd>4554</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\system_and_ST_code\STM32L1xx_StdPeriph_Driver\src\stm32l1xx_tim.c</Filename><XPos>0</XPos><YPos>573</YPos><SelStart>19077</SelStart><SelEnd>19077</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\..\..\Source\portable\IAR\ARM_CM3\port.c</Filename><XPos>0</XPos><YPos>160</YPos><SelStart>7094</SelStart><SelEnd>7094</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\..\..\Source\list.c</Filename><XPos>0</XPos><YPos>138</YPos><SelStart>7213</SelStart><SelEnd>7213</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\..\..\Source\queue.c</Filename><XPos>0</XPos><YPos>876</YPos><SelStart>31513</SelStart><SelEnd>31513</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\system_and_ST_code\system_stm32l1xx.c</Filename><XPos>0</XPos><YPos>0</YPos><SelStart>1159</SelStart><SelEnd>1159</SelEnd></Tab></Pane><ActivePane>0</ActivePane><Sizes><Pane><X>1000000</X><Y>1000000</Y></Pane></Sizes><SplitMode>1</SplitMode></Editor>\r
     <Positions>\r
       \r
       \r
       \r
       \r
       \r
-    <Top><Row0><Sizes><Toolbar-012aac88><key>iaridepm.enu1</key></Toolbar-012aac88><Toolbar-01336450><key>debuggergui.enu1</key></Toolbar-01336450></Sizes></Row0><Row1><Sizes><Toolbar-013606b0><key>armjlink.enu1</key></Toolbar-013606b0></Sizes></Row1></Top><Left><Row0><Sizes><Wnd4><Rect><Top>-2</Top><Left>-2</Left><Bottom>659</Bottom><Right>406</Right><x>-2</x><y>-2</y><xscreen>200</xscreen><yscreen>200</yscreen><sizeHorzCX>119048</sizeHorzCX><sizeHorzCY>203666</sizeHorzCY><sizeVertCX>242857</sizeVertCX><sizeVertCY>673116</sizeVertCY></Rect></Wnd4></Sizes></Row0></Left><Right><Row0><Sizes><Wnd7><Rect><Top>-2</Top><Left>-2</Left><Bottom>659</Bottom><Right>334</Right><x>-2</x><y>-2</y><xscreen>200</xscreen><yscreen>200</yscreen><sizeHorzCX>119048</sizeHorzCX><sizeHorzCY>203666</sizeHorzCY><sizeVertCX>200000</sizeVertCX><sizeVertCY>673116</sizeVertCY></Rect></Wnd7></Sizes></Row0></Right><Bottom><Row0><Sizes><Wnd5><Rect><Top>-2</Top><Left>-2</Left><Bottom>172</Bottom><Right>1682</Right><x>-2</x><y>-2</y><xscreen>1684</xscreen><yscreen>174</yscreen><sizeHorzCX>1002381</sizeHorzCX><sizeHorzCY>177189</sizeHorzCY><sizeVertCX>119048</sizeVertCX><sizeVertCY>203666</sizeVertCY></Rect></Wnd5></Sizes></Row0><Row1><Sizes><Wnd6><Rect><Top>170</Top><Left>-2</Left><Bottom>255</Bottom><Right>1682</Right><x>-2</x><y>170</y><xscreen>1684</xscreen><yscreen>85</yscreen><sizeHorzCX>1002381</sizeHorzCX><sizeHorzCY>86558</sizeHorzCY><sizeVertCX>119048</sizeVertCX><sizeVertCY>203666</sizeVertCY></Rect></Wnd6></Sizes></Row1></Bottom><Float><Sizes/></Float></Positions>\r
+    <Top><Row0><Sizes><Toolbar-012aad60><key>iaridepm.enu1</key></Toolbar-012aad60><Toolbar-09867f10><key>debuggergui.enu1</key></Toolbar-09867f10></Sizes></Row0><Row1><Sizes><Toolbar-0e7ec040><key>armjlink.enu1</key></Toolbar-0e7ec040></Sizes></Row1></Top><Left><Row0><Sizes><Wnd0><Rect><Top>-2</Top><Left>-2</Left><Bottom>659</Bottom><Right>406</Right><x>-2</x><y>-2</y><xscreen>200</xscreen><yscreen>200</yscreen><sizeHorzCX>119048</sizeHorzCX><sizeHorzCY>203666</sizeHorzCY><sizeVertCX>242857</sizeVertCX><sizeVertCY>673116</sizeVertCY></Rect></Wnd0></Sizes></Row0></Left><Right><Row0><Sizes><Wnd3><Rect><Top>-2</Top><Left>-2</Left><Bottom>659</Bottom><Right>436</Right><x>-2</x><y>-2</y><xscreen>200</xscreen><yscreen>200</yscreen><sizeHorzCX>119048</sizeHorzCX><sizeHorzCY>203666</sizeHorzCY><sizeVertCX>260714</sizeVertCX><sizeVertCY>673116</sizeVertCY></Rect></Wnd3></Sizes></Row0></Right><Bottom><Row0><Sizes><Wnd1><Rect><Top>-2</Top><Left>-2</Left><Bottom>172</Bottom><Right>1682</Right><x>-2</x><y>-2</y><xscreen>1684</xscreen><yscreen>174</yscreen><sizeHorzCX>1002381</sizeHorzCX><sizeHorzCY>177189</sizeHorzCY><sizeVertCX>119048</sizeVertCX><sizeVertCY>203666</sizeVertCY></Rect></Wnd1></Sizes></Row0><Row1><Sizes><Wnd2><Rect><Top>170</Top><Left>-2</Left><Bottom>255</Bottom><Right>1682</Right><x>-2</x><y>170</y><xscreen>1684</xscreen><yscreen>85</yscreen><sizeHorzCX>1002381</sizeHorzCX><sizeHorzCY>86558</sizeHorzCY><sizeVertCX>119048</sizeVertCX><sizeVertCY>203666</sizeVertCY></Rect></Wnd2></Sizes></Row1></Bottom><Float><Sizes/></Float></Positions>\r
   </Desktop>\r
 </Project>\r
 \r

diff --git a/Demo/Cortex_STM32L152_IAR/settings/RTOSDemo.dni b/Demo/Cortex_STM32L152_IAR/settings/RTOSDemo.dni
index f9ea5cda83d4f0552c2ef866eaa398fd44982758..c8f7bd1d51af0edddabba43b292f76533b860335 100644 (file)
--- a/Demo/Cortex_STM32L152_IAR/settings/RTOSDemo.dni
+++ b/Demo/Cortex_STM32L152_IAR/settings/RTOSDemo.dni
@@ -1,5 +1,5 @@
 [DebugChecksum]\r
-Checksum=1889325515\r
+Checksum=-11340307\r
 [DisAssemblyWindow]\r
 NumStates=_ 1\r
 State 1=_ 1\r
@@ -22,18 +22,6 @@ UseTrigger=1
 TriggerName=main\r
 LimitSize=0\r
 ByteLimit=50\r
-[Interrupts]\r
-Enabled=1\r
-[MemoryMap]\r
-Enabled=0\r
-Base=0\r
-UseAuto=0\r
-TypeViolation=1\r
-UnspecRange=1\r
-ActionState=1\r
-[TraceHelper]\r
-Enabled=0\r
-ShowSource=1\r
 [SWOTraceHWSettings]\r
 CpuClock=32000000\r
 ClockAutoDetect=1\r
@@ -50,6 +38,18 @@ ITMportsEnable=1
 ITMportsTermIO=1\r
 ITMportsLogFile=0\r
 ITMlogFile=$PROJ_DIR$\ITM.log\r
+[Interrupts]\r
+Enabled=1\r
+[MemoryMap]\r
+Enabled=0\r
+Base=0\r
+UseAuto=0\r
+TypeViolation=1\r
+UnspecRange=1\r
+ActionState=1\r
+[TraceHelper]\r
+Enabled=0\r
+ShowSource=1\r
 [DataLog]\r
 LogEnabled=0\r
 SumEnabled=0\r

diff --git a/Demo/Cortex_STM32L152_IAR/settings/RTOSDemo.wsdt b/Demo/Cortex_STM32L152_IAR/settings/RTOSDemo.wsdt
index f0f8a66c3556f9cbfa85f10c14b607d8649f50bd..ce5738c55d007a7076f0a1c7fec6abfb9d91d078 100644 (file)
--- a/Demo/Cortex_STM32L152_IAR/settings/RTOSDemo.wsdt
+++ b/Demo/Cortex_STM32L152_IAR/settings/RTOSDemo.wsdt
@@ -35,14 +35,14 @@
       \r
       \r
       \r
-    <Pane><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\main.c</Filename><XPos>0</XPos><YPos>45</YPos><SelStart>3100</SelStart><SelEnd>3100</SelEnd></Tab><ActiveTab>0</ActiveTab></Pane><ActivePane>0</ActivePane><Sizes><Pane><X>1000000</X><Y>1000000</Y></Pane></Sizes><SplitMode>1</SplitMode></Editor>\r
+    <Pane><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\main.c</Filename><XPos>0</XPos><YPos>219</YPos><SelStart>10728</SelStart><SelEnd>10728</SelEnd></Tab><ActiveTab>0</ActiveTab></Pane><ActivePane>0</ActivePane><Sizes><Pane><X>1000000</X><Y>1000000</Y></Pane></Sizes><SplitMode>1</SplitMode></Editor>\r
     <Positions>\r
       \r
       \r
       \r
       \r
       \r
-    <Top><Row0><Sizes><Toolbar-012aac88><key>iaridepm.enu1</key></Toolbar-012aac88></Sizes></Row0><Row1><Sizes/></Row1></Top><Left><Row0><Sizes><Wnd0><Rect><Top>-2</Top><Left>-2</Left><Bottom>740</Bottom><Right>438</Right><x>-2</x><y>-2</y><xscreen>200</xscreen><yscreen>200</yscreen><sizeHorzCX>119048</sizeHorzCX><sizeHorzCY>203666</sizeHorzCY><sizeVertCX>261905</sizeVertCX><sizeVertCY>755601</sizeVertCY></Rect></Wnd0></Sizes></Row0></Left><Right><Row0><Sizes/></Row0></Right><Bottom><Row0><Sizes><Wnd1><Rect><Top>-2</Top><Left>-2</Left><Bottom>198</Bottom><Right>1682</Right><x>-2</x><y>-2</y><xscreen>1684</xscreen><yscreen>200</yscreen><sizeHorzCX>1002381</sizeHorzCX><sizeHorzCY>203666</sizeHorzCY><sizeVertCX>119048</sizeVertCX><sizeVertCY>203666</sizeVertCY></Rect></Wnd1></Sizes></Row0></Bottom><Float><Sizes/></Float></Positions>\r
+    <Top><Row0><Sizes><Toolbar-012aad60><key>iaridepm.enu1</key></Toolbar-012aad60></Sizes></Row0></Top><Left><Row0><Sizes><Wnd0><Rect><Top>-2</Top><Left>-2</Left><Bottom>740</Bottom><Right>438</Right><x>-2</x><y>-2</y><xscreen>200</xscreen><yscreen>200</yscreen><sizeHorzCX>119048</sizeHorzCX><sizeHorzCY>203666</sizeHorzCY><sizeVertCX>261905</sizeVertCX><sizeVertCY>755601</sizeVertCY></Rect></Wnd0></Sizes></Row0></Left><Right><Row0><Sizes/></Row0></Right><Bottom><Row0><Sizes><Wnd1><Rect><Top>-2</Top><Left>-2</Left><Bottom>198</Bottom><Right>1682</Right><x>-2</x><y>-2</y><xscreen>1684</xscreen><yscreen>200</yscreen><sizeHorzCX>1002381</sizeHorzCX><sizeHorzCY>203666</sizeHorzCY><sizeVertCX>119048</sizeVertCX><sizeVertCY>203666</sizeVertCY></Rect></Wnd1></Sizes></Row0></Bottom><Float><Sizes/></Float></Positions>\r
   </Desktop>\r
 </Workspace>\r
 \r