Add link to dual core blog post into STM32H745I demo.

author rtel <rtel@1d2547de-c912-0410-9cb9-b8ca96c0e9e2>

Thu, 4 Jul 2019 21:18:36 +0000 (21:18 +0000)

committer rtel <rtel@1d2547de-c912-0410-9cb9-b8ca96c0e9e2>

Thu, 4 Jul 2019 21:18:36 +0000 (21:18 +0000)
author rtel <rtel@1d2547de-c912-0410-9cb9-b8ca96c0e9e2>
Thu, 4 Jul 2019 21:18:36 +0000 (21:18 +0000)
committer rtel <rtel@1d2547de-c912-0410-9cb9-b8ca96c0e9e2>
Thu, 4 Jul 2019 21:18:36 +0000 (21:18 +0000)
diff --git a/FreeRTOS/Demo/CORTEX_M7_M4_AMP_STM32H745I_Discovery_IAR/CM4/main.c b/FreeRTOS/Demo/CORTEX_M7_M4_AMP_STM32H745I_Discovery_IAR/CM4/main.c

index f4fa946faea78ee30f828fac396379bb25fdbbc2..7d2f9b08b816b02fe03ee7f04d747b5b90e88a2b 100644 (file)
--- a/FreeRTOS/Demo/CORTEX_M7_M4_AMP_STM32H745I_Discovery_IAR/CM4/main.c
+++ b/FreeRTOS/Demo/CORTEX_M7_M4_AMP_STM32H745I_Discovery_IAR/CM4/main.c
@@ -27,7 +27,8 @@
  \r
  /*\r
   * See https://www.freertos.org/STM32H7_Dual_Core_AMP_RTOS_demo.html for usage\r
- * instructions (TBD, not available at the time of writing).\r
+ * instructions, and the following blog post for a more detailed explanation\r
+ * https://www.freertos.org/articles/001_simple_freertos_core_to_core_communication/simple_freertos_core_to_core_communication_AMP.html\r
   *\r
   * Behavior\r
   * --------\r
@@ -382,7 +383,7 @@ BaseType_t xHigherPriorityTaskWoken = pdFALSE;
         }\r
  \r
         /* Normal FreeRTOS "yield from interrupt" semantics, where\r
-       xHigherPriorityTaskWoken is initialzed to pdFALSE and will then get set to\r
+       xHigherPriorityTaskWoken is initialised to pdFALSE and will then get set to\r
         pdTRUE if the interrupt unblocks a task that has a priority above that of\r
         the currently executing task. */\r
         portYIELD_FROM_ISR( xHigherPriorityTaskWoken );\r
diff --git a/FreeRTOS/Demo/CORTEX_M7_M4_AMP_STM32H745I_Discovery_IAR/CM7/main.c b/FreeRTOS/Demo/CORTEX_M7_M4_AMP_STM32H745I_Discovery_IAR/CM7/main.c

index fec88599ccf0c4f6655fafb0436b51ae44cf6d17..100bd326775a6d7e22f6f4650fa04b6f14a1e1a0 100644 (file)
--- a/FreeRTOS/Demo/CORTEX_M7_M4_AMP_STM32H745I_Discovery_IAR/CM7/main.c
+++ b/FreeRTOS/Demo/CORTEX_M7_M4_AMP_STM32H745I_Discovery_IAR/CM7/main.c
@@ -27,7 +27,8 @@
  \r
  /*\r
   * See https://www.freertos.org/STM32H7_Dual_Core_AMP_RTOS_demo.html for usage\r
- * instructions (TBD, not available at the time of writing).\r
+ * instructions, and the following blog post for a more detailed explanation\r
+ * https://www.freertos.org/articles/001_simple_freertos_core_to_core_communication/simple_freertos_core_to_core_communication_AMP.html\r
   *\r
   * Behavior\r
   * --------\r
@@ -287,9 +288,7 @@ MessageBufferHandle_t xUpdatedBuffer = ( MessageBufferHandle_t ) xUpdatedMessage
         {\r
                 while( xMessageBufferSend( xControlMessageBuffer, &xUpdatedBuffer, sizeof( xUpdatedBuffer ), mbaDONT_BLOCK ) != sizeof( xUpdatedBuffer ) )\r
                 {\r
-                       /* Nothing to do here.  Note it is very bad to loop in an interrupt\r
-                       service routine.  If a loop is really required then defer the\r
-                       routine to a task. */\r
+                       /* Nothing to do here. */\r
                 }\r
  \r
                 /* Generate interrupt in the M4 core. */\r
diff --git a/FreeRTOS/Demo/CORTEX_M7_M4_AMP_STM32H745I_Discovery_IAR/Project.ewd b/FreeRTOS/Demo/CORTEX_M7_M4_AMP_STM32H745I_Discovery_IAR/Project.ewd

index 7daf2359aec155e9bee94a813b81abf526e913e6..4db40280f0d1093c88f366fc868615ed0539e653 100644 (file)
--- a/FreeRTOS/Demo/CORTEX_M7_M4_AMP_STM32H745I_Discovery_IAR/Project.ewd
+++ b/FreeRTOS/Demo/CORTEX_M7_M4_AMP_STM32H745I_Discovery_IAR/Project.ewd
@@ -11,7 +11,7 @@
              <name>C-SPY</name>\r
              <archiveVersion>2</archiveVersion>\r
              <data>\r
-                <version>30</version>\r
+                <version>31</version>\r
                  <wantNonLocal>1</wantNonLocal>\r
                  <debug>1</debug>\r
                  <option>\r
@@ -44,7 +44,7 @@
                  </option>\r
                  <option>\r
                      <name>MemFile</name>\r
-                    <state>$TOOLKIT_DIR$\CONFIG\debugger\ST\STM32H7x5_CM7.ddf</state>\r
+                    <state>$TOOLKIT_DIR$\CONFIG\debugger\ST\STM32H745XI_CM7.ddf</state>\r
                  </option>\r
                  <option>\r
                      <name>RunToEnable</name>\r
@@ -84,11 +84,11 @@
                  </option>\r
                  <option>\r
                      <name>OCDynDriverList</name>\r
-                    <state>IJET_ID</state>\r
+                    <state>STLINK_ID</state>\r
                  </option>\r
                  <option>\r
                      <name>OCLastSavedByProductVersion</name>\r
-                    <state>8.32.1.18618</state>\r
+                    <state>8.40.1.21529</state>\r
                  </option>\r
                  <option>\r
                      <name>UseFlashLoader</name>\r
@@ -112,7 +112,7 @@
                  </option>\r
                  <option>\r
                      <name>FlashLoadersV3</name>\r
-                    <state>$TOOLKIT_DIR$\config\flashloader\ST\FlashSTM32H7xxx_CM7.board</state>\r
+                    <state>$TOOLKIT_DIR$\config\flashloader\ST\FlashSTM32H7xxxI.board</state>\r
                  </option>\r
                  <option>\r
                      <name>OCImagesSuppressCheck1</name>\r
@@ -182,14 +182,6 @@
                      <name>OCMulticoreNrOfCores</name>\r
                      <state>1</state>\r
                  </option>\r
-                <option>\r
-                    <name>OCMulticoreMaster</name>\r
-                    <state>0</state>\r
-                </option>\r
-                <option>\r
-                    <name>OCMulticorePort</name>\r
-                    <state>53461</state>\r
-                </option>\r
                  <option>\r
                      <name>OCMulticoreWorkspace</name>\r
                      <state>C:\Users\ribarry\Dev\FreeRTOS\Trial\Active\STM32H7_dual_core\WorkingCopy\Demo\CORTEX_M7_M4_STM32H745I_Discovery_IAR\Project.eww</state>\r
@@ -218,6 +210,14 @@
                      <name>OCMulticoreNrOfCoresSlave</name>\r
                      <state>1</state>\r
                  </option>\r
+                <option>\r
+                    <name>OCMulticoreAMPConfigType</name>\r
+                    <state>0</state>\r
+                </option>\r
+                <option>\r
+                    <name>OCMulticoreSessionFile</name>\r
+                    <state></state>\r
+                </option>\r
              </data>\r
          </settings>\r
          <settings>\r
@@ -1432,6 +1432,10 @@
                  <file>$TOOLKIT_DIR$\plugins\rtos\OpenRTOS\OpenRTOSPlugin.ewplugin</file>\r
                  <loadFlag>0</loadFlag>\r
              </plugin>\r
+            <plugin>\r
+                <file>$TOOLKIT_DIR$\plugins\rtos\RemedyRtosViewer\RemedyRtosViewer.ewplugin</file>\r
+                <loadFlag>0</loadFlag>\r
+            </plugin>\r
              <plugin>\r
                  <file>$TOOLKIT_DIR$\plugins\rtos\SafeRTOS\SafeRTOSPlugin.ewplugin</file>\r
                  <loadFlag>0</loadFlag>\r
@@ -1464,10 +1468,6 @@
                  <file>$TOOLKIT_DIR$\plugins\rtos\uCOS-III\uCOS-III-KA-CSpy.ewplugin</file>\r
                  <loadFlag>0</loadFlag>\r
              </plugin>\r
-            <plugin>\r
-                <file>$EW_DIR$\common\plugins\CodeCoverage\CodeCoverage.ENU.ewplugin</file>\r
-                <loadFlag>1</loadFlag>\r
-            </plugin>\r
              <plugin>\r
                  <file>$EW_DIR$\common\plugins\Orti\Orti.ENU.ewplugin</file>\r
                  <loadFlag>0</loadFlag>\r
@@ -1492,7 +1492,7 @@
              <name>C-SPY</name>\r
              <archiveVersion>2</archiveVersion>\r
              <data>\r
-                <version>30</version>\r
+                <version>31</version>\r
                  <wantNonLocal>1</wantNonLocal>\r
                  <debug>1</debug>\r
                  <option>\r
@@ -1525,7 +1525,7 @@
                  </option>\r
                  <option>\r
                      <name>MemFile</name>\r
-                    <state>$TOOLKIT_DIR$\CONFIG\debugger\ST\STM32H7x5_CM4.ddf</state>\r
+                    <state>$TOOLKIT_DIR$\CONFIG\debugger\ST\STM32H745XI_CM4.ddf</state>\r
                  </option>\r
                  <option>\r
                      <name>RunToEnable</name>\r
@@ -1565,11 +1565,11 @@
                  </option>\r
                  <option>\r
                      <name>OCDynDriverList</name>\r
-                    <state>IJET_ID</state>\r
+                    <state>STLINK_ID</state>\r
                  </option>\r
                  <option>\r
                      <name>OCLastSavedByProductVersion</name>\r
-                    <state>8.32.1.18618</state>\r
+                    <state>8.40.1.21529</state>\r
                  </option>\r
                  <option>\r
                      <name>UseFlashLoader</name>\r
@@ -1593,7 +1593,7 @@
                  </option>\r
                  <option>\r
                      <name>FlashLoadersV3</name>\r
-                    <state>$TOOLKIT_DIR$\config\flashloader\ST\FlashSTM32H7xxx_CM4.board</state>\r
+                    <state>$TOOLKIT_DIR$\config\flashloader\ST\FlashSTM32H7xxxI.board</state>\r
                  </option>\r
                  <option>\r
                      <name>OCImagesSuppressCheck1</name>\r
@@ -1663,14 +1663,6 @@
                      <name>OCMulticoreNrOfCores</name>\r
                      <state>1</state>\r
                  </option>\r
-                <option>\r
-                    <name>OCMulticoreMaster</name>\r
-                    <state>0</state>\r
-                </option>\r
-                <option>\r
-                    <name>OCMulticorePort</name>\r
-                    <state>53461</state>\r
-                </option>\r
                  <option>\r
                      <name>OCMulticoreWorkspace</name>\r
                      <state></state>\r
@@ -1699,6 +1691,14 @@
                      <name>OCMulticoreNrOfCoresSlave</name>\r
                      <state>1</state>\r
                  </option>\r
+                <option>\r
+                    <name>OCMulticoreAMPConfigType</name>\r
+                    <state>0</state>\r
+                </option>\r
+                <option>\r
+                    <name>OCMulticoreSessionFile</name>\r
+                    <state></state>\r
+                </option>\r
              </data>\r
          </settings>\r
          <settings>\r
@@ -2913,6 +2913,10 @@
                  <file>$TOOLKIT_DIR$\plugins\rtos\OpenRTOS\OpenRTOSPlugin.ewplugin</file>\r
                  <loadFlag>0</loadFlag>\r
              </plugin>\r
+            <plugin>\r
+                <file>$TOOLKIT_DIR$\plugins\rtos\RemedyRtosViewer\RemedyRtosViewer.ewplugin</file>\r
+                <loadFlag>0</loadFlag>\r
+            </plugin>\r
              <plugin>\r
                  <file>$TOOLKIT_DIR$\plugins\rtos\SafeRTOS\SafeRTOSPlugin.ewplugin</file>\r
                  <loadFlag>0</loadFlag>\r
@@ -2945,10 +2949,6 @@
                  <file>$TOOLKIT_DIR$\plugins\rtos\uCOS-III\uCOS-III-KA-CSpy.ewplugin</file>\r
                  <loadFlag>0</loadFlag>\r
              </plugin>\r
-            <plugin>\r
-                <file>$EW_DIR$\common\plugins\CodeCoverage\CodeCoverage.ENU.ewplugin</file>\r
-                <loadFlag>1</loadFlag>\r
-            </plugin>\r
              <plugin>\r
                  <file>$EW_DIR$\common\plugins\Orti\Orti.ENU.ewplugin</file>\r
                  <loadFlag>0</loadFlag>\r
diff --git a/FreeRTOS/Demo/CORTEX_M7_M4_AMP_STM32H745I_Discovery_IAR/settings/Project.STM32H745I_Discovery_CM4.cspy.bat b/FreeRTOS/Demo/CORTEX_M7_M4_AMP_STM32H745I_Discovery_IAR/settings/Project.STM32H745I_Discovery_CM4.cspy.bat

index d4bf16238b865f404d0007c3fa596d405bffe546..04f89d9b520cbfc70a74aff004f655caf0db2f20 100644 (file)
--- a/FreeRTOS/Demo/CORTEX_M7_M4_AMP_STM32H745I_Discovery_IAR/settings/Project.STM32H745I_Discovery_CM4.cspy.bat
+++ b/FreeRTOS/Demo/CORTEX_M7_M4_AMP_STM32H745I_Discovery_IAR/settings/Project.STM32H745I_Discovery_CM4.cspy.bat
@@ -25,7 +25,7 @@ if not "%~1" == "" goto debugFile
  \r
  @echo on \r
  \r
-"C:\devtools\IAR Systems\Embedded Workbench 8.2\common\bin\cspybat" -f "C:\Users\ribarry\Dev\FreeRTOS\Trial\Active\STM32H7_dual_core\WorkingCopy\Demo\CORTEX_M7_M4_STM32H745I_Discovery_IAR\settings\Project.STM32H745I_Discovery_CM4.general.xcl" --backend -f "C:\Users\ribarry\Dev\FreeRTOS\Trial\Active\STM32H7_dual_core\WorkingCopy\Demo\CORTEX_M7_M4_STM32H745I_Discovery_IAR\settings\Project.STM32H745I_Discovery_CM4.driver.xcl" \r
+"C:\devtools\IAR Systems\Embedded Workbench 8.3\common\bin\cspybat" -f "C:\Users\ribarry\Dev\FreeRTOS\WorkingCopy\FreeRTOS\Demo\CORTEX_M7_M4_AMP_STM32H745I_Discovery_IAR\settings\Project.STM32H745I_Discovery_CM4.general.xcl" --backend -f "C:\Users\ribarry\Dev\FreeRTOS\WorkingCopy\FreeRTOS\Demo\CORTEX_M7_M4_AMP_STM32H745I_Discovery_IAR\settings\Project.STM32H745I_Discovery_CM4.driver.xcl" \r
  \r
  @echo off \r
  goto end \r
@@ -34,7 +34,7 @@ goto end
  \r
  @echo on \r
  \r
-"C:\devtools\IAR Systems\Embedded Workbench 8.2\common\bin\cspybat" -f "C:\Users\ribarry\Dev\FreeRTOS\Trial\Active\STM32H7_dual_core\WorkingCopy\Demo\CORTEX_M7_M4_STM32H745I_Discovery_IAR\settings\Project.STM32H745I_Discovery_CM4.general.xcl" "--debug_file=%~1" --backend -f "C:\Users\ribarry\Dev\FreeRTOS\Trial\Active\STM32H7_dual_core\WorkingCopy\Demo\CORTEX_M7_M4_STM32H745I_Discovery_IAR\settings\Project.STM32H745I_Discovery_CM4.driver.xcl" \r
+"C:\devtools\IAR Systems\Embedded Workbench 8.3\common\bin\cspybat" -f "C:\Users\ribarry\Dev\FreeRTOS\WorkingCopy\FreeRTOS\Demo\CORTEX_M7_M4_AMP_STM32H745I_Discovery_IAR\settings\Project.STM32H745I_Discovery_CM4.general.xcl" "--debug_file=%~1" --backend -f "C:\Users\ribarry\Dev\FreeRTOS\WorkingCopy\FreeRTOS\Demo\CORTEX_M7_M4_AMP_STM32H745I_Discovery_IAR\settings\Project.STM32H745I_Discovery_CM4.driver.xcl" \r
  \r
  @echo off \r
  :end
 \ No newline at end of file
diff --git a/FreeRTOS/Demo/CORTEX_M7_M4_AMP_STM32H745I_Discovery_IAR/settings/Project.STM32H745I_Discovery_CM4.cspy.ps1 b/FreeRTOS/Demo/CORTEX_M7_M4_AMP_STM32H745I_Discovery_IAR/settings/Project.STM32H745I_Discovery_CM4.cspy.ps1

index c4e49f591fb5303639a11d698579d4d4fe15c75f..fa0e9fcc9d7c9c922ba8ad40f0ed29bbb3bce5a1 100644 (file)
--- a/FreeRTOS/Demo/CORTEX_M7_M4_AMP_STM32H745I_Discovery_IAR/settings/Project.STM32H745I_Discovery_CM4.cspy.ps1
+++ b/FreeRTOS/Demo/CORTEX_M7_M4_AMP_STM32H745I_Discovery_IAR/settings/Project.STM32H745I_Discovery_CM4.cspy.ps1
@@ -23,9 +23,9 @@
  \r
  if ($debugfile -eq "")\r
  {\r
-& "C:\devtools\IAR Systems\Embedded Workbench 8.2\common\bin\cspybat" -f "C:\Users\ribarry\Dev\FreeRTOS\Trial\Active\STM32H7_dual_core\WorkingCopy\Demo\CORTEX_M7_M4_STM32H745I_Discovery_IAR\settings\Project.STM32H745I_Discovery_CM4.general.xcl" --backend -f "C:\Users\ribarry\Dev\FreeRTOS\Trial\Active\STM32H7_dual_core\WorkingCopy\Demo\CORTEX_M7_M4_STM32H745I_Discovery_IAR\settings\Project.STM32H745I_Discovery_CM4.driver.xcl" \r
+& "C:\devtools\IAR Systems\Embedded Workbench 8.3\common\bin\cspybat" -f "C:\Users\ribarry\Dev\FreeRTOS\WorkingCopy\FreeRTOS\Demo\CORTEX_M7_M4_AMP_STM32H745I_Discovery_IAR\settings\Project.STM32H745I_Discovery_CM4.general.xcl" --backend -f "C:\Users\ribarry\Dev\FreeRTOS\WorkingCopy\FreeRTOS\Demo\CORTEX_M7_M4_AMP_STM32H745I_Discovery_IAR\settings\Project.STM32H745I_Discovery_CM4.driver.xcl" \r
  }\r
  else\r
  {\r
-& "C:\devtools\IAR Systems\Embedded Workbench 8.2\common\bin\cspybat" -f "C:\Users\ribarry\Dev\FreeRTOS\Trial\Active\STM32H7_dual_core\WorkingCopy\Demo\CORTEX_M7_M4_STM32H745I_Discovery_IAR\settings\Project.STM32H745I_Discovery_CM4.general.xcl" --debug_file=$debugfile --backend -f "C:\Users\ribarry\Dev\FreeRTOS\Trial\Active\STM32H7_dual_core\WorkingCopy\Demo\CORTEX_M7_M4_STM32H745I_Discovery_IAR\settings\Project.STM32H745I_Discovery_CM4.driver.xcl" \r
+& "C:\devtools\IAR Systems\Embedded Workbench 8.3\common\bin\cspybat" -f "C:\Users\ribarry\Dev\FreeRTOS\WorkingCopy\FreeRTOS\Demo\CORTEX_M7_M4_AMP_STM32H745I_Discovery_IAR\settings\Project.STM32H745I_Discovery_CM4.general.xcl" --debug_file=$debugfile --backend -f "C:\Users\ribarry\Dev\FreeRTOS\WorkingCopy\FreeRTOS\Demo\CORTEX_M7_M4_AMP_STM32H745I_Discovery_IAR\settings\Project.STM32H745I_Discovery_CM4.driver.xcl" \r
  }\r
diff --git a/FreeRTOS/Demo/CORTEX_M7_M4_AMP_STM32H745I_Discovery_IAR/settings/Project.STM32H745I_Discovery_CM4.driver.xcl b/FreeRTOS/Demo/CORTEX_M7_M4_AMP_STM32H745I_Discovery_IAR/settings/Project.STM32H745I_Discovery_CM4.driver.xcl

index 25b4c5efc8a314da6b225eeab3e27831ce46957c..cd5ac505dc060df185d555cd56237dcf8a6f1786 100644 (file)
--- a/FreeRTOS/Demo/CORTEX_M7_M4_AMP_STM32H745I_Discovery_IAR/settings/Project.STM32H745I_Discovery_CM4.driver.xcl
+++ b/FreeRTOS/Demo/CORTEX_M7_M4_AMP_STM32H745I_Discovery_IAR/settings/Project.STM32H745I_Discovery_CM4.driver.xcl
@@ -6,37 +6,23 @@
  \r
  "-p" \r
  \r
-"C:\devtools\IAR Systems\Embedded Workbench 8.2\arm\CONFIG\debugger\ST\STM32H7x5_CM4.ddf" \r
+"C:\devtools\IAR Systems\Embedded Workbench 8.3\arm\CONFIG\debugger\ST\STM32H745XI_CM4.ddf" \r
  \r
  "--semihosting" \r
  \r
  "--device=STM32H745XI_CM4" \r
  \r
-"--multicore_nr_of_cores=1" \r
-\r
-"--jet_script_file=C:\devtools\IAR Systems\Embedded Workbench 8.2\arm\config\debugger\ST\STM32.ProbeScript" \r
-\r
-"--jet_standard_reset=9,0,0" \r
-\r
-"--reset_style=\"0,-,0,Disabled__no_reset_\"" \r
-\r
-"--reset_style=\"1,-,0,Software\"" \r
-\r
-"--reset_style=\"2,-,0,Hardware\"" \r
-\r
-"--reset_style=\"3,-,0,Core\"" \r
-\r
-"--reset_style=\"4,-,0,System\"" \r
+"--drv_interface=SWD" \r
  \r
-"--reset_style=\"9,ConnectUnderReset,1,Connect_during_reset\"" \r
+"--stlink_reset_strategy=0,2" \r
  \r
-"--jet_power_from_probe=leave_on" \r
+"--drv_swo_clock_setup=200000000,0,2000000" \r
  \r
-"--drv_interface=SWD" \r
+"--drv_catch_exceptions=0x000" \r
  \r
-"--drv_catch_exceptions=0xff0" \r
+"--drv_debug_ap=3" \r
  \r
-"--board_file=C:\devtools\IAR Systems\Embedded Workbench 8.2\arm\config\flashloader\ST\FlashSTM32H7xxx_CM4.board" \r
+"--stlink_probe=stlinkv3" \r
  \r
  \r
  \r
diff --git a/FreeRTOS/Demo/CORTEX_M7_M4_AMP_STM32H745I_Discovery_IAR/settings/Project.STM32H745I_Discovery_CM4.general.xcl b/FreeRTOS/Demo/CORTEX_M7_M4_AMP_STM32H745I_Discovery_IAR/settings/Project.STM32H745I_Discovery_CM4.general.xcl

index bd4090d23e716c8e5625c9df8409eae8d606d2ef..9a26adab8f3a0d672f353331912fa567b9235eb8 100644 (file)
--- a/FreeRTOS/Demo/CORTEX_M7_M4_AMP_STM32H745I_Discovery_IAR/settings/Project.STM32H745I_Discovery_CM4.general.xcl
+++ b/FreeRTOS/Demo/CORTEX_M7_M4_AMP_STM32H745I_Discovery_IAR/settings/Project.STM32H745I_Discovery_CM4.general.xcl
@@ -1,12 +1,20 @@
-"C:\devtools\IAR Systems\Embedded Workbench 8.2\arm\bin\armproc.dll" \r
+"C:\devtools\IAR Systems\Embedded Workbench 8.3\arm\bin\armproc.dll" \r
  \r
-"C:\devtools\IAR Systems\Embedded Workbench 8.2\arm\bin\armJET.dll" \r
+"C:\devtools\IAR Systems\Embedded Workbench 8.3\arm\bin\armstlink2.dll" \r
  \r
-"C:\Users\ribarry\Dev\FreeRTOS\Trial\Active\STM32H7_dual_core\WorkingCopy\Demo\CORTEX_M7_M4_STM32H745I_Discovery_IAR\STM32H745I_Discovery_CM4\Exe\STM32H745I_Discovery_CM4.out" \r
+"C:\Users\ribarry\Dev\FreeRTOS\WorkingCopy\FreeRTOS\Demo\CORTEX_M7_M4_AMP_STM32H745I_Discovery_IAR\STM32H745I_Discovery_CM4\Exe\STM32H745I_Discovery_CM4.out" \r
  \r
---plugin="C:\devtools\IAR Systems\Embedded Workbench 8.2\arm\bin\armbat.dll" \r
+--plugin="C:\devtools\IAR Systems\Embedded Workbench 8.3\arm\bin\armbat.dll" \r
  \r
---flash_loader="C:\devtools\IAR Systems\Embedded Workbench 8.2\arm\config\flashloader\ST\FlashSTM32H7xxx_CM4.board" \r
+--device_macro="C:\devtools\IAR Systems\Embedded Workbench 8.3\arm\config\debugger\ST\STM32H7xx_M4.dmac" \r
+\r
+--device_macro="C:\devtools\IAR Systems\Embedded Workbench 8.3\arm\config\debugger\ST\STM32H7xx_DBG.dmac" \r
+\r
+--device_macro="C:\devtools\IAR Systems\Embedded Workbench 8.3\arm\config\debugger\ST\STM32H7xx_OB.dmac" \r
+\r
+--device_macro="C:\devtools\IAR Systems\Embedded Workbench 8.3\arm\config\debugger\ST\STM32H7xx_TRACE.dmac" \r
+\r
+--flash_loader="C:\devtools\IAR Systems\Embedded Workbench 8.3\arm\config\flashloader\ST\FlashSTM32H7xxxI.board" \r
  \r
  \r
  \r
diff --git a/FreeRTOS/Demo/CORTEX_M7_M4_AMP_STM32H745I_Discovery_IAR/settings/Project.STM32H745I_Discovery_CM7.cspy.bat b/FreeRTOS/Demo/CORTEX_M7_M4_AMP_STM32H745I_Discovery_IAR/settings/Project.STM32H745I_Discovery_CM7.cspy.bat

index b5c3526231899f34fb24cf44efeb162b74d57da7..9184c21b9aed7af3fde9737304dd4ad032cccd74 100644 (file)
--- a/FreeRTOS/Demo/CORTEX_M7_M4_AMP_STM32H745I_Discovery_IAR/settings/Project.STM32H745I_Discovery_CM7.cspy.bat
+++ b/FreeRTOS/Demo/CORTEX_M7_M4_AMP_STM32H745I_Discovery_IAR/settings/Project.STM32H745I_Discovery_CM7.cspy.bat
@@ -25,7 +25,7 @@ if not "%~1" == "" goto debugFile
  \r
  @echo on \r
  \r
-"C:\devtools\IAR Systems\Embedded Workbench 8.2\common\bin\cspybat" -f "C:\Users\ribarry\Dev\FreeRTOS\Trial\Active\STM32H7_dual_core\WorkingCopy\Demo\CORTEX_M7_M4_STM32H745I_Discovery_IAR\settings\Project.STM32H745I_Discovery_CM7.general.xcl" --backend -f "C:\Users\ribarry\Dev\FreeRTOS\Trial\Active\STM32H7_dual_core\WorkingCopy\Demo\CORTEX_M7_M4_STM32H745I_Discovery_IAR\settings\Project.STM32H745I_Discovery_CM7.driver.xcl" \r
+"C:\devtools\IAR Systems\Embedded Workbench 8.3\common\bin\cspybat" -f "C:\Users\ribarry\Dev\FreeRTOS\WorkingCopy\FreeRTOS\Demo\CORTEX_M7_M4_AMP_STM32H745I_Discovery_IAR\settings\Project.STM32H745I_Discovery_CM7.general.xcl" --backend -f "C:\Users\ribarry\Dev\FreeRTOS\WorkingCopy\FreeRTOS\Demo\CORTEX_M7_M4_AMP_STM32H745I_Discovery_IAR\settings\Project.STM32H745I_Discovery_CM7.driver.xcl" \r
  \r
  @echo off \r
  goto end \r
@@ -34,7 +34,7 @@ goto end
  \r
  @echo on \r
  \r
-"C:\devtools\IAR Systems\Embedded Workbench 8.2\common\bin\cspybat" -f "C:\Users\ribarry\Dev\FreeRTOS\Trial\Active\STM32H7_dual_core\WorkingCopy\Demo\CORTEX_M7_M4_STM32H745I_Discovery_IAR\settings\Project.STM32H745I_Discovery_CM7.general.xcl" "--debug_file=%~1" --backend -f "C:\Users\ribarry\Dev\FreeRTOS\Trial\Active\STM32H7_dual_core\WorkingCopy\Demo\CORTEX_M7_M4_STM32H745I_Discovery_IAR\settings\Project.STM32H745I_Discovery_CM7.driver.xcl" \r
+"C:\devtools\IAR Systems\Embedded Workbench 8.3\common\bin\cspybat" -f "C:\Users\ribarry\Dev\FreeRTOS\WorkingCopy\FreeRTOS\Demo\CORTEX_M7_M4_AMP_STM32H745I_Discovery_IAR\settings\Project.STM32H745I_Discovery_CM7.general.xcl" "--debug_file=%~1" --backend -f "C:\Users\ribarry\Dev\FreeRTOS\WorkingCopy\FreeRTOS\Demo\CORTEX_M7_M4_AMP_STM32H745I_Discovery_IAR\settings\Project.STM32H745I_Discovery_CM7.driver.xcl" \r
  \r
  @echo off \r
  :end
 \ No newline at end of file
diff --git a/FreeRTOS/Demo/CORTEX_M7_M4_AMP_STM32H745I_Discovery_IAR/settings/Project.STM32H745I_Discovery_CM7.cspy.ps1 b/FreeRTOS/Demo/CORTEX_M7_M4_AMP_STM32H745I_Discovery_IAR/settings/Project.STM32H745I_Discovery_CM7.cspy.ps1

index cc40dd5da6b3eff5dff3d83d1e7ca8390ea4b8ae..dce70ed0609606c81b909603b363fc000ccdbefc 100644 (file)
--- a/FreeRTOS/Demo/CORTEX_M7_M4_AMP_STM32H745I_Discovery_IAR/settings/Project.STM32H745I_Discovery_CM7.cspy.ps1
+++ b/FreeRTOS/Demo/CORTEX_M7_M4_AMP_STM32H745I_Discovery_IAR/settings/Project.STM32H745I_Discovery_CM7.cspy.ps1
@@ -23,9 +23,9 @@
  \r
  if ($debugfile -eq "")\r
  {\r
-& "C:\devtools\IAR Systems\Embedded Workbench 8.2\common\bin\cspybat" -f "C:\Users\ribarry\Dev\FreeRTOS\Trial\Active\STM32H7_dual_core\WorkingCopy\Demo\CORTEX_M7_M4_STM32H745I_Discovery_IAR\settings\Project.STM32H745I_Discovery_CM7.general.xcl" --backend -f "C:\Users\ribarry\Dev\FreeRTOS\Trial\Active\STM32H7_dual_core\WorkingCopy\Demo\CORTEX_M7_M4_STM32H745I_Discovery_IAR\settings\Project.STM32H745I_Discovery_CM7.driver.xcl" \r
+& "C:\devtools\IAR Systems\Embedded Workbench 8.3\common\bin\cspybat" -f "C:\Users\ribarry\Dev\FreeRTOS\WorkingCopy\FreeRTOS\Demo\CORTEX_M7_M4_AMP_STM32H745I_Discovery_IAR\settings\Project.STM32H745I_Discovery_CM7.general.xcl" --backend -f "C:\Users\ribarry\Dev\FreeRTOS\WorkingCopy\FreeRTOS\Demo\CORTEX_M7_M4_AMP_STM32H745I_Discovery_IAR\settings\Project.STM32H745I_Discovery_CM7.driver.xcl" \r
  }\r
  else\r
  {\r
-& "C:\devtools\IAR Systems\Embedded Workbench 8.2\common\bin\cspybat" -f "C:\Users\ribarry\Dev\FreeRTOS\Trial\Active\STM32H7_dual_core\WorkingCopy\Demo\CORTEX_M7_M4_STM32H745I_Discovery_IAR\settings\Project.STM32H745I_Discovery_CM7.general.xcl" --debug_file=$debugfile --backend -f "C:\Users\ribarry\Dev\FreeRTOS\Trial\Active\STM32H7_dual_core\WorkingCopy\Demo\CORTEX_M7_M4_STM32H745I_Discovery_IAR\settings\Project.STM32H745I_Discovery_CM7.driver.xcl" \r
+& "C:\devtools\IAR Systems\Embedded Workbench 8.3\common\bin\cspybat" -f "C:\Users\ribarry\Dev\FreeRTOS\WorkingCopy\FreeRTOS\Demo\CORTEX_M7_M4_AMP_STM32H745I_Discovery_IAR\settings\Project.STM32H745I_Discovery_CM7.general.xcl" --debug_file=$debugfile --backend -f "C:\Users\ribarry\Dev\FreeRTOS\WorkingCopy\FreeRTOS\Demo\CORTEX_M7_M4_AMP_STM32H745I_Discovery_IAR\settings\Project.STM32H745I_Discovery_CM7.driver.xcl" \r
  }\r
diff --git a/FreeRTOS/Demo/CORTEX_M7_M4_AMP_STM32H745I_Discovery_IAR/settings/Project.STM32H745I_Discovery_CM7.driver.xcl b/FreeRTOS/Demo/CORTEX_M7_M4_AMP_STM32H745I_Discovery_IAR/settings/Project.STM32H745I_Discovery_CM7.driver.xcl

index 232752b903bb712dfe51122603cf788fe192cbbb..19799ea308993c46d711e8ad8855e6e734877196 100644 (file)
--- a/FreeRTOS/Demo/CORTEX_M7_M4_AMP_STM32H745I_Discovery_IAR/settings/Project.STM32H745I_Discovery_CM7.driver.xcl
+++ b/FreeRTOS/Demo/CORTEX_M7_M4_AMP_STM32H745I_Discovery_IAR/settings/Project.STM32H745I_Discovery_CM7.driver.xcl
@@ -6,7 +6,7 @@
  \r
  "-p" \r
  \r
-"C:\devtools\IAR Systems\Embedded Workbench 8.2\arm\CONFIG\debugger\ST\STM32H7x5_CM7.ddf" \r
+"C:\devtools\IAR Systems\Embedded Workbench 8.3\arm\CONFIG\debugger\ST\STM32H745XI_CM7.ddf" \r
  \r
  "--drv_verify_download" \r
  \r
@@ -14,31 +14,17 @@
  \r
  "--device=STM32H745XI_CM7" \r
  \r
-"--multicore_nr_of_cores=1" \r
-\r
-"--jet_script_file=C:\devtools\IAR Systems\Embedded Workbench 8.2\arm\config\debugger\ST\STM32.ProbeScript" \r
-\r
-"--jet_standard_reset=9,0,0" \r
-\r
-"--reset_style=\"0,-,0,Disabled__no_reset_\"" \r
-\r
-"--reset_style=\"1,-,0,Software\"" \r
-\r
-"--reset_style=\"2,-,0,Hardware\"" \r
-\r
-"--reset_style=\"3,-,0,Core\"" \r
-\r
-"--reset_style=\"4,-,0,System\"" \r
+"--drv_interface=SWD" \r
  \r
-"--reset_style=\"9,ConnectUnderReset,1,Connect_during_reset\"" \r
+"--stlink_reset_strategy=0,0" \r
  \r
-"--jet_power_from_probe=leave_on" \r
+"--drv_swo_clock_setup=400000000,0,2000000" \r
  \r
-"--drv_interface=SWD" \r
+"--drv_catch_exceptions=0x000" \r
  \r
-"--drv_catch_exceptions=0xff0" \r
+"--drv_debug_ap=0" \r
  \r
-"--board_file=C:\devtools\IAR Systems\Embedded Workbench 8.2\arm\config\flashloader\ST\FlashSTM32H7xxx_CM7.board" \r
+"--stlink_probe=stlinkv3" \r
  \r
  \r
  \r
diff --git a/FreeRTOS/Demo/CORTEX_M7_M4_AMP_STM32H745I_Discovery_IAR/settings/Project.STM32H745I_Discovery_CM7.general.xcl b/FreeRTOS/Demo/CORTEX_M7_M4_AMP_STM32H745I_Discovery_IAR/settings/Project.STM32H745I_Discovery_CM7.general.xcl

index fdee081a48f859342e5ef57a0b0c64ebc5bd4eac..f95d794729ff8b755fd09a3f92e2d00957f84923 100644 (file)
--- a/FreeRTOS/Demo/CORTEX_M7_M4_AMP_STM32H745I_Discovery_IAR/settings/Project.STM32H745I_Discovery_CM7.general.xcl
+++ b/FreeRTOS/Demo/CORTEX_M7_M4_AMP_STM32H745I_Discovery_IAR/settings/Project.STM32H745I_Discovery_CM7.general.xcl
@@ -1,12 +1,20 @@
-"C:\devtools\IAR Systems\Embedded Workbench 8.2\arm\bin\armproc.dll" \r
+"C:\devtools\IAR Systems\Embedded Workbench 8.3\arm\bin\armproc.dll" \r
  \r
-"C:\devtools\IAR Systems\Embedded Workbench 8.2\arm\bin\armJET.dll" \r
+"C:\devtools\IAR Systems\Embedded Workbench 8.3\arm\bin\armstlink2.dll" \r
  \r
-"C:\Users\ribarry\Dev\FreeRTOS\Trial\Active\STM32H7_dual_core\WorkingCopy\Demo\CORTEX_M7_M4_STM32H745I_Discovery_IAR\STM32H745I_Discovery_CM7\Exe\STM32H745I_Discovery_CM7.out" \r
+"C:\Users\ribarry\Dev\FreeRTOS\WorkingCopy\FreeRTOS\Demo\CORTEX_M7_M4_AMP_STM32H745I_Discovery_IAR\STM32H745I_Discovery_CM7\Exe\STM32H745I_Discovery_CM7.out" \r
  \r
---plugin="C:\devtools\IAR Systems\Embedded Workbench 8.2\arm\bin\armbat.dll" \r
+--plugin="C:\devtools\IAR Systems\Embedded Workbench 8.3\arm\bin\armbat.dll" \r
  \r
---flash_loader="C:\devtools\IAR Systems\Embedded Workbench 8.2\arm\config\flashloader\ST\FlashSTM32H7xxx_CM7.board" \r
+--device_macro="C:\devtools\IAR Systems\Embedded Workbench 8.3\arm\config\debugger\ST\STM32H7xx.dmac" \r
+\r
+--device_macro="C:\devtools\IAR Systems\Embedded Workbench 8.3\arm\config\debugger\ST\STM32H7xx_DBG.dmac" \r
+\r
+--device_macro="C:\devtools\IAR Systems\Embedded Workbench 8.3\arm\config\debugger\ST\STM32H7xx_OB.dmac" \r
+\r
+--device_macro="C:\devtools\IAR Systems\Embedded Workbench 8.3\arm\config\debugger\ST\STM32H7xx_TRACE.dmac" \r
+\r
+--flash_loader="C:\devtools\IAR Systems\Embedded Workbench 8.3\arm\config\flashloader\ST\FlashSTM32H7xxxI.board" \r
  \r
  \r
  \r
diff --git a/FreeRTOS/Demo/CORTEX_M7_M4_AMP_STM32H745I_Discovery_IAR/settings/Project.dbgdt b/FreeRTOS/Demo/CORTEX_M7_M4_AMP_STM32H745I_Discovery_IAR/settings/Project.dbgdt

index eaa99c9842f4abe3f29253b05b8538c315ceb60d..923032cf6656e4dfb45311ead4048cfab6b3a1f8 100644 (file)
--- a/FreeRTOS/Demo/CORTEX_M7_M4_AMP_STM32H745I_Discovery_IAR/settings/Project.dbgdt
+++ b/FreeRTOS/Demo/CORTEX_M7_M4_AMP_STM32H745I_Discovery_IAR/settings/Project.dbgdt
@@ -80,6 +80,7 @@
              <WIN_TRACE>34123</WIN_TRACE>\r
              <TB_MULTICORE>34124</TB_MULTICORE>\r
              <WIN_RTOS_TASK>34125</WIN_RTOS_TASK>\r
+            <WIN_CODECOVERAGE>34126</WIN_CODECOVERAGE>\r
          </ChildIdMap>\r
          <Desktop>\r
              <IarPane-34048>\r
@@ -171,7 +172,7 @@
                  <RecentlyUsedMenus>1</RecentlyUsedMenus>\r
                  <MenuShadows>1</MenuShadows>\r
                  <ShowAllMenusAfterDelay>1</ShowAllMenusAfterDelay>\r
-                <CommandsUsage>1D0100001400108600006600000000DA0000010000000F81000001000000C58600000300000026DE0000010000000C8100000100000000810000010000001A860000010000005E8600000300000028DE0000010000000E81000005000000C48600000300000041E1000001000000118600001D0000000581000001000000468100008B0000000D8100000300000008860000010000000A810000010000000784000001000000</CommandsUsage>\r
+                <CommandsUsage>2E010000140000DA000002000000108600006D000000C5860000030000000F810000010000000C8100000100000026DE0000010000000081000001000000C4860000030000000E8100000500000028DE0000010000005E860000030000001A8600000100000041E10000010000000581000001000000118600001E000000468100009300000008860000010000000D8100000300000007840000010000000A81000001000000</CommandsUsage>\r
              </MFCToolBarParameters>\r
              <CommandManager>\r
                  <CommandsWithoutImages>370001B0000002B0000003B0000004B0000005B0000006B0000007B0000008B0000009B000000AB000000BB000000CB000000DB000000EB00000FFFFFFFF00B000002481000008800000098000000A8000000B8000000C800000158000000A81000001E800000C84000033840000788400001184000021DE000026DE000028DE000024DE000027DE000025DE000020920000289200002992000037920000389200001E92000000DC000001DC000002DC000003DC0000748600007784000007840000808C000044D50000838600005886000004DC00002A8F000000DA0000</CommandsWithoutImages>\r
@@ -180,7 +181,7 @@
              <Pane-59393>\r
                  <ID>0</ID>\r
                  <RectRecentFloat>0A0000000A0000006E0000006E000000</RectRecentFloat>\r
-                <RectRecentDocked>00000000E3070000E10A000000080000</RectRecentDocked>\r
+                <RectRecentDocked>000000002D070000C60900004A070000</RectRecentDocked>\r
                  <RecentFrameAlignment>4096</RecentFrameAlignment>\r
                  <RecentRowIndex>0</RecentRowIndex>\r
                  <IsFloating>0</IsFloating>\r
@@ -219,8 +220,8 @@
              </BasePane-34053>\r
              <Pane--1>\r
                  <ID>4294967295</ID>\r
-                <RectRecentFloat>1C010000850000003F020000F8050000</RectRecentFloat>\r
-                <RectRecentDocked>E50000004100000008020000B4050000</RectRecentDocked>\r
+                <RectRecentFloat>E1000000850000000402000042050000</RectRecentFloat>\r
+                <RectRecentDocked>E50000004100000008020000FE040000</RectRecentDocked>\r
                  <RecentFrameAlignment>4096</RecentFrameAlignment>\r
                  <RecentRowIndex>0</RecentRowIndex>\r
                  <IsFloating>0</IsFloating>\r
@@ -233,7 +234,7 @@
              <Pane-34054>\r
                  <ID>34054</ID>\r
                  <RectRecentFloat>000000001700000036010000EC000000</RectRecentFloat>\r
-                <RectRecentDocked>04000000DD050000DD0A0000BF070000</RectRecentDocked>\r
+                <RectRecentDocked>0400000027050000C209000009070000</RectRecentDocked>\r
                  <RecentFrameAlignment>32768</RecentFrameAlignment>\r
                  <RecentRowIndex>0</RecentRowIndex>\r
                  <IsFloating>0</IsFloating>\r
@@ -259,7 +260,7 @@
              <Pane-34065>\r
                  <ID>34065</ID>\r
                  <RectRecentFloat>000000001700000036010000EC000000</RectRecentFloat>\r
-                <RectRecentDocked>04000000DD050000DD0A0000BF070000</RectRecentDocked>\r
+                <RectRecentDocked>0400000027050000C209000009070000</RectRecentDocked>\r
                  <RecentFrameAlignment>4096</RecentFrameAlignment>\r
                  <RecentRowIndex>0</RecentRowIndex>\r
                  <IsFloating>0</IsFloating>\r
@@ -272,7 +273,7 @@
              <Pane-34071>\r
                  <ID>34071</ID>\r
                  <RectRecentFloat>000000001700000036010000EC000000</RectRecentFloat>\r
-                <RectRecentDocked>04000000DD050000DD0A0000BF070000</RectRecentDocked>\r
+                <RectRecentDocked>0400000027050000C209000009070000</RectRecentDocked>\r
                  <RecentFrameAlignment>4096</RecentFrameAlignment>\r
                  <RecentRowIndex>0</RecentRowIndex>\r
                  <IsFloating>0</IsFloating>\r
@@ -285,7 +286,7 @@
              <Pane-34072>\r
                  <ID>34072</ID>\r
                  <RectRecentFloat>000000001700000036010000EC000000</RectRecentFloat>\r
-                <RectRecentDocked>04000000DD050000DD0A0000BF070000</RectRecentDocked>\r
+                <RectRecentDocked>0400000027050000C209000009070000</RectRecentDocked>\r
                  <RecentFrameAlignment>4096</RecentFrameAlignment>\r
                  <RecentRowIndex>0</RecentRowIndex>\r
                  <IsFloating>0</IsFloating>\r
@@ -298,7 +299,7 @@
              <Pane-34073>\r
                  <ID>34073</ID>\r
                  <RectRecentFloat>000000001700000036010000EC000000</RectRecentFloat>\r
-                <RectRecentDocked>04000000DD050000DD0A0000BF070000</RectRecentDocked>\r
+                <RectRecentDocked>0400000027050000C209000009070000</RectRecentDocked>\r
                  <RecentFrameAlignment>4096</RecentFrameAlignment>\r
                  <RecentRowIndex>0</RecentRowIndex>\r
                  <IsFloating>0</IsFloating>\r
@@ -311,7 +312,7 @@
              <Pane-34093>\r
                  <ID>34093</ID>\r
                  <RectRecentFloat>000000001700000036010000EC000000</RectRecentFloat>\r
-                <RectRecentDocked>04000000DD050000DD0A0000BF070000</RectRecentDocked>\r
+                <RectRecentDocked>0400000027050000C209000009070000</RectRecentDocked>\r
                  <RecentFrameAlignment>4096</RecentFrameAlignment>\r
                  <RecentRowIndex>0</RecentRowIndex>\r
                  <IsFloating>0</IsFloating>\r
@@ -324,7 +325,7 @@
              <Pane-34103>\r
                  <ID>34103</ID>\r
                  <RectRecentFloat>000000001700000036010000EC000000</RectRecentFloat>\r
-                <RectRecentDocked>04000000DD050000DD0A0000BF070000</RectRecentDocked>\r
+                <RectRecentDocked>0400000027050000C209000009070000</RectRecentDocked>\r
                  <RecentFrameAlignment>4096</RecentFrameAlignment>\r
                  <RecentRowIndex>0</RecentRowIndex>\r
                  <IsFloating>0</IsFloating>\r
@@ -350,7 +351,7 @@
              <Pane-34056>\r
                  <ID>34056</ID>\r
                  <RectRecentFloat>000000001700000018010000C8010000</RectRecentFloat>\r
-                <RectRecentDocked>0000000041000000E1000000B4050000</RectRecentDocked>\r
+                <RectRecentDocked>0000000041000000E1000000FE040000</RectRecentDocked>\r
                  <RecentFrameAlignment>4096</RecentFrameAlignment>\r
                  <RecentRowIndex>0</RecentRowIndex>\r
                  <IsFloating>0</IsFloating>\r
@@ -390,7 +391,7 @@
                  <RectRecentDocked>0400000088060000FC0E0000F9060000</RectRecentDocked>\r
                  <RecentFrameAlignment>4096</RecentFrameAlignment>\r
                  <RecentRowIndex>0</RecentRowIndex>\r
-                <IsFloating>0</IsFloating>\r
+                <IsFloating>1</IsFloating>\r
                  <MRUWidth>32767</MRUWidth>\r
                  <PinState>0</PinState>\r
              </Pane-34086>\r
@@ -853,7 +854,7 @@
              <Pane-34108>\r
                  <ID>34108</ID>\r
                  <RectRecentFloat>000000001700000018010000C8010000</RectRecentFloat>\r
-                <RectRecentDocked>E50000006200000008020000B4050000</RectRecentDocked>\r
+                <RectRecentDocked>E50000006200000008020000FE040000</RectRecentDocked>\r
                  <RecentFrameAlignment>4096</RecentFrameAlignment>\r
                  <RecentRowIndex>0</RecentRowIndex>\r
                  <IsFloating>0</IsFloating>\r
@@ -978,7 +979,7 @@
              <Pane-34104>\r
                  <ID>34104</ID>\r
                  <RectRecentFloat>000000001700000018010000C8010000</RectRecentFloat>\r
-                <RectRecentDocked>4206000041000000E10A0000B4050000</RectRecentDocked>\r
+                <RectRecentDocked>2705000041000000C6090000FE040000</RectRecentDocked>\r
                  <RecentFrameAlignment>16384</RecentFrameAlignment>\r
                  <RecentRowIndex>0</RecentRowIndex>\r
                  <IsFloating>0</IsFloating>\r
@@ -1050,11 +1051,11 @@
              </BasePane-34107>\r
              <IarPane-34107 />\r
              <DockingManager-256>\r
-                <DockingPaneAndPaneDividers>000000004C000000000000000040000000000000FFFFFFFFFFFFFFFF000000000000000004000000040000000000000002000000040000000100000000000000000000003B85000000000000000000000000000000000000010000003B850000010000003B850000000000000040000000000000FFFFFFFFFFFFFFFF000000000000000004000000040000000000000002000000040000000100000000000000000000003A85000000000000000000000000000000000000010000003A850000010000003A850000000000000040000000000000FFFFFFFFFFFFFFFF00000000000000000400000004000000000000000200000004000000010000000000000000000000398500000000000000000000000000000000000001000000398500000100000039850000000000000040000001000000FFFFFFFFFFFFFFFF3E0600004100000042060000B4050000010000000200001004000000010000004CF8FFFFC0000000388500000000000000000000000000000000000001000000388500000100000038850000000000000080000000000000FFFFFFFFFFFFFFFF00000000000000000400000004000000000000000100000004000000010000000000000000000000368500000000000000000000000000000000000001000000368500000100000036850000000000000040000000000000FFFFFFFFFFFFFFFF00000000000000000400000004000000000000000200000004000000010000000000000000000000358500000000000000000000000000000000000001000000358500000100000035850000000000000040000000000000FFFFFFFFFFFFFFFF00000000000000000400000004000000000000000200000004000000010000000000000000000000348500000000000000000000000000000000000001000000348500000100000034850000000000000020000000000000FFFFFFFFFFFFFFFF00000000000000000400000004000000000000000100000004000000010000000000000000000000338500000000000000000000000000000000000001000000338500000100000033850000000000000040000000000000FFFFFFFFFFFFFFFF00000000000000000400000004000000000000000200000004000000010000000000000000000000328500000000000000000000000000000000000001000000328500000100000032850000000000000040000000000000FFFFFFFFFFFFFFFF00000000000000000400000004000000000000000200000004000000010000000000000000000000318500000000000000000000000000000000000001000000318500000100000031850000000000000010000000000000FFFFFFFFFFFFFFFF00000000000000000400000004000000000000000200000004000000010000000000000000000000308500000000000000000000000000000000000001000000308500000100000030850000000000000010000000000000FFFFFFFFFFFFFFFF000000000000000004000000040000000000000002000000040000000100000000000000000000002F85000000000000000000000000000000000000010000002F850000010000002F850000000000000010000001000000FFFFFFFFFFFFFFFF08020000410000000C020000B40500000100000002000010040000000100000001000000EC0C0000FFFFFFFF010000003C850000FFFF02000B004354616262656450616E6500100000010000001C010000850000003F020000F8050000E50000004100000008020000B4050000000000004010005601000000FFFEFF0957006F0072006B0073007000610063006500010000003C85000001000000FFFFFFFFFFFFFFFF00000000000000000000000000000000000000000000000001000000FFFFFFFF3C85000001000000FFFFFFFF3C850000000000000040000000000000FFFFFFFFFFFFFFFF000000000000000004000000040000000000000002000000040000000100000000000000000000002C85000000000000000000000000000000000000010000002C850000010000002C850000000000000040000000000000FFFFFFFFFFFFFFFF000000000000000004000000040000000000000002000000040000000100000000000000000000002B85000000000000000000000000000000000000010000002B850000010000002B850000000000000040000000000000FFFFFFFFFFFFFFFF000000000000000004000000040000000000000002000000040000000100000000000000000000002A85000000000000000000000000000000000000010000002A850000010000002A850000000000000040000000000000FFFFFFFFFFFFFFFF00000000000000000400000004000000000000000200000004000000010000000000000000000000298500000000000000000000000000000000000001000000298500000100000029850000000000000040000000000000FFFFFFFFFFFFFFFF5409000039000000580900009B050000000000000200000004000000010000007BF7FFFFFFFFFFFF288500000000000000000000000000000000000001000000288500000100000028850000000000000040000000000000FFFFFFFFFFFFFFFF78090000410000007C0900000A07000000000000020000000400000001000000F3F7FFFFC2000000278500000000000000000000000000000000000001000000278500000100000027850000000000000080000000000000FFFFFFFFFFFFFFFF00000000000000000400000004000000000000000100000004000000010000000000000000000000258500000000000000000000000000000000000001000000258500000100000025850000000000000080000000000000FFFFFFFFFFFFFFFF0000000092030000700D000096030000000000000100000004000000010000000000000000000000FFFFFFFF04000000218500002285000023850000248500000180008000000000000037000000DA030000A70D0000C30400000000000096030000700D00007F040000000000004080004604000000FFFEFF084D0065006D006F007200790020003100000000002185000001000000FFFFFFFFFFFFFFFFFFFEFF084D0065006D006F007200790020003200000000002285000001000000FFFFFFFFFFFFFFFFFFFEFF084D0065006D006F007200790020003300000000002385000001000000FFFFFFFFFFFFFFFFFFFEFF084D0065006D006F007200790020003400000000002485000001000000FFFFFFFFFFFFFFFFFFFFFFFF000000000000000000000000000000000000000001000000FFFFFFFF2185000001000000FFFFFFFF21850000000000000040000000000000FFFFFFFFFFFFFFFF00000000000000000400000004000000000000000200000004000000010000000000000000000000208500000000000000000000000000000000000001000000208500000100000020850000000000000040000000000000FFFFFFFFFFFFFFFF000000000000000004000000040000000000000002000000040000000100000000000000000000001F85000000000000000000000000000000000000010000001F850000010000001F850000000000000040000000000000FFFFFFFFFFFFFFFF000000000000000004000000040000000000000002000000040000000100000000000000000000001E85000000000000000000000000000000000000010000001E850000010000001E850000000000000020000000000000FFFFFFFFFFFFFFFF000000000000000004000000040000000000000001000000040000000100000000000000000000001B85000000000000000000000000000000000000010000001B850000010000001B850000000000000040000000000000FFFFFFFFFFFFFFFF660B0000320000006A0B00007F0400000000000002000000040000000100000005F7FFFFC2000000158500000000000000000000000000000000000001000000158500000100000015850000000000000040000000000000FFFFFFFFFFFFFFFF4B0A0000390000004F0A00009B0500000000000002000000040000000100000077F9FFFF33020000128500000000000000000000000000000000000001000000128500000100000012850000000000000040000000000000FFFFFFFFFFFFFFFF00000000000000000400000004000000000000000200000004000000010000000000000000000000108500000000000000000000000000000000000001000000108500000100000010850000000000000080000000000000FFFFFFFFFFFFFFFF000000000000000004000000040000000000000001000000040000000100000000000000000000000D85000000000000000000000000000000000000010000000D850000010000000D850000000000000080000000000000FFFFFFFFFFFFFFFF000000000000000004000000040000000000000001000000040000000100000000000000000000000C85000000000000000000000000000000000000010000000C850000010000000C850000000000000020000000000000FFFFFFFFFFFFFFFF000000000000000004000000040000000000000001000000040000000100000000000000000000000B85000000000000000000000000000000000000010000000B850000010000000B850000000000000010000001000000FFFFFFFFFFFFFFFFE100000041000000E5000000B4050000010000000200001004000000010000003EFFFFFF3D070000088500000000000000000000000000000000000001000000088500000100000008850000000000000080000000000000FFFFFFFFFFFFFFFF00000000000000000400000004000000000000000100000004000000010000000000000000000000078500000000000000000000000000000000000001000000078500000100000007850000000000000080000001000000FFFFFFFFFFFFFFFF00000000B4050000E10A0000B80500000100000001000010040000000100000022FAFFFF7E000000FFFFFFFF0700000006850000118500001785000018850000198500002D850000378500000180008000000100000037000000FC050000180B00002708000000000000B8050000E10A0000E3070000000000004080005607000000FFFEFF054200750069006C006400000000000685000001000000FFFFFFFFFFFFFFFFFFFEFF094400650062007500670020004C006F006700010000001185000001000000FFFFFFFFFFFFFFFFFFFEFF0C4400650063006C00610072006100740069006F006E007300010000001785000001000000FFFFFFFFFFFFFFFFFFFEFF0A5200650066006500720065006E00630065007300000000001885000001000000FFFFFFFFFFFFFFFFFFFEFF0D460069006E006400200069006E002000460069006C0065007300000000001985000001000000FFFFFFFFFFFFFFFFFFFEFF1541006D0062006900670075006F0075007300200044006500660069006E006900740069006F006E007300000000002D85000001000000FFFFFFFFFFFFFFFFFFFEFF0B54006F006F006C0020004F0075007400700075007400000000003785000001000000FFFFFFFFFFFFFFFF02000000000000000000000000000000000000000000000001000000FFFFFFFF0685000001000000FFFFFFFF06850000000000000080000000000000FFFFFFFFFFFFFFFF00000000000000000400000004000000000000000100000004000000010000000000000000000000058500000000000000000000000000000000000001000000058500000100000005850000000000000040000000000000FFFFFFFFFFFFFFFF00000000000000000400000004000000000000000200000004000000010000000000000000000000048500000000000000000000000000000000000001000000048500000100000004850000000000000080000000000000FFFFFFFFFFFFFFFF000000000000000004000000040000000000000001000000040000000100000000000000000000004A85000000000000000000000000000000000000010000004A850000010000004A850000000000000080000000000000FFFFFFFFFFFFFFFF0000000000000000040000000400000000000000010000000400000001000000000000000000000049850000000000000000000000000000000000000100000049850000010000004985000009000000FFFF02001200434D756C746950616E654672616D65576E6400010084000000001700000036010000EC0000000000000000000000020000000000000016850000000000000000000000000000000000000100000016850000058000010084000000001700000036010000EC000000000000000000000002000000000000001A85000000000000000000000000000000000000010000001A85000005800001008400000000220000003801000004010000000000000000000002000000000000004485000000000000000000000000000000000000010000004485000005800001008400000000220000003801000004010000000000000000000002000000000000004585000000000000000000000000000000000000010000004585000005800001008400000000220000003801000004010000000000000000000002000000000000004685000000000000000000000000000000000000010000004685000005800001008400000000220000003801000004010000000000000000000002000000000000004785000000000000000000000000000000000000010000004785000005800001008400000000220000001A010000E0010000000000000000000002000000000000004885000000000000000000000000000000000000010000004885000005800001008400000000220000003801000004010000000000000000000002000000000000004B85000000000000000000000000000000000000010000004B850000058000010084D8010000530000001003000035010000000000000000000002000000000000004D85000000000000000000000000000000000000010000004D8500000000000000000000</DockingPaneAndPaneDividers>\r
+                <DockingPaneAndPaneDividers>000000004E000000000000000040000000000000FFFFFFFFFFFFFFFF000000000000000004000000040000000000000002000000040000000100000000000000000000003B85000000000000000000000000000000000000010000003B850000010000003B850000000000000040000000000000FFFFFFFFFFFFFFFF000000000000000004000000040000000000000002000000040000000100000000000000000000003A85000000000000000000000000000000000000010000003A850000010000003A850000000000000040000000000000FFFFFFFFFFFFFFFF00000000000000000400000004000000000000000200000004000000010000000000000000000000398500000000000000000000000000000000000001000000398500000100000039850000000000000040000001000000FFFFFFFFFFFFFFFF230500004100000027050000FE040000010000000200001004000000010000004CF8FFFFC0000000388500000000000000000000000000000000000001000000388500000100000038850000000000000080000000000000FFFFFFFFFFFFFFFF00000000000000000400000004000000000000000100000004000000010000000000000000000000368500000000000000000000000000000000000001000000368500000100000036850000000000000040000000000000FFFFFFFFFFFFFFFF00000000000000000400000004000000000000000200000004000000010000000000000000000000358500000000000000000000000000000000000001000000358500000100000035850000000000000040000000000000FFFFFFFFFFFFFFFF00000000000000000400000004000000000000000200000004000000010000000000000000000000348500000000000000000000000000000000000001000000348500000100000034850000000000000020000000000000FFFFFFFFFFFFFFFF00000000000000000400000004000000000000000100000004000000010000000000000000000000338500000000000000000000000000000000000001000000338500000100000033850000000000000040000000000000FFFFFFFFFFFFFFFF00000000000000000400000004000000000000000200000004000000010000000000000000000000328500000000000000000000000000000000000001000000328500000100000032850000000000000040000000000000FFFFFFFFFFFFFFFF00000000000000000400000004000000000000000200000004000000010000000000000000000000318500000000000000000000000000000000000001000000318500000100000031850000000000000010000000000000FFFFFFFFFFFFFFFF00000000000000000400000004000000000000000200000004000000010000000000000000000000308500000000000000000000000000000000000001000000308500000100000030850000000000000010000000000000FFFFFFFFFFFFFFFF000000000000000004000000040000000000000002000000040000000100000000000000000000002F85000000000000000000000000000000000000010000002F850000010000002F850000000000000010000001000000FFFFFFFFFFFFFFFF08020000410000000C020000FE0400000100000002000010040000000100000001000000EC0C0000FFFFFFFF010000003C850000FFFF02000B004354616262656450616E650010000001000000E1000000850000000402000042050000E50000004100000008020000FE040000000000004010005601000000FFFEFF0957006F0072006B0073007000610063006500010000003C85000001000000FFFFFFFFFFFFFFFF00000000000000000000000000000000000000000000000001000000FFFFFFFF3C85000001000000FFFFFFFF3C850000000000000040000000000000FFFFFFFFFFFFFFFF000000000000000004000000040000000000000002000000040000000100000000000000000000002C85000000000000000000000000000000000000010000002C850000010000002C850000000000000040000000000000FFFFFFFFFFFFFFFF000000000000000004000000040000000000000002000000040000000100000000000000000000002B85000000000000000000000000000000000000010000002B850000010000002B850000000000000040000000000000FFFFFFFFFFFFFFFF000000000000000004000000040000000000000002000000040000000100000000000000000000002A85000000000000000000000000000000000000010000002A850000010000002A850000000000000040000000000000FFFFFFFFFFFFFFFF00000000000000000400000004000000000000000200000004000000010000000000000000000000298500000000000000000000000000000000000001000000298500000100000029850000000000000040000000000000FFFFFFFFFFFFFFFF5409000039000000580900009B050000000000000200000004000000010000007BF7FFFFFFFFFFFF288500000000000000000000000000000000000001000000288500000100000028850000000000000040000000000000FFFFFFFFFFFFFFFF78090000410000007C0900000A07000000000000020000000400000001000000F3F7FFFFC2000000278500000000000000000000000000000000000001000000278500000100000027850000000000000080000000000000FFFFFFFFFFFFFFFF00000000000000000400000004000000000000000100000004000000010000000000000000000000258500000000000000000000000000000000000001000000258500000100000025850000000000000080000000000000FFFFFFFFFFFFFFFF0000000092030000700D000096030000000000000100000004000000010000000000000000000000FFFFFFFF040000002185000022850000238500002485000001800080000000000000FCFFFFFFDA0300006C0D0000C30400000000000096030000700D00007F040000000000004080004604000000FFFEFF084D0065006D006F007200790020003100000000002185000001000000FFFFFFFFFFFFFFFFFFFEFF084D0065006D006F007200790020003200000000002285000001000000FFFFFFFFFFFFFFFFFFFEFF084D0065006D006F007200790020003300000000002385000001000000FFFFFFFFFFFFFFFFFFFEFF084D0065006D006F007200790020003400000000002485000001000000FFFFFFFFFFFFFFFFFFFFFFFF000000000000000000000000000000000000000001000000FFFFFFFF2185000001000000FFFFFFFF21850000000000000040000000000000FFFFFFFFFFFFFFFF00000000000000000400000004000000000000000200000004000000010000000000000000000000208500000000000000000000000000000000000001000000208500000100000020850000000000000040000000000000FFFFFFFFFFFFFFFF000000000000000004000000040000000000000002000000040000000100000000000000000000001F85000000000000000000000000000000000000010000001F850000010000001F850000000000000040000000000000FFFFFFFFFFFFFFFF000000000000000004000000040000000000000002000000040000000100000000000000000000001E85000000000000000000000000000000000000010000001E850000010000001E850000000000000020000000000000FFFFFFFFFFFFFFFF000000000000000004000000040000000000000001000000040000000100000000000000000000001B85000000000000000000000000000000000000010000001B850000010000001B850000000000000040000000000000FFFFFFFFFFFFFFFF660B0000320000006A0B00007F0400000000000002000000040000000100000005F7FFFFC2000000158500000000000000000000000000000000000001000000158500000100000015850000000000000040000000000000FFFFFFFFFFFFFFFF4B0A0000390000004F0A00009B0500000000000002000000040000000100000077F9FFFF33020000128500000000000000000000000000000000000001000000128500000100000012850000000000000040000000000000FFFFFFFFFFFFFFFF00000000000000000400000004000000000000000200000004000000010000000000000000000000108500000000000000000000000000000000000001000000108500000100000010850000000000000080000000000000FFFFFFFFFFFFFFFF000000000000000004000000040000000000000001000000040000000100000000000000000000000D85000000000000000000000000000000000000010000000D850000010000000D850000000000000080000000000000FFFFFFFFFFFFFFFF000000000000000004000000040000000000000001000000040000000100000000000000000000000C85000000000000000000000000000000000000010000000C850000010000000C850000000000000020000000000000FFFFFFFFFFFFFFFF000000000000000004000000040000000000000001000000040000000100000000000000000000000B85000000000000000000000000000000000000010000000B850000010000000B850000000000000010000001000000FFFFFFFFFFFFFFFFE100000041000000E5000000FE040000010000000200001004000000010000003EFFFFFF3D070000088500000000000000000000000000000000000001000000088500000100000008850000000000000080000000000000FFFFFFFFFFFFFFFF00000000000000000400000004000000000000000100000004000000010000000000000000000000078500000000000000000000000000000000000001000000078500000100000007850000000000000080000001000000FFFFFFFFFFFFFFFF00000000FE040000C6090000020500000100000001000010040000000100000022FAFFFF7E000000FFFFFFFF0800000006850000118500001785000018850000198500002D850000378500004D85000001800080000001000000FCFFFFFF46050000C2090000710700000000000002050000C60900002D070000000000004080005608000000FFFEFF054200750069006C006400000000000685000001000000FFFFFFFFFFFFFFFFFFFEFF094400650062007500670020004C006F006700010000001185000001000000FFFFFFFFFFFFFFFFFFFEFF0C4400650063006C00610072006100740069006F006E007300010000001785000001000000FFFFFFFFFFFFFFFFFFFEFF0A5200650066006500720065006E00630065007300000000001885000001000000FFFFFFFFFFFFFFFFFFFEFF0D460069006E006400200069006E002000460069006C0065007300000000001985000001000000FFFFFFFFFFFFFFFFFFFEFF1541006D0062006900670075006F0075007300200044006500660069006E006900740069006F006E007300000000002D85000001000000FFFFFFFFFFFFFFFFFFFEFF0B54006F006F006C0020004F0075007400700075007400000000003785000001000000FFFFFFFFFFFFFFFFFFFEFF095400610073006B0020004C00690073007400010000004D85000001000000FFFFFFFFFFFFFFFF07000000000000000000000000000000000000000000000001000000FFFFFFFF0685000001000000FFFFFFFF06850000000000000080000000000000FFFFFFFFFFFFFFFF00000000000000000400000004000000000000000100000004000000010000000000000000000000058500000000000000000000000000000000000001000000058500000100000005850000000000000040000000000000FFFFFFFFFFFFFFFF00000000000000000400000004000000000000000200000004000000010000000000000000000000048500000000000000000000000000000000000001000000048500000100000004850000000000000080000000000000FFFFFFFFFFFFFFFF000000000000000004000000040000000000000001000000040000000100000000000000000000004A85000000000000000000000000000000000000010000004A850000010000004A850000000000000080000000000000FFFFFFFFFFFFFFFF00000000000000000400000004000000000000000100000004000000010000000000000000000000498500000000000000000000000000000000000001000000498500000100000049850000000000000040000000000000FFFFFFFFFFFFFFFF000000000000000004000000040000000000000002000000040000000100000000000000000000004E85000000000000000000000000000000000000010000004E850000010000004E85000009000000FFFF02001200434D756C746950616E654672616D65576E6400010084000000001700000036010000EC0000000000000000000000020000000000000026850000000000000000000000000000000000000100000026850000058000010084000000001700000036010000EC000000000000000000000002000000000000001D85000000000000000000000000000000000000010000001D850000058000010084000000001700000036010000EC000000000000000000000002000000000000001C85000000000000000000000000000000000000010000001C850000058000010084000000001700000036010000EC0000000000000000000000020000000000000014850000000000000000000000000000000000000100000014850000058000010084000000001700000036010000EC0000000000000000000000020000000000000013850000000000000000000000000000000000000100000013850000058000010084000000001700000036010000EC000000000000000000000002000000000000000F85000000000000000000000000000000000000010000000F850000058000010084000000001700000036010000EC000000000000000000000002000000000000000E85000000000000000000000000000000000000010000000E850000058000010084000000001700000036010000EC000000000000000000000002000000000000001A85000000000000000000000000000000000000010000001A850000058000010084000000001700000036010000EC00000000000000000000000200000000000000168500000000000000000000000000000000000001000000168500000000000000000000</DockingPaneAndPaneDividers>\r
              </DockingManager-256>\r
              <MFCToolBar-34048>\r
                  <Name>CMSIS-Pack</Name>\r
-                <Buttons>00200000010000000200FFFF01001100434D4643546F6F6C426172427574746F6ED0840000000004001F000000FFFEFF0000000000000000000000000001000000010000000180D1840000000000001E000000FFFEFF00000000000000000000000000010000000100000000000000FFFEFF0A43004D005300490053002D005000610063006B002F000000</Buttons>\r
+                <Buttons>00200000010000000200FFFF01001100434D4643546F6F6C426172427574746F6ED0840000000004001F000000FFFEFF0000000000000000000000000001000000010000000180D18400000000000020000000FFFEFF00000000000000000000000000010000000100000000000000FFFEFF0A43004D005300490053002D005000610063006B002F000000</Buttons>\r
              </MFCToolBar-34048>\r
              <Pane-34048>\r
                  <ID>34048</ID>\r
@@ -1071,7 +1072,7 @@
              </BasePane-34048>\r
              <MFCToolBar-34049>\r
                  <Name>Debug</Name>\r
-                <Buttons>00200000010000000800FFFF01001100434D4643546F6F6C426172427574746F6E568600000000040034000000FFFEFF0000000000000000000000000001000000010000000180138600000000040030000000FFFEFF00000000000000000000000000010000000100000001805E8600000000040036000000FFFEFF0000000000000000000000000001000000010000000180608600000000040038000000FFFEFF00000000000000000000000000010000000100000001805D8600000000040035000000FFFEFF000000000000000000000000000100000001000000018010860000000004002E000000FFFEFF000000000000000000000000000100000001000000018011860000000000002F000000FFFEFF000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6E148600000000000031000000FFFEFF205200650073006500740020007400680065002000640065006200750067006700650064002000700072006F006700720061006D000A00520065007300650074000000000000000000000000000100000001000000000000000000000001000000080009802087000000000000FFFFFFFFFFFEFF13440069007300610062006C0065006400200028006E006F0020007200650073006500740029000100000000000000000000000100000001000000000000000000000001000000000009802187000000000000FFFFFFFFFFFEFF0853006F006600740077006100720065000100000000000000000000000100000001000000000000000000000001000000000009802287000000000000FFFFFFFFFFFEFF08480061007200640077006100720065000100000000000000000000000100000001000000000000000000000001000000000009802387000000000000FFFFFFFFFFFEFF0443006F00720065000100000000000000000000000100000001000000000000000000000001000000000009802487000000000000FFFFFFFFFFFEFF06530079007300740065006D000100000000000000000000000100000001000000000000000000000001000000000009802987000000000000FFFFFFFFFFFEFF1443006F006E006E00650063007400200064007500720069006E0067002000720065007300650074000100000000000000000000000100000001000000000000000000000001000000000009800000000000000400FFFFFFFFFFFEFF000000000000000000000000000100000001000000000000000000000001000000000009801986000000000000FFFFFFFFFFFEFF000100000000000000000000000100000001000000000000000000000001000000000000000000FFFEFF054400650062007500670046000000</Buttons>\r
+                <Buttons>00200000010000000800FFFF01001100434D4643546F6F6C426172427574746F6E568600000000000035000000FFFEFF0000000000000000000000000001000000010000000180138600000000000031000000FFFEFF00000000000000000000000000010000000100000001805E8600000000000037000000FFFEFF0000000000000000000000000001000000010000000180608600000000000039000000FFFEFF00000000000000000000000000010000000100000001805D8600000000000036000000FFFEFF000000000000000000000000000100000001000000018010860000000000002F000000FFFEFF0000000000000000000000000001000000010000000180118600000000040030000000FFFEFF000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6E148600000000000032000000FFFEFF205200650073006500740020007400680065002000640065006200750067006700650064002000700072006F006700720061006D000A00520065007300650074000000000000000000000000000100000001000000000000000000000001000000060009802087000000000000FFFFFFFFFFFEFF06530079007300740065006D000100000000000000000000000100000001000000000000000000000001000000000009802387000000000000FFFFFFFFFFFEFF0443006F00720065000100000000000000000000000100000001000000000000000000000001000000000009802487000000000000FFFFFFFFFFFEFF0853006F006600740077006100720065000100000000000000000000000100000001000000000000000000000001000000000009802187000000000000FFFFFFFFFFFEFF12480061007200640077006100720065002000720065007300650074002000700069006E000100000000000000000000000100000001000000000000000000000001000000000009800000000000000400FFFFFFFFFFFEFF000000000000000000000000000100000001000000000000000000000001000000000009801986000000000000FFFFFFFFFFFEFF000100000000000000000000000100000001000000000000000000000001000000000000000000FFFEFF054400650062007500670046000000</Buttons>\r
              </MFCToolBar-34049>\r
              <Pane-34049>\r
                  <ID>34049</ID>\r
@@ -1088,7 +1089,7 @@
              </BasePane-34049>\r
              <MFCToolBar-34050>\r
                  <Name>Trace</Name>\r
-                <Buttons>00200000010000000200FFFF01001100434D4643546F6F6C426172427574746F6E539200000000040089000000FFFEFF03450054004D0000000000000000000000000001000000010000000180549200000000040024000000FFFEFF03530057004F00000000000000000000000000010000000100000000000000FFFEFF05540072006100630065002F000000</Buttons>\r
+                <Buttons>00200000010000000200FFFF01001100434D4643546F6F6C426172427574746F6E53920000000004008A000000FFFEFF03450054004D0000000000000000000000000001000000010000000180549200000000000025000000FFFEFF03530057004F00000000000000000000000000010000000100000000000000FFFEFF05540072006100630065002F000000</Buttons>\r
              </MFCToolBar-34050>\r
              <Pane-34050>\r
                  <ID>34050</ID>\r
@@ -1105,7 +1106,7 @@
              </BasePane-34050>\r
              <MFCToolBar-34051>\r
                  <Name>Main</Name>\r
-                <Buttons>00200000010000002100FFFF01001100434D4643546F6F6C426172427574746F6E00E100000000000066000000FFFEFF000000000000000000000000000100000001000000018001E100000000000067000000FFFEFF000000000000000000000000000100000001000000018003E100000000000069000000FFFEFF000000000000000000000000000100000001000000018000810000000000004A000000FFFEFF00000000000000000000000000010000000100000001800000000001000000FFFFFFFFFFFEFF000000000000000000000000000100000001000000018007E10000000000006C000000FFFEFF00000000000000000000000000010000000100000001800000000001000000FFFFFFFFFFFEFF000000000000000000000000000100000001000000018023E10000000004006E000000FFFEFF000000000000000000000000000100000001000000018022E10000000004006D000000FFFEFF000000000000000000000000000100000001000000018025E100000000000070000000FFFEFF00000000000000000000000000010000000100000001800000000001000000FFFFFFFFFFFEFF00000000000000000000000000010000000100000001802BE100000000000073000000FFFEFF00000000000000000000000000010000000100000001802CE100000000040074000000FFFEFF00000000000000000000000000010000000100000001800000000001000000FFFFFFFFFFFEFF000000000000000000000000000100000001000000FFFF01001900434D4643546F6F6C426172436F6D626F426F78427574746F6E4281000000000000FFFFFFFFFFFEFF0001000000000000000100000000000000010000007800000002002050FFFFFFFFFFFEFF0096000000000000000300FFFEFF15780043006F006E00740072006F006C004D00650073007300610067006500420075006600660065007200FFFEFF10480041004C005F0055004100520054005F004D007300700049006E0069007400FFFEFF06670053007400610074006500000000000000000000000000018021810000000004005D000000FFFEFF000000000000000000000000000100000001000000018024E10000000000006F000000FFFEFF000000000000000000000000000100000001000000018028E100000000040071000000FFFEFF000000000000000000000000000100000001000000018029E100000000000072000000FFFEFF000000000000000000000000000100000001000000018002810000000000004C000000FFFEFF0000000000000000000000000001000000010000000180298100000000000061000000FFFEFF000000000000000000000000000100000001000000018027810000000000005F000000FFFEFF0000000000000000000000000001000000010000000180288100000000000060000000FFFEFF00000000000000000000000000010000000100000001801D8100000000000059000000FFFEFF00000000000000000000000000010000000100000001801E810000000004005A000000FFFEFF00000000000000000000000000010000000100000001800000000001000000FFFFFFFFFFFEFF00000000000000000000000000010000000100000001800B8100000000000050000000FFFEFF00000000000000000000000000010000000100000001800C8100000000000051000000FFFEFF00000000000000000000000000010000000100000001805F8600000000000065000000FFFEFF00000000000000000000000000010000000100000001800000000001000000FFFFFFFFFFFEFF00000000000000000000000000010000000100000001801F810000000000005B000000FFFEFF000000000000000000000000000100000001000000018020810000000000005C000000FFFEFF0000000000000000000000000001000000010000000180468100000000020063000000FFFEFF00000000000000000000000000010000000100000000000000FFFEFF044D00610069006E00FF020000</Buttons>\r
+                <Buttons>00200000010000002100FFFF01001100434D4643546F6F6C426172427574746F6E00E100000000000067000000FFFEFF000000000000000000000000000100000001000000018001E100000000000068000000FFFEFF000000000000000000000000000100000001000000018003E10000000000006A000000FFFEFF000000000000000000000000000100000001000000018000810000000000004B000000FFFEFF00000000000000000000000000010000000100000001800000000001000000FFFFFFFFFFFEFF000000000000000000000000000100000001000000018007E10000000000006D000000FFFEFF00000000000000000000000000010000000100000001800000000001000000FFFFFFFFFFFEFF000000000000000000000000000100000001000000018023E10000000004006F000000FFFEFF000000000000000000000000000100000001000000018022E10000000004006E000000FFFEFF000000000000000000000000000100000001000000018025E100000000000071000000FFFEFF00000000000000000000000000010000000100000001800000000001000000FFFFFFFFFFFEFF00000000000000000000000000010000000100000001802BE100000000040074000000FFFEFF00000000000000000000000000010000000100000001802CE100000000040075000000FFFEFF00000000000000000000000000010000000100000001800000000001000000FFFFFFFFFFFEFF000000000000000000000000000100000001000000FFFF01001900434D4643546F6F6C426172436F6D626F426F78427574746F6E4281000000000000FFFFFFFFFFFEFF0001000000000000000100000000000000010000007800000002002050FFFFFFFFFFFEFF0096000000000000000300FFFEFF15780043006F006E00740072006F006C004D00650073007300610067006500420075006600660065007200FFFEFF10480041004C005F0055004100520054005F004D007300700049006E0069007400FFFEFF06670053007400610074006500000000000000000000000000018021810000000004005E000000FFFEFF000000000000000000000000000100000001000000018024E100000000000070000000FFFEFF000000000000000000000000000100000001000000018028E100000000040072000000FFFEFF000000000000000000000000000100000001000000018029E100000000000073000000FFFEFF000000000000000000000000000100000001000000018002810000000000004D000000FFFEFF0000000000000000000000000001000000010000000180298100000000000062000000FFFEFF0000000000000000000000000001000000010000000180278100000000000060000000FFFEFF0000000000000000000000000001000000010000000180288100000000000061000000FFFEFF00000000000000000000000000010000000100000001801D810000000004005A000000FFFEFF00000000000000000000000000010000000100000001801E810000000004005B000000FFFEFF00000000000000000000000000010000000100000001800000000001000000FFFFFFFFFFFEFF00000000000000000000000000010000000100000001800B8100000000000051000000FFFEFF00000000000000000000000000010000000100000001800C8100000000000052000000FFFEFF00000000000000000000000000010000000100000001805F8600000000000066000000FFFEFF00000000000000000000000000010000000100000001800000000001000000FFFFFFFFFFFEFF00000000000000000000000000010000000100000001801F810000000000005C000000FFFEFF000000000000000000000000000100000001000000018020810000000000005D000000FFFEFF0000000000000000000000000001000000010000000180468100000000020064000000FFFEFF00000000000000000000000000010000000100000000000000FFFEFF044D00610069006E00FF020000</Buttons>\r
              </MFCToolBar-34051>\r
              <Pane-34051>\r
                  <ID>34051</ID>\r
@@ -1371,17 +1372,31 @@
              </IarPane-34125>\r
              <Pane-34125>\r
                  <ID>34125</ID>\r
-                <RectRecentFloat>D8010000530000001003000035010000</RectRecentFloat>\r
-                <RectRecentDocked>0000000009060000E10A0000E3070000</RectRecentDocked>\r
+                <RectRecentFloat>470400004A0600007F0500002C070000</RectRecentFloat>\r
+                <RectRecentDocked>0400000027050000C209000009070000</RectRecentDocked>\r
                  <RecentFrameAlignment>32768</RecentFrameAlignment>\r
                  <RecentRowIndex>0</RecentRowIndex>\r
-                <IsFloating>1</IsFloating>\r
+                <IsFloating>0</IsFloating>\r
                  <MRUWidth>32767</MRUWidth>\r
                  <PinState>0</PinState>\r
              </Pane-34125>\r
              <BasePane-34125>\r
-                <IsVisible>0</IsVisible>\r
+                <IsVisible>1</IsVisible>\r
              </BasePane-34125>\r
+            <Pane-34126>\r
+                <ID>34126</ID>\r
+                <RectRecentFloat>FCFFFFFF440000001601000002020000</RectRecentFloat>\r
+                <RectRecentDocked>00000000000000001A010000BE010000</RectRecentDocked>\r
+                <RecentFrameAlignment>16384</RecentFrameAlignment>\r
+                <RecentRowIndex>0</RecentRowIndex>\r
+                <IsFloating>0</IsFloating>\r
+                <MRUWidth>32767</MRUWidth>\r
+                <PinState>0</PinState>\r
+            </Pane-34126>\r
+            <BasePane-34126>\r
+                <IsVisible>0</IsVisible>\r
+            </BasePane-34126>\r
+            <IarPane-34126 />\r
          </Desktop>\r
      </WindowStorage>\r
  </Project>\r
diff --git a/FreeRTOS/Demo/CORTEX_M7_M4_AMP_STM32H745I_Discovery_IAR/settings/Project.dnx b/FreeRTOS/Demo/CORTEX_M7_M4_AMP_STM32H745I_Discovery_IAR/settings/Project.dnx

index 0c9fda0e083da87da2caa6ba74ea62303b85c3c7..63e9675ff20ea7d3eedf3d0fcc34e2bf9b6ef20d 100644 (file)
--- a/FreeRTOS/Demo/CORTEX_M7_M4_AMP_STM32H745I_Discovery_IAR/settings/Project.dnx
+++ b/FreeRTOS/Demo/CORTEX_M7_M4_AMP_STM32H745I_Discovery_IAR/settings/Project.dnx
@@ -4,8 +4,10 @@
          <EnableCache>0</EnableCache>\r
      </ArmDriver>\r
      <StLinkDriver>\r
+        <stlinkserialNo>35333131</stlinkserialNo>\r
+        <stlinkfoundProbes />\r
          <stlinkResetStyle>0</stlinkResetStyle>\r
-        <stlinkResetStrategy>2</stlinkResetStrategy>\r
+        <stlinkResetStrategy>0</stlinkResetStrategy>\r
          <CStepIntDis>_ 0</CStepIntDis>\r
          <LeaveTargetRunning>_ 1</LeaveTargetRunning>\r
      </StLinkDriver>\r
@@ -22,7 +24,7 @@
      </Stack>\r
      <PlDriver>\r
          <FirstRun>0</FirstRun>\r
-        <MemConfigValue>C:\devtools\IAR Systems\Embedded Workbench 8.2\arm\CONFIG\debugger\ST\STM32H7x5_CM4.ddf</MemConfigValue>\r
+        <MemConfigValue>C:\devtools\IAR Systems\Embedded Workbench 8.3\arm\CONFIG\debugger\ST\STM32H745XI_CM7.ddf</MemConfigValue>\r
      </PlDriver>\r
      <Jet>\r
          <JetConnSerialNo>73866</JetConnSerialNo>\r
@@ -34,7 +36,7 @@
          <MultiCoreRunAll>0</MultiCoreRunAll>\r
      </Jet>\r
      <DebugChecksum>\r
-        <Checksum>1765034686</Checksum>\r
+        <Checksum>4234227840</Checksum>\r
      </DebugChecksum>\r
      <Exceptions>\r
          <StopOnUncaught>_ 0</StopOnUncaught>\r
@@ -58,11 +60,8 @@
      </CallStack>\r
      <Disassembly>\r
          <MixedMode>1</MixedMode>\r
+        <InstrCount>0</InstrCount>\r
      </Disassembly>\r
-    <struct_types>\r
-        <Fmt0>struct StreamBufferDef_t-xTail   4       0</Fmt0>\r
-        <Fmt1>struct StreamBufferDef_t-xTriggerLevelBytes      4       0</Fmt1>\r
-    </struct_types>\r
      <Trace1>\r
          <Enabled>0</Enabled>\r
          <ShowSource>1</ShowSource>\r
@@ -79,20 +78,6 @@
          <StallCPU>0</StallCPU>\r
          <NoPCCapture>0</NoPCCapture>\r
      </ETMTraceWindow>\r
-    <Trace2>\r
-        <Enabled>0</Enabled>\r
-        <ShowSource>0</ShowSource>\r
-    </Trace2>\r
-    <SWOTraceWindow>\r
-        <ForcedPcSampling>0</ForcedPcSampling>\r
-        <ForcedInterruptLogs>0</ForcedInterruptLogs>\r
-        <ForcedItmLogs>0</ForcedItmLogs>\r
-        <EventCPI>0</EventCPI>\r
-        <EventEXC>0</EventEXC>\r
-        <EventFOLD>0</EventFOLD>\r
-        <EventLSU>0</EventLSU>\r
-        <EventSLEEP>0</EventSLEEP>\r
-    </SWOTraceWindow>\r
      <PowerLog>\r
          <Title_0>ITrgPwr</Title_0>\r
          <Symbol_0>0 4 0</Symbol_0>\r
@@ -107,6 +92,78 @@
          <Probe0>ITrgPwr</Probe0>\r
          <ProbeSetup0>2 1 1 2 0 0</ProbeSetup0>\r
      </PowerProbe>\r
+    <CodeCoverage>\r
+        <Enabled>0</Enabled>\r
+        <ShowSource>0</ShowSource>\r
+        <HideCovered>0</HideCovered>\r
+    </CodeCoverage>\r
+    <SWOTraceHWSettings>\r
+        <OverrideDefaultClocks>0</OverrideDefaultClocks>\r
+        <CpuClock>400000000</CpuClock>\r
+        <ClockAutoDetect>0</ClockAutoDetect>\r
+        <ClockWanted>2000000</ClockWanted>\r
+        <JtagSpeed>2000000</JtagSpeed>\r
+        <Prescaler>200</Prescaler>\r
+        <TimeStampPrescIndex>0</TimeStampPrescIndex>\r
+        <TimeStampPrescData>0</TimeStampPrescData>\r
+        <PcSampCYCTAP>1</PcSampCYCTAP>\r
+        <PcSampPOSTCNT>15</PcSampPOSTCNT>\r
+        <PcSampIndex>0</PcSampIndex>\r
+        <DataLogMode>0</DataLogMode>\r
+        <ITMportsEnable>0</ITMportsEnable>\r
+        <ITMportsTermIO>0</ITMportsTermIO>\r
+        <ITMportsLogFile>0</ITMportsLogFile>\r
+        <ITMlogFile>$PROJ_DIR$\ITM.log</ITMlogFile>\r
+    </SWOTraceHWSettings>\r
+    <struct_types>\r
+        <Fmt0>struct StreamBufferDef_t-xTail   4       0</Fmt0>\r
+        <Fmt1>struct StreamBufferDef_t-xTriggerLevelBytes      4       0</Fmt1>\r
+    </struct_types>\r
+    <Trace2>\r
+        <Enabled>0</Enabled>\r
+        <ShowSource>0</ShowSource>\r
+    </Trace2>\r
+    <SWOTraceWindow>\r
+        <PcSampling>0</PcSampling>\r
+        <InterruptLogs>0</InterruptLogs>\r
+        <ForcedTimeStamps>0</ForcedTimeStamps>\r
+        <EventCPI>0</EventCPI>\r
+        <EventEXC>0</EventEXC>\r
+        <EventFOLD>0</EventFOLD>\r
+        <EventLSU>0</EventLSU>\r
+        <EventSLEEP>0</EventSLEEP>\r
+    </SWOTraceWindow>\r
+    <DataLog>\r
+        <LogEnabled>0</LogEnabled>\r
+        <GraphEnabled>0</GraphEnabled>\r
+        <ShowTimeLog>1</ShowTimeLog>\r
+        <SumEnabled>0</SumEnabled>\r
+        <ShowTimeSum>1</ShowTimeSum>\r
+    </DataLog>\r
+    <InterruptLog>\r
+        <LogEnabled>0</LogEnabled>\r
+        <GraphEnabled>0</GraphEnabled>\r
+        <ShowTimeLog>1</ShowTimeLog>\r
+        <SumEnabled>0</SumEnabled>\r
+        <ShowTimeSum>1</ShowTimeSum>\r
+        <SumSortOrder>0</SumSortOrder>\r
+    </InterruptLog>\r
+    <EventLog>\r
+        <Title_0>Ch3</Title_0>\r
+        <Symbol_0>0 0 1</Symbol_0>\r
+        <Title_1>Ch2</Title_1>\r
+        <Symbol_1>0 0 1</Symbol_1>\r
+        <Title_2>Ch1</Title_2>\r
+        <Symbol_2>0 0 1</Symbol_2>\r
+        <Title_3>Ch0</Title_3>\r
+        <Symbol_3>0 0 1</Symbol_3>\r
+        <LogEnabled>0</LogEnabled>\r
+        <GraphEnabled>0</GraphEnabled>\r
+        <ShowTimeLog>1</ShowTimeLog>\r
+        <SumEnabled>0</SumEnabled>\r
+        <ShowTimeSum>1</ShowTimeSum>\r
+        <SumSortOrder>0</SumSortOrder>\r
+    </EventLog>\r
      <TermIOLog>\r
          <LoggingEnabled>_ 0</LoggingEnabled>\r
          <LogFile>_ ""</LogFile>\r
@@ -116,6 +173,19 @@
          <LogFile>_ ""</LogFile>\r
          <Category>_ 0</Category>\r
      </LogFile>\r
+    <DriverProfiling>\r
+        <Enabled>0</Enabled>\r
+        <Mode>3</Mode>\r
+        <Graph>0</Graph>\r
+        <Symbiont>0</Symbiont>\r
+        <Exclusions />\r
+    </DriverProfiling>\r
+    <CallStackLog>\r
+        <Enabled>0</Enabled>\r
+    </CallStackLog>\r
+    <CallStackStripe>\r
+        <ShowTiming>1</ShowTiming>\r
+    </CallStackStripe>\r
      <DisassembleMode>\r
          <mode>0</mode>\r
      </DisassembleMode>\r
diff --git a/FreeRTOS/Demo/CORTEX_M7_M4_AMP_STM32H745I_Discovery_IAR/settings/Project.wsdt b/FreeRTOS/Demo/CORTEX_M7_M4_AMP_STM32H745I_Discovery_IAR/settings/Project.wsdt

index 3f21d96d226174a9aa5d42a55389a7083760bffa..706054559723872c147e34c756f753a4379a12b7 100644 (file)
--- a/FreeRTOS/Demo/CORTEX_M7_M4_AMP_STM32H745I_Discovery_IAR/settings/Project.wsdt
+++ b/FreeRTOS/Demo/CORTEX_M7_M4_AMP_STM32H745I_Discovery_IAR/settings/Project.wsdt
@@ -76,7 +76,7 @@
              </IarPane-34049>\r
              <IarPane-34056>\r
                  <ColumnWidth0>18</ColumnWidth0>\r
-                <ColumnWidth1>2725</ColumnWidth1>\r
+                <ColumnWidth1>2442</ColumnWidth1>\r
                  <FilterLevel>2</FilterLevel>\r
                  <LiveFile></LiveFile>\r
                  <LiveLogEnabled>0</LiveLogEnabled>\r
@@ -113,16 +113,16 @@
                  <RecentlyUsedMenus>1</RecentlyUsedMenus>\r
                  <MenuShadows>1</MenuShadows>\r
                  <ShowAllMenusAfterDelay>1</ShowAllMenusAfterDelay>\r
-                <CommandsUsage>CA0000001400108600000300000000DA0000010000000F81000003000000C58600000100000026DE0000010000000C8100000100000000810000040000001A860000010000005E8600000200000028DE0000010000000E810000B4000000C48600000100000041E10000010000001186000001000000058100000700000046810000010000000D8100000300000008860000010000000A810000010000000784000001000000</CommandsUsage>\r
+                <CommandsUsage>D4000000140000DA0000010000001086000003000000C5860000010000000F810000030000000C8100000100000026DE0000010000000081000004000000C4860000010000000E810000BE00000028DE0000010000005E860000020000001A8600000100000041E100000100000005810000070000001186000001000000468100000100000008860000010000000D8100000300000007840000010000000A81000001000000</CommandsUsage>\r
              </MFCToolBarParameters>\r
              <CommandManager>\r
                  <CommandsWithoutImages>67000D8400000F84000008840000FFFFFFFF54840000328100001C81000009840000D484000020F1000010F0000000F0000020F0000030F0000060F0000001B0000002B0000003B0000004B0000005B0000006B0000007B0000008B0000009B000000AB000000BB000000CB000000DB000000EB0000000B00000248100000C84000033840000788400001184000021DE000026DE000028DE000024DE000027DE000025DE00002092000028920000299200003792000038920000259200001E9200001D920000048400000684000032840000778400000784000002840000038400001084000005840000318400000A840000808C000044D500002AE10000498100004A810000008200001C820000018200002F8200001682000018820000198200006786000002DE00000BDE000003DE000005DE000006DE000000DE000001DE0000349200003392000004DE00002492000007DE000000880000018800000288000003880000048800000588000008800000098000000A8000000B8000000C800000158000000A81000001E8000048810000010000000E84000030840000</CommandsWithoutImages>\r
-                <MenuUserImages>29001581000025000000048100001800000026810000290000002CE100003F00000007E100003B000000239200000000000020810000270000000F8100001F00000004E10000390000005F8600003000000000900000420000000C8100001C00000001E10000360000000D8000001700000023E1000039000000098100001A000000178100002700000014810000240000002BE100003E000000008400000B000000008100001900000044920000100000001F810000260000000E8100001E00000003E100003800000025E100003B0000001F9200000D0000002D9200000F00000000E10000350000000B8100001B00000022E1000038000000D18400000C00000041E10000450000001681000026000000058100001900000005E100003A000000518400005600000002E10000330000000D8100001D00000035E10000400000002C9200000E000000</MenuUserImages>\r
+                <MenuUserImages>29002CE100003F000000268100002900000004810000180000001581000025000000239200000000000007E100003B00000000900000420000005F8600003000000004E10000390000000F8100001F000000208100002700000023E10000390000000D8000001700000001E10000360000000C8100001C000000098100001A0000001781000027000000008400000B0000002BE100003E0000001481000024000000449200001000000000810000190000001F9200000D00000025E100003B00000003E10000380000000E8100001E0000001F8100002600000022E10000380000000B8100001B00000000E10000350000002D9200000F00000041E1000045000000D18400000C00000005810000190000001681000026000000518400005600000005E100003A00000035E10000400000000D8100001D00000002E10000330000002C9200000E000000</MenuUserImages>\r
              </CommandManager>\r
              <Pane-59393>\r
                  <ID>0</ID>\r
                  <RectRecentFloat>0A0000000A0000006E0000006E000000</RectRecentFloat>\r
-                <RectRecentDocked>00000000E3070000E10A000000080000</RectRecentDocked>\r
+                <RectRecentDocked>000000002D070000C60900004A070000</RectRecentDocked>\r
                  <RecentFrameAlignment>4096</RecentFrameAlignment>\r
                  <RecentRowIndex>0</RecentRowIndex>\r
                  <IsFloating>0</IsFloating>\r
@@ -148,8 +148,8 @@
              <IarPane-34050 />\r
              <Pane--1>\r
                  <ID>4294967295</ID>\r
-                <RectRecentFloat>3700000085000000BE01000054060000</RectRecentFloat>\r
-                <RectRecentDocked>00000000410000008701000010060000</RectRecentDocked>\r
+                <RectRecentFloat>FCFFFFFF85000000830100009E050000</RectRecentFloat>\r
+                <RectRecentDocked>0000000041000000870100005A050000</RectRecentDocked>\r
                  <RecentFrameAlignment>4096</RecentFrameAlignment>\r
                  <RecentRowIndex>0</RecentRowIndex>\r
                  <IsFloating>0</IsFloating>\r
@@ -162,7 +162,7 @@
              <Pane-34051>\r
                  <ID>34051</ID>\r
                  <RectRecentFloat>000000001700000036010000EC000000</RectRecentFloat>\r
-                <RectRecentDocked>0400000039060000DD0A0000BF070000</RectRecentDocked>\r
+                <RectRecentDocked>0400000083050000C209000009070000</RectRecentDocked>\r
                  <RecentFrameAlignment>32768</RecentFrameAlignment>\r
                  <RecentRowIndex>0</RecentRowIndex>\r
                  <IsFloating>0</IsFloating>\r
@@ -204,7 +204,7 @@
              <Pane-34056>\r
                  <ID>34056</ID>\r
                  <RectRecentFloat>3B020000FC0600003B11000002090000</RectRecentFloat>\r
-                <RectRecentDocked>0400000039060000DD0A0000BF070000</RectRecentDocked>\r
+                <RectRecentDocked>0400000083050000C209000009070000</RectRecentDocked>\r
                  <RecentFrameAlignment>32768</RecentFrameAlignment>\r
                  <RecentRowIndex>0</RecentRowIndex>\r
                  <IsFloating>0</IsFloating>\r
@@ -217,7 +217,7 @@
              <Pane-34057>\r
                  <ID>34057</ID>\r
                  <RectRecentFloat>000000001700000036010000EC000000</RectRecentFloat>\r
-                <RectRecentDocked>0400000039060000DD0A0000BF070000</RectRecentDocked>\r
+                <RectRecentDocked>0400000083050000C209000009070000</RectRecentDocked>\r
                  <RecentFrameAlignment>32768</RecentFrameAlignment>\r
                  <RecentRowIndex>0</RecentRowIndex>\r
                  <IsFloating>0</IsFloating>\r
@@ -228,9 +228,9 @@
                  <IsVisible>0</IsVisible>\r
              </BasePane-34057>\r
              <IarPane-34057>\r
-                <ColumnWidth0>969</ColumnWidth0>\r
-                <ColumnWidth1>138</ColumnWidth1>\r
-                <ColumnWidth2>1661</ColumnWidth2>\r
+                <ColumnWidth0>870</ColumnWidth0>\r
+                <ColumnWidth1>124</ColumnWidth1>\r
+                <ColumnWidth2>1491</ColumnWidth2>\r
                  <FilterLevel>2</FilterLevel>\r
                  <LiveFile></LiveFile>\r
                  <LiveLogEnabled>0</LiveLogEnabled>\r
@@ -239,7 +239,7 @@
              <Pane-34058>\r
                  <ID>34058</ID>\r
                  <RectRecentFloat>000000001700000036010000EC000000</RectRecentFloat>\r
-                <RectRecentDocked>0400000039060000DD0A0000BF070000</RectRecentDocked>\r
+                <RectRecentDocked>0400000083050000C209000009070000</RectRecentDocked>\r
                  <RecentFrameAlignment>32768</RecentFrameAlignment>\r
                  <RecentRowIndex>0</RecentRowIndex>\r
                  <IsFloating>0</IsFloating>\r
@@ -253,7 +253,7 @@
              <Pane-34059>\r
                  <ID>34059</ID>\r
                  <RectRecentFloat>000000001700000036010000EC000000</RectRecentFloat>\r
-                <RectRecentDocked>0400000039060000DD0A0000BF070000</RectRecentDocked>\r
+                <RectRecentDocked>0400000083050000C209000009070000</RectRecentDocked>\r
                  <RecentFrameAlignment>32768</RecentFrameAlignment>\r
                  <RecentRowIndex>0</RecentRowIndex>\r
                  <IsFloating>0</IsFloating>\r
@@ -267,7 +267,7 @@
              <Pane-34060>\r
                  <ID>34060</ID>\r
                  <RectRecentFloat>000000001700000036010000EC000000</RectRecentFloat>\r
-                <RectRecentDocked>0400000039060000DD0A0000BF070000</RectRecentDocked>\r
+                <RectRecentDocked>0400000083050000C209000009070000</RectRecentDocked>\r
                  <RecentFrameAlignment>32768</RecentFrameAlignment>\r
                  <RecentRowIndex>0</RecentRowIndex>\r
                  <IsFloating>0</IsFloating>\r
@@ -278,9 +278,9 @@
                  <IsVisible>1</IsVisible>\r
              </BasePane-34060>\r
              <IarPane-34060>\r
-                <ColumnWidth0>969</ColumnWidth0>\r
-                <ColumnWidth1>138</ColumnWidth1>\r
-                <ColumnWidth2>1661</ColumnWidth2>\r
+                <ColumnWidth0>870</ColumnWidth0>\r
+                <ColumnWidth1>124</ColumnWidth1>\r
+                <ColumnWidth2>1491</ColumnWidth2>\r
                  <FilterLevel>2</FilterLevel>\r
                  <LiveFile></LiveFile>\r
                  <LiveLogEnabled>0</LiveLogEnabled>\r
@@ -289,7 +289,7 @@
              <Pane-34062>\r
                  <ID>34062</ID>\r
                  <RectRecentFloat>000000001700000036010000EC000000</RectRecentFloat>\r
-                <RectRecentDocked>0400000039060000DD0A0000BF070000</RectRecentDocked>\r
+                <RectRecentDocked>0400000083050000C209000009070000</RectRecentDocked>\r
                  <RecentFrameAlignment>32768</RecentFrameAlignment>\r
                  <RecentRowIndex>0</RecentRowIndex>\r
                  <IsFloating>0</IsFloating>\r
@@ -362,7 +362,7 @@
              <Pane-34063>\r
                  <ID>34063</ID>\r
                  <RectRecentFloat>000000001700000018010000C8010000</RectRecentFloat>\r
-                <RectRecentDocked>00000000620000008701000010060000</RectRecentDocked>\r
+                <RectRecentDocked>0000000062000000870100005A050000</RectRecentDocked>\r
                  <RecentFrameAlignment>4096</RecentFrameAlignment>\r
                  <RecentRowIndex>0</RecentRowIndex>\r
                  <IsFloating>0</IsFloating>\r
@@ -373,7 +373,7 @@
                  <IsVisible>1</IsVisible>\r
              </BasePane-34063>\r
              <DockingManager-256>\r
-                <DockingPaneAndPaneDividers>0000000008000000000000000010000001000000FFFFFFFFFFFFFFFF87010000410000008B010000100600000100000002000010040000000100000089FFFFFF4F0C0000FFFFFFFF010000000F850000FFFF02000B004354616262656450616E6500100000010000003700000085000000BE0100005406000000000000410000008701000010060000000000004010005601000000FFFEFF0957006F0072006B0073007000610063006500010000000F85000001000000FFFFFFFFFFFFFFFF00000000000000000000000000000000000000000000000001000000FFFFFFFF0F85000001000000FFFFFFFF0F850000000000000080000000000000FFFFFFFFFFFFFFFF00000000000000000400000004000000000000000100000004000000010000000000000000000000078500000000000000000000000000000000000001000000078500000100000007850000000000000080000000000000FFFFFFFFFFFFFFFF00000000000000000400000004000000000000000100000004000000010000000000000000000000048500000000000000000000000000000000000001000000048500000100000004850000000000000080000001000000FFFFFFFFFFFFFFFF0000000010060000E10A0000140600000100000001000010040000000100000028FBFFFF6B020000FFFFFFFF0700000003850000098500000A8500000B8500000C8500000E85000008850000018000800000010000003700000058060000180B0000270800000000000014060000E10A0000E3070000000000004080005607000000FFFEFF054200750069006C006400010000000385000001000000FFFFFFFFFFFFFFFFFFFEFF0C4400650063006C00610072006100740069006F006E007300000000000985000001000000FFFFFFFFFFFFFFFFFFFEFF0A5200650066006500720065006E00630065007300000000000A85000001000000FFFFFFFFFFFFFFFFFFFEFF0D460069006E006400200069006E002000460069006C0065007300000000000B85000001000000FFFFFFFFFFFFFFFFFFFEFF1541006D0062006900670075006F0075007300200044006500660069006E006900740069006F006E007300010000000C85000001000000FFFFFFFFFFFFFFFFFFFEFF0B54006F006F006C0020004F0075007400700075007400000000000E85000001000000FFFFFFFFFFFFFFFFFFFEFF094400650062007500670020004C006F006700010000000885000001000000FFFFFFFFFFFFFFFF00000000000000000000000000000000000000000000000001000000FFFFFFFF0385000001000000FFFFFFFF0385000004000000FFFF02001200434D756C746950616E654672616D65576E6400010084000000002800000036010000FE0000000000000000000000020000000000000006850000000000000000000000000000000000000100000006850000048000010084000000002800000036010000FE0000000000000000000000020000000000000002850000000000000000000000000000000000000100000002850000048000010084190000004B000000520100002D0100000000000000000000020000000000000012850000000000000000000000000000000000000100000012850000048000010084190000004B000000C90200000501000000000000000000000200000000000000138500000000000000000000000000000000000001000000138500000000000000000000</DockingPaneAndPaneDividers>\r
+                <DockingPaneAndPaneDividers>0000000008000000000000000010000001000000FFFFFFFFFFFFFFFF87010000410000008B0100005A0500000100000002000010040000000100000089FFFFFF4F0C0000FFFFFFFF010000000F850000FFFF02000B004354616262656450616E650010000001000000FCFFFFFF85000000830100009E0500000000000041000000870100005A050000000000004010005601000000FFFEFF0957006F0072006B0073007000610063006500010000000F85000001000000FFFFFFFFFFFFFFFF00000000000000000000000000000000000000000000000001000000FFFFFFFF0F85000001000000FFFFFFFF0F850000000000000080000000000000FFFFFFFFFFFFFFFF00000000000000000400000004000000000000000100000004000000010000000000000000000000078500000000000000000000000000000000000001000000078500000100000007850000000000000080000000000000FFFFFFFFFFFFFFFF00000000000000000400000004000000000000000100000004000000010000000000000000000000048500000000000000000000000000000000000001000000048500000100000004850000000000000080000001000000FFFFFFFFFFFFFFFF000000005A050000C60900005E0500000100000001000010040000000100000028FBFFFF6B020000FFFFFFFF0700000003850000098500000A8500000B8500000C8500000E8500000885000001800080000001000000FCFFFFFFA2050000C209000071070000000000005E050000C60900002D070000000000004080005607000000FFFEFF054200750069006C006400010000000385000001000000FFFFFFFFFFFFFFFFFFFEFF0C4400650063006C00610072006100740069006F006E007300000000000985000001000000FFFFFFFFFFFFFFFFFFFEFF0A5200650066006500720065006E00630065007300000000000A85000001000000FFFFFFFFFFFFFFFFFFFEFF0D460069006E006400200069006E002000460069006C0065007300000000000B85000001000000FFFFFFFFFFFFFFFFFFFEFF1541006D0062006900670075006F0075007300200044006500660069006E006900740069006F006E007300010000000C85000001000000FFFFFFFFFFFFFFFFFFFEFF0B54006F006F006C0020004F0075007400700075007400000000000E85000001000000FFFFFFFFFFFFFFFFFFFEFF094400650062007500670020004C006F006700010000000885000001000000FFFFFFFFFFFFFFFF00000000000000000000000000000000000000000000000001000000FFFFFFFF0385000001000000FFFFFFFF0385000004000000FFFF02001200434D756C746950616E654672616D65576E6400010084000000002800000036010000FE0000000000000000000000020000000000000006850000000000000000000000000000000000000100000006850000048000010084000000002800000036010000FE0000000000000000000000020000000000000002850000000000000000000000000000000000000100000002850000048000010084190000004B000000520100002D0100000000000000000000020000000000000012850000000000000000000000000000000000000100000012850000048000010084190000004B000000C90200000501000000000000000000000200000000000000138500000000000000000000000000000000000001000000138500000000000000000000</DockingPaneAndPaneDividers>\r
              </DockingManager-256>\r
              <MFCToolBar-34048>\r
                  <Name>CMSIS-Pack</Name>\r
@@ -394,7 +394,7 @@
              </BasePane-34048>\r
              <MFCToolBar-34049>\r
                  <Name>Main</Name>\r
-                <Buttons>00200000010000002000FFFF01001100434D4643546F6F6C426172427574746F6E00E100000000000031000000FFFEFF000000000000000000000000000100000001000000018001E100000000000032000000FFFEFF000000000000000000000000000100000001000000018003E100000000040034000000FFFEFF0000000000000000000000000001000000010000000180008100000000000015000000FFFEFF00000000000000000000000000010000000100000001800000000001000000FFFFFFFFFFFEFF000000000000000000000000000100000001000000018007E100000000040037000000FFFEFF00000000000000000000000000010000000100000001800000000001000000FFFFFFFFFFFEFF000000000000000000000000000100000001000000018023E100000000040039000000FFFEFF000000000000000000000000000100000001000000018022E100000000040038000000FFFEFF000000000000000000000000000100000001000000018025E10000000004003B000000FFFEFF00000000000000000000000000010000000100000001800000000001000000FFFFFFFFFFFEFF00000000000000000000000000010000000100000001802BE10000000004003E000000FFFEFF00000000000000000000000000010000000100000001802CE10000000004003F000000FFFEFF00000000000000000000000000010000000100000001800000000001000000FFFFFFFFFFFEFF000000000000000000000000000100000001000000FFFF01001900434D4643546F6F6C426172436F6D626F426F78427574746F6E4281000000000400FFFFFFFFFFFEFF0000000000000000000100000000000000010000007800000002002050FFFFFFFFFFFEFF0096000000000000003400FFFEFF0B6700720061006E006400200074006F00740061006C00FFFEFF15780043006F006E00740072006F006C004D00650073007300610067006500420075006600660065007200FFFEFF107000720076005300650074007500700048006100720064007700610072006500FFFEFF046C006F006F007000FFFEFF0763006F0075006E00740065007200FFFEFF0545004E00440028002900FFFEFF1073006200530045004E0044005F0043004F004D0050004C004500540045004400FFFEFF0A75006C004C006F006F00700043006F0075006E00FFFEFF056C006F006F0070006300FFFEFF1870007200760043006F0072006500320049006E007400650072007200750070007400480061006E0064006C0065007200FFFEFF034C0045004400FFFEFF044C00450044003100FFFEFF044C00450044003200FFFEFF0566006600660066006600FFFEFF1A700072007600570061006900740046006F0072004F00740068006500720043006F007200650054006F0053007400610072007400FFFEFF08480041004C005F0049006E0069007400FFFEFF0555005300410052005400FFFEFF06550053004100520054003000FFFEFF06550053004100520054003100FFFEFF0D70007200760043006F007200650032005400610073006B007300FFFEFF196D00620061004E0055004D004200450052005F004F0046005F0043004F00520045005F0032005F005400410053004B005300FFFEFF045500410052005400FFFEFF0A7500610072007400680061006E0064006C006500FFFEFF12530079007300740065006D0043006C006F0063006B005F0043006F006E00660069006700FFFEFF0A7400720061006E0073006D006900740070006F00FFFEFF0670006F006C006C0065006400FFFEFF087400720061006E0073006D0069007400FFFEFF1F5500530045005F00480041004C005F0055004100520054005F00520045004700490053005400450052005F00430041004C004C004200410043004B005300FFFEFF10480041004C005F0055004100520054005F004D007300700049006E0069007400FFFEFF0D7300650074007500700068006100720064007700610072006500FFFEFF0B480041004C005F00540049004D0045004F0055005400FFFEFF0C63006F006E00660069006700410053005300450052005400FFFEFF0E700075006300540065006D0070004D00650073007300610067006500FFFEFF0C610073007300650072007400630061006C006C0065006400FFFEFF0863004D00650073007300610067006500FFFEFF0F7000750063004D003400410073007300650072007400460069006C006500FFFEFF0555004100520054003300FFFEFF085300540041005400490043005F004100FFFEFF1D76004100700070006C00690063006100740069006F006E00470065007400490064006C0065005400610073006B004D0065006D006F0072007900FFFEFF06530054004100540049004300FFFEFF044200530050005F00FFFEFF16480041004C005F004900320043005F004D004F00440055004C0045005F0045004E00410042004C0045004400FFFEFF03410044004300FFFEFF0E7000720076004D00340043006F00720065005400610073006B007300FFFEFF0A63006F00720065005F0063006D0037002E006800FFFEFF0643004F004D0050004C004500FFFEFF187600470065006E00650072006100740065004D00370054006F004D00340049006E007400650072007200750070007400FFFEFF187600470065006E00650072006100740065004D00340054006F004D00370049006E007400650072007200750070007400FFFEFF097600470065006E0065007200610074006500FFFEFF16480041004C005F004700500049004F005F0045005800540049005F00430061006C006C006200610063006B00FFFEFF18480041004C005F004700500049004F005F0045005800540049005F00490052005100480061006E0064006C0065007200FFFEFF0963006C0065006100720066006C0061006700000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000180218100000000040028000000FFFEFF000000000000000000000000000100000001000000018024E10000000004003A000000FFFEFF000000000000000000000000000100000001000000018028E10000000004003C000000FFFEFF000000000000000000000000000100000001000000018029E10000000004003D000000FFFEFF0000000000000000000000000001000000010000000180028100000000040017000000FFFEFF000000000000000000000000000100000001000000018029810000000004002C000000FFFEFF000000000000000000000000000100000001000000018027810000000004002A000000FFFEFF000000000000000000000000000100000001000000018028810000000004002B000000FFFEFF00000000000000000000000000010000000100000001801D8100000000000024000000FFFEFF00000000000000000000000000010000000100000001801E8100000000040025000000FFFEFF00000000000000000000000000010000000100000001800000000001000000FFFFFFFFFFFEFF00000000000000000000000000010000000100000001800B810000000004001B000000FFFEFF00000000000000000000000000010000000100000001800C810000000000001C000000FFFEFF00000000000000000000000000010000000100000001805F8600000000000030000000FFFEFF00000000000000000000000000010000000100000001800000000001000000FFFFFFFFFFFEFF00000000000000000000000000010000000100000001800E810000000000001E000000FFFEFF00000000000000000000000000010000000100000001800F810000000000001F000000FFFEFF00000000000000000000000000010000000100000000000000FFFEFF044D00610069006E00E8020000</Buttons>\r
+                <Buttons>00200000010000002000FFFF01001100434D4643546F6F6C426172427574746F6E00E100000000000031000000FFFEFF000000000000000000000000000100000001000000018001E100000000000032000000FFFEFF000000000000000000000000000100000001000000018003E100000000040034000000FFFEFF0000000000000000000000000001000000010000000180008100000000000015000000FFFEFF00000000000000000000000000010000000100000001800000000001000000FFFFFFFFFFFEFF000000000000000000000000000100000001000000018007E100000000040037000000FFFEFF00000000000000000000000000010000000100000001800000000001000000FFFFFFFFFFFEFF000000000000000000000000000100000001000000018023E100000000040039000000FFFEFF000000000000000000000000000100000001000000018022E100000000040038000000FFFEFF000000000000000000000000000100000001000000018025E10000000004003B000000FFFEFF00000000000000000000000000010000000100000001800000000001000000FFFFFFFFFFFEFF00000000000000000000000000010000000100000001802BE10000000004003E000000FFFEFF00000000000000000000000000010000000100000001802CE10000000004003F000000FFFEFF00000000000000000000000000010000000100000001800000000001000000FFFFFFFFFFFEFF000000000000000000000000000100000001000000FFFF01001900434D4643546F6F6C426172436F6D626F426F78427574746F6E4281000000000400FFFFFFFFFFFEFF0001000000000000000100000000000000010000007800000002002050FFFFFFFFFFFEFF0096000000000000003400FFFEFF0B6700720061006E006400200074006F00740061006C00FFFEFF15780043006F006E00740072006F006C004D00650073007300610067006500420075006600660065007200FFFEFF107000720076005300650074007500700048006100720064007700610072006500FFFEFF046C006F006F007000FFFEFF0763006F0075006E00740065007200FFFEFF0545004E00440028002900FFFEFF1073006200530045004E0044005F0043004F004D0050004C004500540045004400FFFEFF0A75006C004C006F006F00700043006F0075006E00FFFEFF056C006F006F0070006300FFFEFF1870007200760043006F0072006500320049006E007400650072007200750070007400480061006E0064006C0065007200FFFEFF034C0045004400FFFEFF044C00450044003100FFFEFF044C00450044003200FFFEFF0566006600660066006600FFFEFF1A700072007600570061006900740046006F0072004F00740068006500720043006F007200650054006F0053007400610072007400FFFEFF08480041004C005F0049006E0069007400FFFEFF0555005300410052005400FFFEFF06550053004100520054003000FFFEFF06550053004100520054003100FFFEFF0D70007200760043006F007200650032005400610073006B007300FFFEFF196D00620061004E0055004D004200450052005F004F0046005F0043004F00520045005F0032005F005400410053004B005300FFFEFF045500410052005400FFFEFF0A7500610072007400680061006E0064006C006500FFFEFF12530079007300740065006D0043006C006F0063006B005F0043006F006E00660069006700FFFEFF0A7400720061006E0073006D006900740070006F00FFFEFF0670006F006C006C0065006400FFFEFF087400720061006E0073006D0069007400FFFEFF1F5500530045005F00480041004C005F0055004100520054005F00520045004700490053005400450052005F00430041004C004C004200410043004B005300FFFEFF10480041004C005F0055004100520054005F004D007300700049006E0069007400FFFEFF0D7300650074007500700068006100720064007700610072006500FFFEFF0B480041004C005F00540049004D0045004F0055005400FFFEFF0C63006F006E00660069006700410053005300450052005400FFFEFF0E700075006300540065006D0070004D00650073007300610067006500FFFEFF0C610073007300650072007400630061006C006C0065006400FFFEFF0863004D00650073007300610067006500FFFEFF0F7000750063004D003400410073007300650072007400460069006C006500FFFEFF0555004100520054003300FFFEFF085300540041005400490043005F004100FFFEFF1D76004100700070006C00690063006100740069006F006E00470065007400490064006C0065005400610073006B004D0065006D006F0072007900FFFEFF06530054004100540049004300FFFEFF044200530050005F00FFFEFF16480041004C005F004900320043005F004D004F00440055004C0045005F0045004E00410042004C0045004400FFFEFF03410044004300FFFEFF0E7000720076004D00340043006F00720065005400610073006B007300FFFEFF0A63006F00720065005F0063006D0037002E006800FFFEFF0643004F004D0050004C004500FFFEFF187600470065006E00650072006100740065004D00370054006F004D00340049006E007400650072007200750070007400FFFEFF187600470065006E00650072006100740065004D00340054006F004D00370049006E007400650072007200750070007400FFFEFF097600470065006E0065007200610074006500FFFEFF16480041004C005F004700500049004F005F0045005800540049005F00430061006C006C006200610063006B00FFFEFF18480041004C005F004700500049004F005F0045005800540049005F00490052005100480061006E0064006C0065007200FFFEFF0963006C0065006100720066006C0061006700000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000180218100000000040028000000FFFEFF000000000000000000000000000100000001000000018024E10000000004003A000000FFFEFF000000000000000000000000000100000001000000018028E10000000004003C000000FFFEFF000000000000000000000000000100000001000000018029E10000000004003D000000FFFEFF0000000000000000000000000001000000010000000180028100000000040017000000FFFEFF000000000000000000000000000100000001000000018029810000000004002C000000FFFEFF000000000000000000000000000100000001000000018027810000000004002A000000FFFEFF000000000000000000000000000100000001000000018028810000000004002B000000FFFEFF00000000000000000000000000010000000100000001801D8100000000040024000000FFFEFF00000000000000000000000000010000000100000001801E8100000000040025000000FFFEFF00000000000000000000000000010000000100000001800000000001000000FFFFFFFFFFFEFF00000000000000000000000000010000000100000001800B810000000004001B000000FFFEFF00000000000000000000000000010000000100000001800C810000000000001C000000FFFEFF00000000000000000000000000010000000100000001805F8600000000000030000000FFFEFF00000000000000000000000000010000000100000001800000000001000000FFFFFFFFFFFEFF00000000000000000000000000010000000100000001800E810000000000001E000000FFFEFF00000000000000000000000000010000000100000001800F810000000000001F000000FFFEFF00000000000000000000000000010000000100000000000000FFFEFF044D00610069006E00E8020000</Buttons>\r
              </MFCToolBar-34049>\r
              <Pane-34049>\r
                  <ID>34049</ID>\r
@@ -469,7 +469,7 @@
          </Desktop>\r
          <MDIWindows>\r
              <MDIClientArea-0>\r
-                <MDITabsState>010000000300000001000000000000000000000001000000010000000200000000000000010000000100000000000000280000002800000001000000090000000100000001000000FFFEFF132400570053005F0044004900520024005C0043004D0034005C006D00610069006E002E00630001000000FFFF010014004966436F6E74656E7453746F72616765496D706CFFFEFF00FFFEFFFF2A013C003F0078006D006C002000760065007200730069006F006E003D00220031002E0030002200200065006E0063006F00640069006E0067003D0022005500540046002D00380022003F003E000A003C0052006F006F0074003E000A0020002000200020003C004E0075006D0052006F00770073003E0031003C002F004E0075006D0052006F00770073003E000A0020002000200020003C004E0075006D0043006F006C0073003E0031003C002F004E0075006D0043006F006C0073003E000A0020002000200020003C00580050006F0073003E0030003C002F00580050006F0073003E000A0020002000200020003C00590050006F0073003E0030003C002F00590050006F0073003E000A0020002000200020003C00530065006C00530074006100720074003E0030003C002F00530065006C00530074006100720074003E000A0020002000200020003C00530065006C0045006E0064003E0030003C002F00530065006C0045006E0064003E000A0020002000200020003C00580050006F00730032003E0030003C002F00580050006F00730032003E000A0020002000200020003C00590050006F00730032003E003200360036003C002F00590050006F00730032003E000A0020002000200020003C00530065006C005300740061007200740032003E00310033003100310037003C002F00530065006C005300740061007200740032003E000A0020002000200020003C00530065006C0045006E00640032003E00310033003100320036003C002F00530065006C0045006E00640032003E000A003C002F0052006F006F0074003E000A00FFFEFF066D00610069006E002E00630000000000FFFFFFFFFFFFFFFFFFFEFF132400570053005F0044004900520024005C0043004D0037005C006D00610069006E002E006300010000000180FFFEFF00FFFEFFFF27013C003F0078006D006C002000760065007200730069006F006E003D00220031002E0030002200200065006E0063006F00640069006E0067003D0022005500540046002D00380022003F003E000A003C0052006F006F0074003E000A0020002000200020003C004E0075006D0052006F00770073003E0031003C002F004E0075006D0052006F00770073003E000A0020002000200020003C004E0075006D0043006F006C0073003E0031003C002F004E0075006D0043006F006C0073003E000A0020002000200020003C00580050006F0073003E0030003C002F00580050006F0073003E000A0020002000200020003C00590050006F0073003E0030003C002F00590050006F0073003E000A0020002000200020003C00530065006C00530074006100720074003E0030003C002F00530065006C00530074006100720074003E000A0020002000200020003C00530065006C0045006E0064003E0030003C002F00530065006C0045006E0064003E000A0020002000200020003C00580050006F00730032003E0030003C002F00580050006F00730032003E000A0020002000200020003C00590050006F00730032003E00390033003C002F00590050006F00730032003E000A0020002000200020003C00530065006C005300740061007200740032003E0036003300350032003C002F00530065006C005300740061007200740032003E000A0020002000200020003C00530065006C0045006E00640032003E0036003300350032003C002F00530065006C0045006E00640032003E000A003C002F0052006F006F0074003E000A00FFFEFF066D00610069006E002E00630000000000FFFFFFFFFFFFFFFFFFFEFF252400570053005F0044004900520024005C0043004D0034005C0069006E0063006C007500640065005C004600720065006500520054004F00530043006F006E006600690067002E006800010000000180FFFEFF00FFFEFFFF27013C003F0078006D006C002000760065007200730069006F006E003D00220031002E0030002200200065006E0063006F00640069006E0067003D0022005500540046002D00380022003F003E000A003C0052006F006F0074003E000A0020002000200020003C004E0075006D0052006F00770073003E0031003C002F004E0075006D0052006F00770073003E000A0020002000200020003C004E0075006D0043006F006C0073003E0031003C002F004E0075006D0043006F006C0073003E000A0020002000200020003C00580050006F0073003E0030003C002F00580050006F0073003E000A0020002000200020003C00590050006F0073003E0030003C002F00590050006F0073003E000A0020002000200020003C00530065006C00530074006100720074003E0030003C002F00530065006C00530074006100720074003E000A0020002000200020003C00530065006C0045006E0064003E0030003C002F00530065006C0045006E0064003E000A0020002000200020003C00580050006F00730032003E0030003C002F00580050006F00730032003E000A0020002000200020003C00590050006F00730032003E00330038003C002F00590050006F00730032003E000A0020002000200020003C00530065006C005300740061007200740032003E0036003300330033003C002F00530065006C005300740061007200740032003E000A0020002000200020003C00530065006C0045006E00640032003E0036003300350037003C002F00530065006C0045006E00640032003E000A003C002F0052006F006F0074003E000A00FFFEFF104600720065006500520054004F00530043006F006E006600690067002E00680000000000FFFFFFFFFFFFFFFFFFFEFF252400570053005F0044004900520024005C002E002E005C002E002E005C0053006F0075007200630065005C00730074007200650061006D005F006200750066006600650072002E006300010000000180FFFEFF00FFFEFFFF2B013C003F0078006D006C002000760065007200730069006F006E003D00220031002E0030002200200065006E0063006F00640069006E0067003D0022005500540046002D00380022003F003E000A003C0052006F006F0074003E000A0020002000200020003C004E0075006D0052006F00770073003E0031003C002F004E0075006D0052006F00770073003E000A0020002000200020003C004E0075006D0043006F006C0073003E0031003C002F004E0075006D0043006F006C0073003E000A0020002000200020003C00580050006F0073003E0030003C002F00580050006F0073003E000A0020002000200020003C00590050006F0073003E0030003C002F00590050006F0073003E000A0020002000200020003C00530065006C00530074006100720074003E0030003C002F00530065006C00530074006100720074003E000A0020002000200020003C00530065006C0045006E0064003E0030003C002F00530065006C0045006E0064003E000A0020002000200020003C00580050006F00730032003E0030003C002F00580050006F00730032003E000A0020002000200020003C00590050006F00730032003E0031003000310036003C002F00590050006F00730032003E000A0020002000200020003C00530065006C005300740061007200740032003E00330035003900370037003C002F00530065006C005300740061007200740032003E000A0020002000200020003C00530065006C0045006E00640032003E00330036003600330032003C002F00530065006C0045006E00640032003E000A003C002F0052006F006F0074003E000A00FFFEFF0F730074007200650061006D005F006200750066006600650072002E00630000000000FFFFFFFFFFFFFFFFFFFEFF1B2400570053005F0044004900520024005C0043004D0034005C00730074006D003300320068003700780078005F00690074002E006300010000000180FFFEFF00FFFEFFFF24013C003F0078006D006C002000760065007200730069006F006E003D00220031002E0030002200200065006E0063006F00640069006E0067003D0022005500540046002D00380022003F003E000A003C0052006F006F0074003E000A0020002000200020003C004E0075006D0052006F00770073003E0031003C002F004E0075006D0052006F00770073003E000A0020002000200020003C004E0075006D0043006F006C0073003E0031003C002F004E0075006D0043006F006C0073003E000A0020002000200020003C00580050006F0073003E0030003C002F00580050006F0073003E000A0020002000200020003C00590050006F0073003E0030003C002F00590050006F0073003E000A0020002000200020003C00530065006C00530074006100720074003E0030003C002F00530065006C00530074006100720074003E000A0020002000200020003C00530065006C0045006E0064003E0030003C002F00530065006C0045006E0064003E000A0020002000200020003C00580050006F00730032003E0030003C002F00580050006F00730032003E000A0020002000200020003C00590050006F00730032003E0030003C002F00590050006F00730032003E000A0020002000200020003C00530065006C005300740061007200740032003E003900330038003C002F00530065006C005300740061007200740032003E000A0020002000200020003C00530065006C0045006E00640032003E003900360034003C002F00530065006C0045006E00640032003E000A003C002F0052006F006F0074003E000A00FFFEFF0E730074006D003300320068003700780078005F00690074002E00630000000000FFFFFFFFFFFFFFFFFFFEFF1B2400570053005F0044004900520024005C0043004D0037005C00730074006D003300320068003700780078005F00690074002E006300010000000180FFFEFF00FFFEFFFF20013C003F0078006D006C002000760065007200730069006F006E003D00220031002E0030002200200065006E0063006F00640069006E0067003D0022005500540046002D00380022003F003E000A003C0052006F006F0074003E000A0020002000200020003C004E0075006D0052006F00770073003E0031003C002F004E0075006D0052006F00770073003E000A0020002000200020003C004E0075006D0043006F006C0073003E0031003C002F004E0075006D0043006F006C0073003E000A0020002000200020003C00580050006F0073003E0030003C002F00580050006F0073003E000A0020002000200020003C00590050006F0073003E0030003C002F00590050006F0073003E000A0020002000200020003C00530065006C00530074006100720074003E0030003C002F00530065006C00530074006100720074003E000A0020002000200020003C00530065006C0045006E0064003E0030003C002F00530065006C0045006E0064003E000A0020002000200020003C00580050006F00730032003E0030003C002F00580050006F00730032003E000A0020002000200020003C00590050006F00730032003E0030003C002F00590050006F00730032003E000A0020002000200020003C00530065006C005300740061007200740032003E0030003C002F00530065006C005300740061007200740032003E000A0020002000200020003C00530065006C0045006E00640032003E0030003C002F00530065006C0045006E00640032003E000A003C002F0052006F006F0074003E000A00FFFEFF0E730074006D003300320068003700780078005F00690074002E00630000000000FFFFFFFFFFFFFFFFFFFEFF232400570053005F0044004900520024005C0043004D0037005C0069006E0063006C007500640065005C00730074006D003300320068003700780078005F00690074002E006800010000000180FFFEFF00FFFEFFFF26013C003F0078006D006C002000760065007200730069006F006E003D00220031002E0030002200200065006E0063006F00640069006E0067003D0022005500540046002D00380022003F003E000A003C0052006F006F0074003E000A0020002000200020003C004E0075006D0052006F00770073003E0031003C002F004E0075006D0052006F00770073003E000A0020002000200020003C004E0075006D0043006F006C0073003E0031003C002F004E0075006D0043006F006C0073003E000A0020002000200020003C00580050006F0073003E0030003C002F00580050006F0073003E000A0020002000200020003C00590050006F0073003E0030003C002F00590050006F0073003E000A0020002000200020003C00530065006C00530074006100720074003E0030003C002F00530065006C00530074006100720074003E000A0020002000200020003C00530065006C0045006E0064003E0030003C002F00530065006C0045006E0064003E000A0020002000200020003C00580050006F00730032003E0030003C002F00580050006F00730032003E000A0020002000200020003C00590050006F00730032003E0030003C002F00590050006F00730032003E000A0020002000200020003C00530065006C005300740061007200740032003E0031003700310038003C002F00530065006C005300740061007200740032003E000A0020002000200020003C00530065006C0045006E00640032003E0031003700310038003C002F00530065006C0045006E00640032003E000A003C002F0052006F006F0074003E000A00FFFEFF0E730074006D003300320068003700780078005F00690074002E00680000000000FFFFFFFFFFFFFFFFFFFEFF1D2400570053005F0044004900520024005C002E002E005C002E002E005C0053006F0075007200630065005C007400610073006B0073002E006300010000000180FFFEFF00FFFEFFFF2D013C003F0078006D006C002000760065007200730069006F006E003D00220031002E0030002200200065006E0063006F00640069006E0067003D0022005500540046002D00380022003F003E000A003C0052006F006F0074003E000A0020002000200020003C004E0075006D0052006F00770073003E0031003C002F004E0075006D0052006F00770073003E000A0020002000200020003C004E0075006D0043006F006C0073003E0031003C002F004E0075006D0043006F006C0073003E000A0020002000200020003C00580050006F0073003E0030003C002F00580050006F0073003E000A0020002000200020003C00590050006F0073003E0030003C002F00590050006F0073003E000A0020002000200020003C00530065006C00530074006100720074003E0030003C002F00530065006C00530074006100720074003E000A0020002000200020003C00530065006C0045006E0064003E0030003C002F00530065006C0045006E0064003E000A0020002000200020003C00580050006F00730032003E0030003C002F00580050006F00730032003E000A0020002000200020003C00590050006F00730032003E0033003500340032003C002F00590050006F00730032003E000A0020002000200020003C00530065006C005300740061007200740032003E003100320030003800300039003C002F00530065006C005300740061007200740032003E000A0020002000200020003C00530065006C0045006E00640032003E003100320030003800300039003C002F00530065006C0045006E00640032003E000A003C002F0052006F006F0074003E000A00FFFEFF077400610073006B0073002E00630000000000FFFFFFFFFFFFFFFFFFFEFF2E2400570053005F0044004900520024005C002E002E005C002E002E005C0053006F0075007200630065005C0069006E0063006C007500640065005C006D006500730073006100670065005F006200750066006600650072002E006800010000000180FFFEFF00FFFEFFFF2A013C003F0078006D006C002000760065007200730069006F006E003D00220031002E0030002200200065006E0063006F00640069006E0067003D0022005500540046002D00380022003F003E000A003C0052006F006F0074003E000A0020002000200020003C004E0075006D0052006F00770073003E0031003C002F004E0075006D0052006F00770073003E000A0020002000200020003C004E0075006D0043006F006C0073003E0031003C002F004E0075006D0043006F006C0073003E000A0020002000200020003C00580050006F0073003E0030003C002F00580050006F0073003E000A0020002000200020003C00590050006F0073003E0030003C002F00590050006F0073003E000A0020002000200020003C00530065006C00530074006100720074003E0030003C002F00530065006C00530074006100720074003E000A0020002000200020003C00530065006C0045006E0064003E0030003C002F00530065006C0045006E0064003E000A0020002000200020003C00580050006F00730032003E0030003C002F00580050006F00730032003E000A0020002000200020003C00590050006F00730032003E003600390038003C002F00590050006F00730032003E000A0020002000200020003C00530065006C005300740061007200740032003E00330035003700350034003C002F00530065006C005300740061007200740032003E000A0020002000200020003C00530065006C0045006E00640032003E00330035003700380037003C002F00530065006C0045006E00640032003E000A003C002F0052006F006F0074003E000A00FFFEFF106D006500730073006100670065005F006200750066006600650072002E00680000000000FFFFFFFFFFFFFFFF0000000010000000C5D4F200FFDC7800BECEA100F0A0A100BCA8E1009CC1B600F7B88600D9ADC200A5C2D700B3A6BE00EAD6A300F6FA7D00B5E99D005FC3CF00C1838300CACAD500010000000100000002000000C201000085000000180B000054060000</MDITabsState>\r
+                <MDITabsState>010000000300000001000000000000000000000001000000010000000200000000000000010000000100000000000000280000002800000001000000090000000700000001000000FFFEFF132400570053005F0044004900520024005C0043004D0034005C006D00610069006E002E00630001000000FFFF010014004966436F6E74656E7453746F72616765496D706CFFFEFF00FFFEFFFF2A013C003F0078006D006C002000760065007200730069006F006E003D00220031002E0030002200200065006E0063006F00640069006E0067003D0022005500540046002D00380022003F003E000A003C0052006F006F0074003E000A0020002000200020003C004E0075006D0052006F00770073003E0031003C002F004E0075006D0052006F00770073003E000A0020002000200020003C004E0075006D0043006F006C0073003E0031003C002F004E0075006D0043006F006C0073003E000A0020002000200020003C00580050006F0073003E0030003C002F00580050006F0073003E000A0020002000200020003C00590050006F0073003E0030003C002F00590050006F0073003E000A0020002000200020003C00530065006C00530074006100720074003E0030003C002F00530065006C00530074006100720074003E000A0020002000200020003C00530065006C0045006E0064003E0030003C002F00530065006C0045006E0064003E000A0020002000200020003C00580050006F00730032003E0030003C002F00580050006F00730032003E000A0020002000200020003C00590050006F00730032003E003100360039003C002F00590050006F00730032003E000A0020002000200020003C00530065006C005300740061007200740032003E00310030003700330037003C002F00530065006C005300740061007200740032003E000A0020002000200020003C00530065006C0045006E00640032003E00310030003700330037003C002F00530065006C0045006E00640032003E000A003C002F0052006F006F0074003E000A00FFFEFF066D00610069006E002E00630000000000FFFFFFFFFFFFFFFFFFFEFF132400570053005F0044004900520024005C0043004D0037005C006D00610069006E002E006300010000000180FFFEFF00FFFEFFFF2A013C003F0078006D006C002000760065007200730069006F006E003D00220031002E0030002200200065006E0063006F00640069006E0067003D0022005500540046002D00380022003F003E000A003C0052006F006F0074003E000A0020002000200020003C004E0075006D0052006F00770073003E0031003C002F004E0075006D0052006F00770073003E000A0020002000200020003C004E0075006D0043006F006C0073003E0031003C002F004E0075006D0043006F006C0073003E000A0020002000200020003C00580050006F0073003E0030003C002F00580050006F0073003E000A0020002000200020003C00590050006F0073003E0030003C002F00590050006F0073003E000A0020002000200020003C00530065006C00530074006100720074003E0030003C002F00530065006C00530074006100720074003E000A0020002000200020003C00530065006C0045006E0064003E0030003C002F00530065006C0045006E0064003E000A0020002000200020003C00580050006F00730032003E0030003C002F00580050006F00730032003E000A0020002000200020003C00590050006F00730032003E003100360030003C002F00590050006F00730032003E000A0020002000200020003C00530065006C005300740061007200740032003E00310030003500370033003C002F00530065006C005300740061007200740032003E000A0020002000200020003C00530065006C0045006E00640032003E00310030003500370033003C002F00530065006C0045006E00640032003E000A003C002F0052006F006F0074003E000A00FFFEFF066D00610069006E002E00630000000000FFFFFFFFFFFFFFFFFFFEFF252400570053005F0044004900520024005C0043004D0034005C0069006E0063006C007500640065005C004600720065006500520054004F00530043006F006E006600690067002E006800010000000180FFFEFF00FFFEFFFF27013C003F0078006D006C002000760065007200730069006F006E003D00220031002E0030002200200065006E0063006F00640069006E0067003D0022005500540046002D00380022003F003E000A003C0052006F006F0074003E000A0020002000200020003C004E0075006D0052006F00770073003E0031003C002F004E0075006D0052006F00770073003E000A0020002000200020003C004E0075006D0043006F006C0073003E0031003C002F004E0075006D0043006F006C0073003E000A0020002000200020003C00580050006F0073003E0030003C002F00580050006F0073003E000A0020002000200020003C00590050006F0073003E0030003C002F00590050006F0073003E000A0020002000200020003C00530065006C00530074006100720074003E0030003C002F00530065006C00530074006100720074003E000A0020002000200020003C00530065006C0045006E0064003E0030003C002F00530065006C0045006E0064003E000A0020002000200020003C00580050006F00730032003E0030003C002F00580050006F00730032003E000A0020002000200020003C00590050006F00730032003E00320039003C002F00590050006F00730032003E000A0020002000200020003C00530065006C005300740061007200740032003E0036003300330033003C002F00530065006C005300740061007200740032003E000A0020002000200020003C00530065006C0045006E00640032003E0036003300350037003C002F00530065006C0045006E00640032003E000A003C002F0052006F006F0074003E000A00FFFEFF104600720065006500520054004F00530043006F006E006600690067002E00680000000000FFFFFFFFFFFFFFFFFFFEFF252400570053005F0044004900520024005C002E002E005C002E002E005C0053006F0075007200630065005C00730074007200650061006D005F006200750066006600650072002E006300010000000180FFFEFF00FFFEFFFF2A013C003F0078006D006C002000760065007200730069006F006E003D00220031002E0030002200200065006E0063006F00640069006E0067003D0022005500540046002D00380022003F003E000A003C0052006F006F0074003E000A0020002000200020003C004E0075006D0052006F00770073003E0031003C002F004E0075006D0052006F00770073003E000A0020002000200020003C004E0075006D0043006F006C0073003E0031003C002F004E0075006D0043006F006C0073003E000A0020002000200020003C00580050006F0073003E0030003C002F00580050006F0073003E000A0020002000200020003C00590050006F0073003E0030003C002F00590050006F0073003E000A0020002000200020003C00530065006C00530074006100720074003E0030003C002F00530065006C00530074006100720074003E000A0020002000200020003C00530065006C0045006E0064003E0030003C002F00530065006C0045006E0064003E000A0020002000200020003C00580050006F00730032003E0030003C002F00580050006F00730032003E000A0020002000200020003C00590050006F00730032003E003900390032003C002F00590050006F00730032003E000A0020002000200020003C00530065006C005300740061007200740032003E00330035003900370037003C002F00530065006C005300740061007200740032003E000A0020002000200020003C00530065006C0045006E00640032003E00330036003600330032003C002F00530065006C0045006E00640032003E000A003C002F0052006F006F0074003E000A00FFFEFF0F730074007200650061006D005F006200750066006600650072002E00630000000000FFFFFFFFFFFFFFFFFFFEFF1B2400570053005F0044004900520024005C0043004D0034005C00730074006D003300320068003700780078005F00690074002E006300010000000180FFFEFF00FFFEFFFF24013C003F0078006D006C002000760065007200730069006F006E003D00220031002E0030002200200065006E0063006F00640069006E0067003D0022005500540046002D00380022003F003E000A003C0052006F006F0074003E000A0020002000200020003C004E0075006D0052006F00770073003E0031003C002F004E0075006D0052006F00770073003E000A0020002000200020003C004E0075006D0043006F006C0073003E0031003C002F004E0075006D0043006F006C0073003E000A0020002000200020003C00580050006F0073003E0030003C002F00580050006F0073003E000A0020002000200020003C00590050006F0073003E0030003C002F00590050006F0073003E000A0020002000200020003C00530065006C00530074006100720074003E0030003C002F00530065006C00530074006100720074003E000A0020002000200020003C00530065006C0045006E0064003E0030003C002F00530065006C0045006E0064003E000A0020002000200020003C00580050006F00730032003E0030003C002F00580050006F00730032003E000A0020002000200020003C00590050006F00730032003E0030003C002F00590050006F00730032003E000A0020002000200020003C00530065006C005300740061007200740032003E003900330038003C002F00530065006C005300740061007200740032003E000A0020002000200020003C00530065006C0045006E00640032003E003900360034003C002F00530065006C0045006E00640032003E000A003C002F0052006F006F0074003E000A00FFFEFF0E730074006D003300320068003700780078005F00690074002E00630000000000FFFFFFFFFFFFFFFFFFFEFF1B2400570053005F0044004900520024005C0043004D0037005C00730074006D003300320068003700780078005F00690074002E006300010000000180FFFEFF00FFFEFFFF20013C003F0078006D006C002000760065007200730069006F006E003D00220031002E0030002200200065006E0063006F00640069006E0067003D0022005500540046002D00380022003F003E000A003C0052006F006F0074003E000A0020002000200020003C004E0075006D0052006F00770073003E0031003C002F004E0075006D0052006F00770073003E000A0020002000200020003C004E0075006D0043006F006C0073003E0031003C002F004E0075006D0043006F006C0073003E000A0020002000200020003C00580050006F0073003E0030003C002F00580050006F0073003E000A0020002000200020003C00590050006F0073003E0030003C002F00590050006F0073003E000A0020002000200020003C00530065006C00530074006100720074003E0030003C002F00530065006C00530074006100720074003E000A0020002000200020003C00530065006C0045006E0064003E0030003C002F00530065006C0045006E0064003E000A0020002000200020003C00580050006F00730032003E0030003C002F00580050006F00730032003E000A0020002000200020003C00590050006F00730032003E0030003C002F00590050006F00730032003E000A0020002000200020003C00530065006C005300740061007200740032003E0030003C002F00530065006C005300740061007200740032003E000A0020002000200020003C00530065006C0045006E00640032003E0030003C002F00530065006C0045006E00640032003E000A003C002F0052006F006F0074003E000A00FFFEFF0E730074006D003300320068003700780078005F00690074002E00630000000000FFFFFFFFFFFFFFFFFFFEFF232400570053005F0044004900520024005C0043004D0037005C0069006E0063006C007500640065005C00730074006D003300320068003700780078005F00690074002E006800010000000180FFFEFF00FFFEFFFF26013C003F0078006D006C002000760065007200730069006F006E003D00220031002E0030002200200065006E0063006F00640069006E0067003D0022005500540046002D00380022003F003E000A003C0052006F006F0074003E000A0020002000200020003C004E0075006D0052006F00770073003E0031003C002F004E0075006D0052006F00770073003E000A0020002000200020003C004E0075006D0043006F006C0073003E0031003C002F004E0075006D0043006F006C0073003E000A0020002000200020003C00580050006F0073003E0030003C002F00580050006F0073003E000A0020002000200020003C00590050006F0073003E0030003C002F00590050006F0073003E000A0020002000200020003C00530065006C00530074006100720074003E0030003C002F00530065006C00530074006100720074003E000A0020002000200020003C00530065006C0045006E0064003E0030003C002F00530065006C0045006E0064003E000A0020002000200020003C00580050006F00730032003E0030003C002F00580050006F00730032003E000A0020002000200020003C00590050006F00730032003E0030003C002F00590050006F00730032003E000A0020002000200020003C00530065006C005300740061007200740032003E0031003700310038003C002F00530065006C005300740061007200740032003E000A0020002000200020003C00530065006C0045006E00640032003E0031003700310038003C002F00530065006C0045006E00640032003E000A003C002F0052006F006F0074003E000A00FFFEFF0E730074006D003300320068003700780078005F00690074002E00680000000000FFFFFFFFFFFFFFFFFFFEFF1D2400570053005F0044004900520024005C002E002E005C002E002E005C0053006F0075007200630065005C007400610073006B0073002E006300010000000180FFFEFF00FFFEFFFF2D013C003F0078006D006C002000760065007200730069006F006E003D00220031002E0030002200200065006E0063006F00640069006E0067003D0022005500540046002D00380022003F003E000A003C0052006F006F0074003E000A0020002000200020003C004E0075006D0052006F00770073003E0031003C002F004E0075006D0052006F00770073003E000A0020002000200020003C004E0075006D0043006F006C0073003E0031003C002F004E0075006D0043006F006C0073003E000A0020002000200020003C00580050006F0073003E0030003C002F00580050006F0073003E000A0020002000200020003C00590050006F0073003E0030003C002F00590050006F0073003E000A0020002000200020003C00530065006C00530074006100720074003E0030003C002F00530065006C00530074006100720074003E000A0020002000200020003C00530065006C0045006E0064003E0030003C002F00530065006C0045006E0064003E000A0020002000200020003C00580050006F00730032003E0030003C002F00580050006F00730032003E000A0020002000200020003C00590050006F00730032003E0033003500360036003C002F00590050006F00730032003E000A0020002000200020003C00530065006C005300740061007200740032003E003100320031003600390030003C002F00530065006C005300740061007200740032003E000A0020002000200020003C00530065006C0045006E00640032003E003100320031003600390030003C002F00530065006C0045006E00640032003E000A003C002F0052006F006F0074003E000A00FFFEFF077400610073006B0073002E00630000000000FFFFFFFFFFFFFFFFFFFEFF2E2400570053005F0044004900520024005C002E002E005C002E002E005C0053006F0075007200630065005C0069006E0063006C007500640065005C006D006500730073006100670065005F006200750066006600650072002E006800010000000180FFFEFF00FFFEFFFF2A013C003F0078006D006C002000760065007200730069006F006E003D00220031002E0030002200200065006E0063006F00640069006E0067003D0022005500540046002D00380022003F003E000A003C0052006F006F0074003E000A0020002000200020003C004E0075006D0052006F00770073003E0031003C002F004E0075006D0052006F00770073003E000A0020002000200020003C004E0075006D0043006F006C0073003E0031003C002F004E0075006D0043006F006C0073003E000A0020002000200020003C00580050006F0073003E0030003C002F00580050006F0073003E000A0020002000200020003C00590050006F0073003E0030003C002F00590050006F0073003E000A0020002000200020003C00530065006C00530074006100720074003E0030003C002F00530065006C00530074006100720074003E000A0020002000200020003C00530065006C0045006E0064003E0030003C002F00530065006C0045006E0064003E000A0020002000200020003C00580050006F00730032003E0030003C002F00580050006F00730032003E000A0020002000200020003C00590050006F00730032003E003600390030003C002F00590050006F00730032003E000A0020002000200020003C00530065006C005300740061007200740032003E00330035003700350034003C002F00530065006C005300740061007200740032003E000A0020002000200020003C00530065006C0045006E00640032003E00330035003700380037003C002F00530065006C0045006E00640032003E000A003C002F0052006F006F0074003E000A00FFFEFF106D006500730073006100670065005F006200750066006600650072002E00680000000000FFFFFFFFFFFFFFFF0000000010000000C5D4F200FFDC7800BECEA100F0A0A100BCA8E1009CC1B600F7B88600D9ADC200A5C2D700B3A6BE00EAD6A300F6FA7D00B5E99D005FC3CF00C1838300CACAD5000100000001000000020000008701000085000000C20900009E050000</MDITabsState>\r
              </MDIClientArea-0>\r
          </MDIWindows>\r
      </WindowStorage>\r
diff --git a/FreeRTOS/Demo/RISC-V_Renode_Emulator_SoftConsole/.settings/language.settings.xml b/FreeRTOS/Demo/RISC-V_Renode_Emulator_SoftConsole/.settings/language.settings.xml

index 2b14205674771268d7e57810489eb4f6f9728e4c..5a51ff9335983b92dab3dfdf6e470eef3eca5fad 100644 (file)
--- a/FreeRTOS/Demo/RISC-V_Renode_Emulator_SoftConsole/.settings/language.settings.xml
+++ b/FreeRTOS/Demo/RISC-V_Renode_Emulator_SoftConsole/.settings/language.settings.xml
@@ -11,7 +11,7 @@
                                 \r
              <provider-reference id="org.eclipse.cdt.managedbuilder.core.MBSLanguageSettingsProvider" ref="shared-provider"/>\r
                                 \r
-            <provider class="org.eclipse.cdt.managedbuilder.language.settings.providers.GCCBuiltinSpecsDetector" console="false" env-hash="-1071649331737957571" id="ilg.gnumcueclipse.managedbuild.cross.riscv.GCCBuiltinSpecsDetector" keep-relative-paths="false" name="CDT RISC-V Cross GCC Built-in Compiler Settings" parameter="${COMMAND} ${FLAGS} ${cross_toolchain_flags} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">\r
+            <provider class="org.eclipse.cdt.managedbuilder.language.settings.providers.GCCBuiltinSpecsDetector" console="false" env-hash="1004974576630085650" id="ilg.gnumcueclipse.managedbuild.cross.riscv.GCCBuiltinSpecsDetector" keep-relative-paths="false" name="CDT RISC-V Cross GCC Built-in Compiler Settings" parameter="${COMMAND} ${FLAGS} ${cross_toolchain_flags} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">\r
                                                 \r
                  <language-scope id="org.eclipse.cdt.core.gcc"/>\r
                                                 \r
diff --git a/FreeRTOS/Source/include/list.h b/FreeRTOS/Source/include/list.h

index b2bb46d60092bd1ee590798b5e043ee34557d828..f6b66baef2afb803dd7bc1c25c41a0423b9de2e5 100644 (file)
--- a/FreeRTOS/Source/include/list.h
+++ b/FreeRTOS/Source/include/list.h
@@ -183,7 +183,7 @@ typedef struct xLIST
   * Access macro to get the owner of a list item.  The owner of a list item\r
   * is the object (usually a TCB) that contains the list item.\r
   *\r
- * \page listSET_LIST_ITEM_OWNER listSET_LIST_ITEM_OWNER\r
+ * \page listGET_LIST_ITEM_OWNER listSET_LIST_ITEM_OWNER\r
   * \ingroup LinkedList\r
   */\r
  #define listGET_LIST_ITEM_OWNER( pxListItem )  ( ( pxListItem )->pvOwner )\r
@@ -225,7 +225,7 @@ typedef struct xLIST
  #define listGET_HEAD_ENTRY( pxList )   ( ( ( pxList )->xListEnd ).pxNext )\r
  \r
  /*\r
- * Return the list item at the head of the list.\r
+ * Return the next list item.\r
   *\r
   * \page listGET_NEXT listGET_NEXT\r
   * \ingroup LinkedList\r
diff --git a/FreeRTOS/Source/include/message_buffer.h b/FreeRTOS/Source/include/message_buffer.h

index 9ee3f4d54b1ed0e1aebc51a5c4c9645ff77da92b..e088755f2d05ea20091b094833d68874eeec879a 100644 (file)
--- a/FreeRTOS/Source/include/message_buffer.h
+++ b/FreeRTOS/Source/include/message_buffer.h
@@ -62,6 +62,10 @@
  #ifndef FREERTOS_MESSAGE_BUFFER_H\r
  #define FREERTOS_MESSAGE_BUFFER_H\r
  \r
+#ifndef INC_FREERTOS_H\r
+       #error "include FreeRTOS.h must appear in source files before include message_buffer.h"\r
+#endif\r
+\r
  /* Message buffers are built onto of stream buffers. */\r
  #include "stream_buffer.h"\r
  \r
diff --git a/FreeRTOS/Source/include/stream_buffer.h b/FreeRTOS/Source/include/stream_buffer.h

index 5f9e01233c4f43dd29cd272dc85c8ea7e8dd0c27..eccc817f0f363c6269e54b36ec11dff40d2ffab2 100644 (file)
--- a/FreeRTOS/Source/include/stream_buffer.h
+++ b/FreeRTOS/Source/include/stream_buffer.h
@@ -51,6 +51,10 @@
  #ifndef STREAM_BUFFER_H\r
  #define STREAM_BUFFER_H\r
  \r
+#ifndef INC_FREERTOS_H\r
+       #error "include FreeRTOS.h must appear in source files before include stream_buffer.h"\r
+#endif\r
+\r
  #if defined( __cplusplus )\r
  extern "C" {\r
  #endif\r
author	rtel <rtel@1d2547de-c912-0410-9cb9-b8ca96c0e9e2>
	Thu, 4 Jul 2019 21:18:36 +0000 (21:18 +0000)
committer	rtel <rtel@1d2547de-c912-0410-9cb9-b8ca96c0e9e2>
	Thu, 4 Jul 2019 21:18:36 +0000 (21:18 +0000)
FreeRTOS/Demo/CORTEX_M7_M4_AMP_STM32H745I_Discovery_IAR/CM4/main.c		patch \| blob \| history
FreeRTOS/Demo/CORTEX_M7_M4_AMP_STM32H745I_Discovery_IAR/CM7/main.c		patch \| blob \| history
FreeRTOS/Demo/CORTEX_M7_M4_AMP_STM32H745I_Discovery_IAR/Project.ewd		patch \| blob \| history
FreeRTOS/Demo/CORTEX_M7_M4_AMP_STM32H745I_Discovery_IAR/settings/Project.STM32H745I_Discovery_CM4.cspy.bat		patch \| blob \| history
FreeRTOS/Demo/CORTEX_M7_M4_AMP_STM32H745I_Discovery_IAR/settings/Project.STM32H745I_Discovery_CM4.cspy.ps1		patch \| blob \| history
FreeRTOS/Demo/CORTEX_M7_M4_AMP_STM32H745I_Discovery_IAR/settings/Project.STM32H745I_Discovery_CM4.driver.xcl		patch \| blob \| history
FreeRTOS/Demo/CORTEX_M7_M4_AMP_STM32H745I_Discovery_IAR/settings/Project.STM32H745I_Discovery_CM4.general.xcl		patch \| blob \| history
FreeRTOS/Demo/CORTEX_M7_M4_AMP_STM32H745I_Discovery_IAR/settings/Project.STM32H745I_Discovery_CM7.cspy.bat		patch \| blob \| history
FreeRTOS/Demo/CORTEX_M7_M4_AMP_STM32H745I_Discovery_IAR/settings/Project.STM32H745I_Discovery_CM7.cspy.ps1		patch \| blob \| history
FreeRTOS/Demo/CORTEX_M7_M4_AMP_STM32H745I_Discovery_IAR/settings/Project.STM32H745I_Discovery_CM7.driver.xcl		patch \| blob \| history
FreeRTOS/Demo/CORTEX_M7_M4_AMP_STM32H745I_Discovery_IAR/settings/Project.STM32H745I_Discovery_CM7.general.xcl		patch \| blob \| history
FreeRTOS/Demo/CORTEX_M7_M4_AMP_STM32H745I_Discovery_IAR/settings/Project.dbgdt		patch \| blob \| history
FreeRTOS/Demo/CORTEX_M7_M4_AMP_STM32H745I_Discovery_IAR/settings/Project.dnx		patch \| blob \| history
FreeRTOS/Demo/CORTEX_M7_M4_AMP_STM32H745I_Discovery_IAR/settings/Project.wsdt		patch \| blob \| history
FreeRTOS/Demo/RISC-V_Renode_Emulator_SoftConsole/.settings/language.settings.xml		patch \| blob \| history
FreeRTOS/Source/include/list.h		patch \| blob \| history
FreeRTOS/Source/include/message_buffer.h		patch \| blob \| history
FreeRTOS/Source/include/stream_buffer.h		patch \| blob \| history