diff --git a/FreeRTOS/Demo/MSP430X_MSP430F5438_IAR/RTOSDemo.ewd b/FreeRTOS/Demo/MSP430X_MSP430F5438_IAR/RTOSDemo.ewd index 0d65a00d5a..1488d1af9a 100644 --- a/FreeRTOS/Demo/MSP430X_MSP430F5438_IAR/RTOSDemo.ewd +++ b/FreeRTOS/Demo/MSP430X_MSP430F5438_IAR/RTOSDemo.ewd @@ -12,7 +12,7 @@ <name>C-SPY</name> <archiveVersion>4</archiveVersion> <data> - <version>25</version> + <version>27</version> <wantNonLocal>1</wantNonLocal> <debug>1</debug> <option> @@ -57,7 +57,7 @@ </option> <option> <name>DdfFileName</name> - <state>$TOOLKIT_DIR$\config\MSP430F5438A.ddf</state> + <state>$TOOLKIT_DIR$\config\debugger\MSP430F5438A.ddf</state> </option> <option> <name>ProcTMS</name> @@ -139,13 +139,21 @@ <name>OCImagesUse3</name> <state>0</state> </option> + <option> + <name>ENERGYTRACE</name> + <state>1</state> + </option> + <option> + <name>FETIPE</name> + <state>1</state> + </option> </data> </settings> <settings> <name>430FET</name> <archiveVersion>1</archiveVersion> <data> - <version>23</version> + <version>26</version> <wantNonLocal>1</wantNonLocal> <debug>1</debug> <option> @@ -282,6 +290,18 @@ <name>Retain</name> <state>0</state> </option> + <option> + <name>jstatebit</name> + <state>0</state> + </option> + <option> + <name>RadioJtagSpeedType</name> + <state>1</state> + </option> + <option> + <name>memoryTypeSlave</name> + <state>0</state> + </option> </data> </settings> <settings> @@ -323,11 +343,11 @@ <loadFlag>1</loadFlag> </plugin> <plugin> - <file>$TOOLKIT_DIR$\plugins\rtos\CMX\CmxArmPlugin.ENU.ewplugin</file> + <file>$TOOLKIT_DIR$\plugins\rtos\CMX\CmxPlugin.ENU.ewplugin</file> <loadFlag>0</loadFlag> </plugin> <plugin> - <file>$TOOLKIT_DIR$\plugins\rtos\CMX\CmxTinyArmPlugin.ENU.ewplugin</file> + <file>$TOOLKIT_DIR$\plugins\rtos\CMX\CmxTinyPlugin.ENU.ewplugin</file> <loadFlag>0</loadFlag> </plugin> <plugin> @@ -346,6 +366,10 @@ <file>$TOOLKIT_DIR$\plugins\rtos\SafeRTOS\SafeRTOSPlugin.ewplugin</file> <loadFlag>0</loadFlag> </plugin> + <plugin> + <file>$TOOLKIT_DIR$\plugins\rtos\TI-RTOS\tirtosplugin.ewplugin</file> + <loadFlag>0</loadFlag> + </plugin> <plugin> <file>$TOOLKIT_DIR$\plugins\rtos\uCOS-II\uCOS-II-286-KA-CSpy.ewplugin</file> <loadFlag>0</loadFlag> @@ -354,6 +378,10 @@ <file>$TOOLKIT_DIR$\plugins\rtos\uCOS-II\uCOS-II-KA-CSpy.ewplugin</file> <loadFlag>0</loadFlag> </plugin> + <plugin> + <file>$TOOLKIT_DIR$\plugins\rtos\uCOS-III\uCOS-III-KA-CSpy.ewplugin</file> + <loadFlag>0</loadFlag> + </plugin> <plugin> <file>$EW_DIR$\common\plugins\CodeCoverage\CodeCoverage.ENU.ewplugin</file> <loadFlag>1</loadFlag> @@ -366,6 +394,10 @@ <file>$EW_DIR$\common\plugins\SymList\SymList.ENU.ewplugin</file> <loadFlag>1</loadFlag> </plugin> + <plugin> + <file>$EW_DIR$\common\plugins\uCProbe\uCProbePlugin.ENU.ewplugin</file> + <loadFlag>0</loadFlag> + </plugin> </debuggerPlugins> </configuration> <configuration> @@ -378,7 +410,7 @@ <name>C-SPY</name> <archiveVersion>4</archiveVersion> <data> - <version>25</version> + <version>27</version> <wantNonLocal>1</wantNonLocal> <debug>1</debug> <option> @@ -505,13 +537,21 @@ <name>OCImagesUse3</name> <state>0</state> </option> + <option> + <name>ENERGYTRACE</name> + <state>1</state> + </option> + <option> + <name>FETIPE</name> + <state>1</state> + </option> </data> </settings> <settings> <name>430FET</name> <archiveVersion>1</archiveVersion> <data> - <version>23</version> + <version>26</version> <wantNonLocal>1</wantNonLocal> <debug>1</debug> <option> @@ -648,6 +688,18 @@ <name>Retain</name> <state>0</state> </option> + <option> + <name>jstatebit</name> + <state>0</state> + </option> + <option> + <name>RadioJtagSpeedType</name> + <state>1</state> + </option> + <option> + <name>memoryTypeSlave</name> + <state>0</state> + </option> </data> </settings> <settings> @@ -689,11 +741,11 @@ <loadFlag>1</loadFlag> </plugin> <plugin> - <file>$TOOLKIT_DIR$\plugins\rtos\CMX\CmxArmPlugin.ENU.ewplugin</file> + <file>$TOOLKIT_DIR$\plugins\rtos\CMX\CmxPlugin.ENU.ewplugin</file> <loadFlag>0</loadFlag> </plugin> <plugin> - <file>$TOOLKIT_DIR$\plugins\rtos\CMX\CmxTinyArmPlugin.ENU.ewplugin</file> + <file>$TOOLKIT_DIR$\plugins\rtos\CMX\CmxTinyPlugin.ENU.ewplugin</file> <loadFlag>0</loadFlag> </plugin> <plugin> @@ -712,6 +764,10 @@ <file>$TOOLKIT_DIR$\plugins\rtos\SafeRTOS\SafeRTOSPlugin.ewplugin</file> <loadFlag>0</loadFlag> </plugin> + <plugin> + <file>$TOOLKIT_DIR$\plugins\rtos\TI-RTOS\tirtosplugin.ewplugin</file> + <loadFlag>0</loadFlag> + </plugin> <plugin> <file>$TOOLKIT_DIR$\plugins\rtos\uCOS-II\uCOS-II-286-KA-CSpy.ewplugin</file> <loadFlag>0</loadFlag> @@ -720,6 +776,10 @@ <file>$TOOLKIT_DIR$\plugins\rtos\uCOS-II\uCOS-II-KA-CSpy.ewplugin</file> <loadFlag>0</loadFlag> </plugin> + <plugin> + <file>$TOOLKIT_DIR$\plugins\rtos\uCOS-III\uCOS-III-KA-CSpy.ewplugin</file> + <loadFlag>0</loadFlag> + </plugin> <plugin> <file>$EW_DIR$\common\plugins\CodeCoverage\CodeCoverage.ENU.ewplugin</file> <loadFlag>1</loadFlag> @@ -732,6 +792,10 @@ <file>$EW_DIR$\common\plugins\SymList\SymList.ENU.ewplugin</file> <loadFlag>1</loadFlag> </plugin> + <plugin> + <file>$EW_DIR$\common\plugins\uCProbe\uCProbePlugin.ENU.ewplugin</file> + <loadFlag>0</loadFlag> + </plugin> </debuggerPlugins> </configuration> <configuration> @@ -744,7 +808,7 @@ <name>C-SPY</name> <archiveVersion>4</archiveVersion> <data> - <version>25</version> + <version>27</version> <wantNonLocal>1</wantNonLocal> <debug>1</debug> <option> @@ -789,7 +853,7 @@ </option> <option> <name>DdfFileName</name> - <state>$TOOLKIT_DIR$\config\MSP430F5438A.ddf</state> + <state>$TOOLKIT_DIR$\config\debugger\MSP430F5438A.ddf</state> </option> <option> <name>ProcTMS</name> @@ -871,13 +935,21 @@ <name>OCImagesUse3</name> <state>0</state> </option> + <option> + <name>ENERGYTRACE</name> + <state>1</state> + </option> + <option> + <name>FETIPE</name> + <state>1</state> + </option> </data> </settings> <settings> <name>430FET</name> <archiveVersion>1</archiveVersion> <data> - <version>23</version> + <version>26</version> <wantNonLocal>1</wantNonLocal> <debug>1</debug> <option> @@ -1014,6 +1086,18 @@ <name>Retain</name> <state>0</state> </option> + <option> + <name>jstatebit</name> + <state>0</state> + </option> + <option> + <name>RadioJtagSpeedType</name> + <state>1</state> + </option> + <option> + <name>memoryTypeSlave</name> + <state>0</state> + </option> </data> </settings> <settings> @@ -1055,11 +1139,11 @@ <loadFlag>1</loadFlag> </plugin> <plugin> - <file>$TOOLKIT_DIR$\plugins\rtos\CMX\CmxArmPlugin.ENU.ewplugin</file> + <file>$TOOLKIT_DIR$\plugins\rtos\CMX\CmxPlugin.ENU.ewplugin</file> <loadFlag>0</loadFlag> </plugin> <plugin> - <file>$TOOLKIT_DIR$\plugins\rtos\CMX\CmxTinyArmPlugin.ENU.ewplugin</file> + <file>$TOOLKIT_DIR$\plugins\rtos\CMX\CmxTinyPlugin.ENU.ewplugin</file> <loadFlag>0</loadFlag> </plugin> <plugin> @@ -1078,6 +1162,10 @@ <file>$TOOLKIT_DIR$\plugins\rtos\SafeRTOS\SafeRTOSPlugin.ewplugin</file> <loadFlag>0</loadFlag> </plugin> + <plugin> + <file>$TOOLKIT_DIR$\plugins\rtos\TI-RTOS\tirtosplugin.ewplugin</file> + <loadFlag>0</loadFlag> + </plugin> <plugin> <file>$TOOLKIT_DIR$\plugins\rtos\uCOS-II\uCOS-II-286-KA-CSpy.ewplugin</file> <loadFlag>0</loadFlag> @@ -1086,6 +1174,10 @@ <file>$TOOLKIT_DIR$\plugins\rtos\uCOS-II\uCOS-II-KA-CSpy.ewplugin</file> <loadFlag>0</loadFlag> </plugin> + <plugin> + <file>$TOOLKIT_DIR$\plugins\rtos\uCOS-III\uCOS-III-KA-CSpy.ewplugin</file> + <loadFlag>0</loadFlag> + </plugin> <plugin> <file>$EW_DIR$\common\plugins\CodeCoverage\CodeCoverage.ENU.ewplugin</file> <loadFlag>1</loadFlag> @@ -1098,6 +1190,10 @@ <file>$EW_DIR$\common\plugins\SymList\SymList.ENU.ewplugin</file> <loadFlag>1</loadFlag> </plugin> + <plugin> + <file>$EW_DIR$\common\plugins\uCProbe\uCProbePlugin.ENU.ewplugin</file> + <loadFlag>0</loadFlag> + </plugin> </debuggerPlugins> </configuration> <configuration> @@ -1110,7 +1206,7 @@ <name>C-SPY</name> <archiveVersion>4</archiveVersion> <data> - <version>25</version> + <version>27</version> <wantNonLocal>1</wantNonLocal> <debug>1</debug> <option> @@ -1155,7 +1251,7 @@ </option> <option> <name>DdfFileName</name> - <state>$TOOLKIT_DIR$\config\MSP430F5438A.ddf</state> + <state>$TOOLKIT_DIR$\config\debugger\MSP430F5438A.ddf</state> </option> <option> <name>ProcTMS</name> @@ -1237,13 +1333,21 @@ <name>OCImagesUse3</name> <state>0</state> </option> + <option> + <name>ENERGYTRACE</name> + <state>1</state> + </option> + <option> + <name>FETIPE</name> + <state>1</state> + </option> </data> </settings> <settings> <name>430FET</name> <archiveVersion>1</archiveVersion> <data> - <version>23</version> + <version>26</version> <wantNonLocal>1</wantNonLocal> <debug>1</debug> <option> @@ -1380,6 +1484,18 @@ <name>Retain</name> <state>0</state> </option> + <option> + <name>jstatebit</name> + <state>0</state> + </option> + <option> + <name>RadioJtagSpeedType</name> + <state>1</state> + </option> + <option> + <name>memoryTypeSlave</name> + <state>0</state> + </option> </data> </settings> <settings> @@ -1421,11 +1537,11 @@ <loadFlag>1</loadFlag> </plugin> <plugin> - <file>$TOOLKIT_DIR$\plugins\rtos\CMX\CmxArmPlugin.ENU.ewplugin</file> + <file>$TOOLKIT_DIR$\plugins\rtos\CMX\CmxPlugin.ENU.ewplugin</file> <loadFlag>0</loadFlag> </plugin> <plugin> - <file>$TOOLKIT_DIR$\plugins\rtos\CMX\CmxTinyArmPlugin.ENU.ewplugin</file> + <file>$TOOLKIT_DIR$\plugins\rtos\CMX\CmxTinyPlugin.ENU.ewplugin</file> <loadFlag>0</loadFlag> </plugin> <plugin> @@ -1444,6 +1560,10 @@ <file>$TOOLKIT_DIR$\plugins\rtos\SafeRTOS\SafeRTOSPlugin.ewplugin</file> <loadFlag>0</loadFlag> </plugin> + <plugin> + <file>$TOOLKIT_DIR$\plugins\rtos\TI-RTOS\tirtosplugin.ewplugin</file> + <loadFlag>0</loadFlag> + </plugin> <plugin> <file>$TOOLKIT_DIR$\plugins\rtos\uCOS-II\uCOS-II-286-KA-CSpy.ewplugin</file> <loadFlag>0</loadFlag> @@ -1452,6 +1572,10 @@ <file>$TOOLKIT_DIR$\plugins\rtos\uCOS-II\uCOS-II-KA-CSpy.ewplugin</file> <loadFlag>0</loadFlag> </plugin> + <plugin> + <file>$TOOLKIT_DIR$\plugins\rtos\uCOS-III\uCOS-III-KA-CSpy.ewplugin</file> + <loadFlag>0</loadFlag> + </plugin> <plugin> <file>$EW_DIR$\common\plugins\CodeCoverage\CodeCoverage.ENU.ewplugin</file> <loadFlag>1</loadFlag> @@ -1464,6 +1588,10 @@ <file>$EW_DIR$\common\plugins\SymList\SymList.ENU.ewplugin</file> <loadFlag>1</loadFlag> </plugin> + <plugin> + <file>$EW_DIR$\common\plugins\uCProbe\uCProbePlugin.ENU.ewplugin</file> + <loadFlag>0</loadFlag> + </plugin> </debuggerPlugins> </configuration> </project> diff --git a/FreeRTOS/Demo/MSP430X_MSP430F5438_IAR/RTOSDemo.ewp b/FreeRTOS/Demo/MSP430X_MSP430F5438_IAR/RTOSDemo.ewp index 8ec55d8559..2bb3bd35af 100644 --- a/FreeRTOS/Demo/MSP430X_MSP430F5438_IAR/RTOSDemo.ewp +++ b/FreeRTOS/Demo/MSP430X_MSP430F5438_IAR/RTOSDemo.ewp @@ -10,9 +10,9 @@ <debug>1</debug> <settings> <name>General</name> - <archiveVersion>9</archiveVersion> + <archiveVersion>14</archiveVersion> <data> - <version>28</version> + <version>32</version> <wantNonLocal>1</wantNonLocal> <debug>1</debug> <option> @@ -54,7 +54,7 @@ </option> <option> <name>RTConfigPath</name> - <state>$TOOLKIT_DIR$\LIB\DLIB\dl430xlff.h</state> + <state>$TOOLKIT_DIR$\lib\dlib\dl430xllff.h</state> </option> <option> <name>RTLibraryPath</name> @@ -62,8 +62,8 @@ </option> <option> <name>Input variant</name> - <version>1</version> - <state>4</state> + <version>2</version> + <state>6</state> </option> <option> <name>Input description</name> @@ -71,8 +71,8 @@ </option> <option> <name>Output variant</name> - <version>1</version> - <state>4</state> + <version>2</version> + <state>6</state> </option> <option> <name>Output description</name> @@ -153,13 +153,77 @@ <name>NoRwDynamicInit</name> <state>0</state> </option> + <option> + <name>GRuntimeLibThreads</name> + <state>0</state> + </option> + <option> + <name>MathLib</name> + <state>0</state> + </option> + <option> + <name>RadioCodeModelType</name> + <state>1</state> + </option> + <option> + <name>GEnableMpu</name> + <state>1</state> + </option> + <option> + <name>GESupportMpu</name> + <state>0</state> + </option> + <option> + <name>GELockMpu</name> + <state>0</state> + </option> + <option> + <name>GENMIViolationMpu</name> + <state>0</state> + </option> + <option> + <name>GEAssertMpu</name> + <state>0</state> + </option> + <option> + <name>GEInfoReadMpu</name> + <state>1</state> + </option> + <option> + <name>GEInfoWriteMpu</name> + <state>1</state> + </option> + <option> + <name>GEInfoExecuteMpu</name> + <state>0</state> + </option> + <option> + <name>GEInfoAssertMpu</name> + <state>0</state> + </option> + <option> + <name>GEnableIpe</name> + <state>1</state> + </option> + <option> + <name>GESupportIpe</name> + <state>0</state> + </option> + <option> + <name>GAssertIpe</name> + <state>0</state> + </option> + <option> + <name>GLockIpe</name> + <state>0</state> + </option> </data> </settings> <settings> <name>ICC430</name> <archiveVersion>4</archiveVersion> <data> - <version>33</version> + <version>37</version> <wantNonLocal>1</wantNonLocal> <debug>1</debug> <option> @@ -428,14 +492,6 @@ <name>CCDifunct</name> <state>DIFUNCT</state> </option> - <option> - <name>AggressiveInlining</name> - <state>0</state> - </option> - <option> - <name>AggressiveUnrolling</name> - <state>0</state> - </option> <option> <name>IccCppInlineSemantics</name> <state>0</state> @@ -456,13 +512,33 @@ <name>CNoRwDynamicInit</name> <state>1</state> </option> + <option> + <name>CCOptimizationNoSizeConstraints</name> + <state>0</state> + </option> + <option> + <name>ADefines</name> + <state></state> + </option> + <option> + <name>CCGuardCalls</name> + <state>0</state> + </option> + <option> + <name>OCGuardCallsSlave</name> + <state>0</state> + </option> + <option> + <name>CompilerCodeModel</name> + <state>1</state> + </option> </data> </settings> <settings> <name>A430</name> - <archiveVersion>4</archiveVersion> + <archiveVersion>5</archiveVersion> <data> - <version>13</version> + <version>14</version> <wantNonLocal>1</wantNonLocal> <debug>1</debug> <option> @@ -619,6 +695,10 @@ <state>$PROJ_DIR$</state> <state>$PROJ_DIR$\..\..\Source\portable\IAR\MSP430X</state> </option> + <option> + <name>ACPUTAG</name> + <state>1</state> + </option> </data> </settings> <settings> @@ -646,7 +726,7 @@ <name>XLINK</name> <archiveVersion>4</archiveVersion> <data> - <version>22</version> + <version>27</version> <wantNonLocal>1</wantNonLocal> <debug>1</debug> <option> @@ -921,6 +1001,27 @@ <name>XLibraryHeap20</name> <state>1</state> </option> + <option> + <name>CrcUnitSize</name> + <version>0</version> + <state>0</state> + </option> + <option> + <name>LinkMathLib</name> + <state>0</state> + </option> + <option> + <name>IlinkThreadsSlave</name> + <state>1</state> + </option> + <option> + <name>XlinkMPU</name> + <state>1</state> + </option> + <option> + <name>XlinkIPE</name> + <state>1</state> + </option> </data> </settings> <settings> @@ -944,6 +1045,36 @@ </option> </data> </settings> + <settings> + <name>ULP430</name> + <archiveVersion>1</archiveVersion> + <data> + <version>1</version> + <wantNonLocal>1</wantNonLocal> + <debug>1</debug> + <option> + <name>CUTest</name> + <state>###Uninitialized###</state> + </option> + <option> + <name>ULPRules</name> + <version>0</version> + <state>1111111111111111111</state> + </option> + <option> + <name>ULPEnable</name> + <state>0</state> + </option> + <option> + <name>OutputFile</name> + <state>$PROJ_FNAME$.ulp</state> + </option> + <option> + <name>ULPStatus</name> + <state>1</state> + </option> + </data> + </settings> <settings> <name>BILINK</name> <archiveVersion>0</archiveVersion> @@ -958,9 +1089,9 @@ <debug>1</debug> <settings> <name>General</name> - <archiveVersion>9</archiveVersion> + <archiveVersion>14</archiveVersion> <data> - <version>28</version> + <version>32</version> <wantNonLocal>1</wantNonLocal> <debug>1</debug> <option> @@ -1010,8 +1141,8 @@ </option> <option> <name>Input variant</name> - <version>1</version> - <state>4</state> + <version>2</version> + <state>6</state> </option> <option> <name>Input description</name> @@ -1019,8 +1150,8 @@ </option> <option> <name>Output variant</name> - <version>1</version> - <state>4</state> + <version>2</version> + <state>6</state> </option> <option> <name>Output description</name> @@ -1101,13 +1232,77 @@ <name>NoRwDynamicInit</name> <state>0</state> </option> + <option> + <name>GRuntimeLibThreads</name> + <state>0</state> + </option> + <option> + <name>MathLib</name> + <state>0</state> + </option> + <option> + <name>RadioCodeModelType</name> + <state>1</state> + </option> + <option> + <name>GEnableMpu</name> + <state>1</state> + </option> + <option> + <name>GESupportMpu</name> + <state>0</state> + </option> + <option> + <name>GELockMpu</name> + <state>0</state> + </option> + <option> + <name>GENMIViolationMpu</name> + <state>0</state> + </option> + <option> + <name>GEAssertMpu</name> + <state>0</state> + </option> + <option> + <name>GEInfoReadMpu</name> + <state>1</state> + </option> + <option> + <name>GEInfoWriteMpu</name> + <state>1</state> + </option> + <option> + <name>GEInfoExecuteMpu</name> + <state>0</state> + </option> + <option> + <name>GEInfoAssertMpu</name> + <state>0</state> + </option> + <option> + <name>GEnableIpe</name> + <state>1</state> + </option> + <option> + <name>GESupportIpe</name> + <state>0</state> + </option> + <option> + <name>GAssertIpe</name> + <state>0</state> + </option> + <option> + <name>GLockIpe</name> + <state>0</state> + </option> </data> </settings> <settings> <name>ICC430</name> <archiveVersion>4</archiveVersion> <data> - <version>33</version> + <version>37</version> <wantNonLocal>1</wantNonLocal> <debug>1</debug> <option> @@ -1376,14 +1571,6 @@ <name>CCDifunct</name> <state>DIFUNCT</state> </option> - <option> - <name>AggressiveInlining</name> - <state>0</state> - </option> - <option> - <name>AggressiveUnrolling</name> - <state>0</state> - </option> <option> <name>IccCppInlineSemantics</name> <state>0</state> @@ -1404,13 +1591,33 @@ <name>CNoRwDynamicInit</name> <state>1</state> </option> + <option> + <name>CCOptimizationNoSizeConstraints</name> + <state>0</state> + </option> + <option> + <name>ADefines</name> + <state></state> + </option> + <option> + <name>CCGuardCalls</name> + <state>0</state> + </option> + <option> + <name>OCGuardCallsSlave</name> + <state>0</state> + </option> + <option> + <name>CompilerCodeModel</name> + <state>1</state> + </option> </data> </settings> <settings> <name>A430</name> - <archiveVersion>4</archiveVersion> + <archiveVersion>5</archiveVersion> <data> - <version>13</version> + <version>14</version> <wantNonLocal>1</wantNonLocal> <debug>1</debug> <option> @@ -1567,6 +1774,10 @@ <state>$PROJ_DIR$</state> <state>$PROJ_DIR$\..\..\Source\portable\IAR\MSP430X</state> </option> + <option> + <name>ACPUTAG</name> + <state>1</state> + </option> </data> </settings> <settings> @@ -1594,7 +1805,7 @@ <name>XLINK</name> <archiveVersion>4</archiveVersion> <data> - <version>22</version> + <version>27</version> <wantNonLocal>1</wantNonLocal> <debug>1</debug> <option> @@ -1869,6 +2080,27 @@ <name>XLibraryHeap20</name> <state>1</state> </option> + <option> + <name>CrcUnitSize</name> + <version>0</version> + <state>0</state> + </option> + <option> + <name>LinkMathLib</name> + <state>0</state> + </option> + <option> + <name>IlinkThreadsSlave</name> + <state>1</state> + </option> + <option> + <name>XlinkMPU</name> + <state>1</state> + </option> + <option> + <name>XlinkIPE</name> + <state>1</state> + </option> </data> </settings> <settings> @@ -1892,6 +2124,36 @@ </option> </data> </settings> + <settings> + <name>ULP430</name> + <archiveVersion>1</archiveVersion> + <data> + <version>1</version> + <wantNonLocal>1</wantNonLocal> + <debug>1</debug> + <option> + <name>CUTest</name> + <state>###Uninitialized###</state> + </option> + <option> + <name>ULPRules</name> + <version>0</version> + <state>1111111111111111111</state> + </option> + <option> + <name>ULPEnable</name> + <state>0</state> + </option> + <option> + <name>OutputFile</name> + <state></state> + </option> + <option> + <name>ULPStatus</name> + <state>1</state> + </option> + </data> + </settings> <settings> <name>BILINK</name> <archiveVersion>0</archiveVersion> @@ -1906,9 +2168,9 @@ <debug>1</debug> <settings> <name>General</name> - <archiveVersion>9</archiveVersion> + <archiveVersion>14</archiveVersion> <data> - <version>28</version> + <version>32</version> <wantNonLocal>1</wantNonLocal> <debug>1</debug> <option> @@ -1958,8 +2220,8 @@ </option> <option> <name>Input variant</name> - <version>1</version> - <state>4</state> + <version>2</version> + <state>6</state> </option> <option> <name>Input description</name> @@ -1967,8 +2229,8 @@ </option> <option> <name>Output variant</name> - <version>1</version> - <state>4</state> + <version>2</version> + <state>6</state> </option> <option> <name>Output description</name> @@ -2049,13 +2311,77 @@ <name>NoRwDynamicInit</name> <state>0</state> </option> + <option> + <name>GRuntimeLibThreads</name> + <state>0</state> + </option> + <option> + <name>MathLib</name> + <state>0</state> + </option> + <option> + <name>RadioCodeModelType</name> + <state>1</state> + </option> + <option> + <name>GEnableMpu</name> + <state>1</state> + </option> + <option> + <name>GESupportMpu</name> + <state>0</state> + </option> + <option> + <name>GELockMpu</name> + <state>0</state> + </option> + <option> + <name>GENMIViolationMpu</name> + <state>0</state> + </option> + <option> + <name>GEAssertMpu</name> + <state>0</state> + </option> + <option> + <name>GEInfoReadMpu</name> + <state>1</state> + </option> + <option> + <name>GEInfoWriteMpu</name> + <state>1</state> + </option> + <option> + <name>GEInfoExecuteMpu</name> + <state>0</state> + </option> + <option> + <name>GEInfoAssertMpu</name> + <state>0</state> + </option> + <option> + <name>GEnableIpe</name> + <state>1</state> + </option> + <option> + <name>GESupportIpe</name> + <state>0</state> + </option> + <option> + <name>GAssertIpe</name> + <state>0</state> + </option> + <option> + <name>GLockIpe</name> + <state>0</state> + </option> </data> </settings> <settings> <name>ICC430</name> <archiveVersion>4</archiveVersion> <data> - <version>33</version> + <version>37</version> <wantNonLocal>1</wantNonLocal> <debug>1</debug> <option> @@ -2324,14 +2650,6 @@ <name>CCDifunct</name> <state>DIFUNCT</state> </option> - <option> - <name>AggressiveInlining</name> - <state>0</state> - </option> - <option> - <name>AggressiveUnrolling</name> - <state>0</state> - </option> <option> <name>IccCppInlineSemantics</name> <state>0</state> @@ -2352,13 +2670,33 @@ <name>CNoRwDynamicInit</name> <state>1</state> </option> + <option> + <name>CCOptimizationNoSizeConstraints</name> + <state>0</state> + </option> + <option> + <name>ADefines</name> + <state></state> + </option> + <option> + <name>CCGuardCalls</name> + <state>0</state> + </option> + <option> + <name>OCGuardCallsSlave</name> + <state>0</state> + </option> + <option> + <name>CompilerCodeModel</name> + <state>1</state> + </option> </data> </settings> <settings> <name>A430</name> - <archiveVersion>4</archiveVersion> + <archiveVersion>5</archiveVersion> <data> - <version>13</version> + <version>14</version> <wantNonLocal>1</wantNonLocal> <debug>1</debug> <option> @@ -2515,6 +2853,10 @@ <state>$PROJ_DIR$</state> <state>$PROJ_DIR$\..\..\Source\portable\IAR\MSP430X</state> </option> + <option> + <name>ACPUTAG</name> + <state>1</state> + </option> </data> </settings> <settings> @@ -2542,7 +2884,7 @@ <name>XLINK</name> <archiveVersion>4</archiveVersion> <data> - <version>22</version> + <version>27</version> <wantNonLocal>1</wantNonLocal> <debug>1</debug> <option> @@ -2817,6 +3159,27 @@ <name>XLibraryHeap20</name> <state>1</state> </option> + <option> + <name>CrcUnitSize</name> + <version>0</version> + <state>0</state> + </option> + <option> + <name>LinkMathLib</name> + <state>0</state> + </option> + <option> + <name>IlinkThreadsSlave</name> + <state>1</state> + </option> + <option> + <name>XlinkMPU</name> + <state>1</state> + </option> + <option> + <name>XlinkIPE</name> + <state>1</state> + </option> </data> </settings> <settings> @@ -2840,6 +3203,36 @@ </option> </data> </settings> + <settings> + <name>ULP430</name> + <archiveVersion>1</archiveVersion> + <data> + <version>1</version> + <wantNonLocal>1</wantNonLocal> + <debug>1</debug> + <option> + <name>CUTest</name> + <state>###Uninitialized###</state> + </option> + <option> + <name>ULPRules</name> + <version>0</version> + <state>1111111111111111111</state> + </option> + <option> + <name>ULPEnable</name> + <state>0</state> + </option> + <option> + <name>OutputFile</name> + <state></state> + </option> + <option> + <name>ULPStatus</name> + <state>1</state> + </option> + </data> + </settings> <settings> <name>BILINK</name> <archiveVersion>0</archiveVersion> @@ -2854,9 +3247,9 @@ <debug>1</debug> <settings> <name>General</name> - <archiveVersion>9</archiveVersion> + <archiveVersion>14</archiveVersion> <data> - <version>28</version> + <version>32</version> <wantNonLocal>1</wantNonLocal> <debug>1</debug> <option> @@ -2906,8 +3299,8 @@ </option> <option> <name>Input variant</name> - <version>1</version> - <state>4</state> + <version>2</version> + <state>6</state> </option> <option> <name>Input description</name> @@ -2915,8 +3308,8 @@ </option> <option> <name>Output variant</name> - <version>1</version> - <state>4</state> + <version>2</version> + <state>6</state> </option> <option> <name>Output description</name> @@ -2997,13 +3390,77 @@ <name>NoRwDynamicInit</name> <state>0</state> </option> + <option> + <name>GRuntimeLibThreads</name> + <state>0</state> + </option> + <option> + <name>MathLib</name> + <state>0</state> + </option> + <option> + <name>RadioCodeModelType</name> + <state>1</state> + </option> + <option> + <name>GEnableMpu</name> + <state>1</state> + </option> + <option> + <name>GESupportMpu</name> + <state>0</state> + </option> + <option> + <name>GELockMpu</name> + <state>0</state> + </option> + <option> + <name>GENMIViolationMpu</name> + <state>0</state> + </option> + <option> + <name>GEAssertMpu</name> + <state>0</state> + </option> + <option> + <name>GEInfoReadMpu</name> + <state>1</state> + </option> + <option> + <name>GEInfoWriteMpu</name> + <state>1</state> + </option> + <option> + <name>GEInfoExecuteMpu</name> + <state>0</state> + </option> + <option> + <name>GEInfoAssertMpu</name> + <state>0</state> + </option> + <option> + <name>GEnableIpe</name> + <state>1</state> + </option> + <option> + <name>GESupportIpe</name> + <state>0</state> + </option> + <option> + <name>GAssertIpe</name> + <state>0</state> + </option> + <option> + <name>GLockIpe</name> + <state>0</state> + </option> </data> </settings> <settings> <name>ICC430</name> <archiveVersion>4</archiveVersion> <data> - <version>33</version> + <version>37</version> <wantNonLocal>1</wantNonLocal> <debug>1</debug> <option> @@ -3272,14 +3729,6 @@ <name>CCDifunct</name> <state>DIFUNCT</state> </option> - <option> - <name>AggressiveInlining</name> - <state>0</state> - </option> - <option> - <name>AggressiveUnrolling</name> - <state>0</state> - </option> <option> <name>IccCppInlineSemantics</name> <state>0</state> @@ -3300,13 +3749,33 @@ <name>CNoRwDynamicInit</name> <state>1</state> </option> + <option> + <name>CCOptimizationNoSizeConstraints</name> + <state>0</state> + </option> + <option> + <name>ADefines</name> + <state></state> + </option> + <option> + <name>CCGuardCalls</name> + <state>0</state> + </option> + <option> + <name>OCGuardCallsSlave</name> + <state>0</state> + </option> + <option> + <name>CompilerCodeModel</name> + <state>1</state> + </option> </data> </settings> <settings> <name>A430</name> - <archiveVersion>4</archiveVersion> + <archiveVersion>5</archiveVersion> <data> - <version>13</version> + <version>14</version> <wantNonLocal>1</wantNonLocal> <debug>1</debug> <option> @@ -3463,6 +3932,10 @@ <state>$PROJ_DIR$</state> <state>$PROJ_DIR$\..\..\Source\portable\IAR\MSP430X</state> </option> + <option> + <name>ACPUTAG</name> + <state>1</state> + </option> </data> </settings> <settings> @@ -3490,7 +3963,7 @@ <name>XLINK</name> <archiveVersion>4</archiveVersion> <data> - <version>22</version> + <version>27</version> <wantNonLocal>1</wantNonLocal> <debug>1</debug> <option> @@ -3765,6 +4238,27 @@ <name>XLibraryHeap20</name> <state>1</state> </option> + <option> + <name>CrcUnitSize</name> + <version>0</version> + <state>0</state> + </option> + <option> + <name>LinkMathLib</name> + <state>0</state> + </option> + <option> + <name>IlinkThreadsSlave</name> + <state>1</state> + </option> + <option> + <name>XlinkMPU</name> + <state>1</state> + </option> + <option> + <name>XlinkIPE</name> + <state>1</state> + </option> </data> </settings> <settings> @@ -3788,6 +4282,36 @@ </option> </data> </settings> + <settings> + <name>ULP430</name> + <archiveVersion>1</archiveVersion> + <data> + <version>1</version> + <wantNonLocal>1</wantNonLocal> + <debug>1</debug> + <option> + <name>CUTest</name> + <state>###Uninitialized###</state> + </option> + <option> + <name>ULPRules</name> + <version>0</version> + <state>1111111111111111111</state> + </option> + <option> + <name>ULPEnable</name> + <state>0</state> + </option> + <option> + <name>OutputFile</name> + <state></state> + </option> + <option> + <name>ULPStatus</name> + <state>1</state> + </option> + </data> + </settings> <settings> <name>BILINK</name> <archiveVersion>0</archiveVersion> diff --git a/FreeRTOS/Demo/MSP430X_MSP430F5438_IAR/RTOSDemo.ewt b/FreeRTOS/Demo/MSP430X_MSP430F5438_IAR/RTOSDemo.ewt new file mode 100644 index 0000000000..55b6aadb4e --- /dev/null +++ b/FreeRTOS/Demo/MSP430X_MSP430F5438_IAR/RTOSDemo.ewt @@ -0,0 +1,119 @@ +<?xml version="1.0" encoding="iso-8859-1"?> + +<project> + <fileVersion>2</fileVersion> + <configuration> + <name>Debug_Large_Data_Model</name> + <toolchain> + <name>MSP430</name> + </toolchain> + <debug>1</debug> + </configuration> + <configuration> + <name>Release_Large_Data_Model</name> + <toolchain> + <name>MSP430</name> + </toolchain> + <debug>1</debug> + </configuration> + <configuration> + <name>Debug_Small_Data_Model</name> + <toolchain> + <name>MSP430</name> + </toolchain> + <debug>1</debug> + </configuration> + <configuration> + <name>Debug_Medium_Data_Model</name> + <toolchain> + <name>MSP430</name> + </toolchain> + <debug>1</debug> + </configuration> + <group> + <name>F5XX_6XX_Core_Lib</name> + <file> + <name>$PROJ_DIR$\F5XX_6XX_Core_Lib\HAL_PMM.c</name> + </file> + <file> + <name>$PROJ_DIR$\F5XX_6XX_Core_Lib\hal_UCS.c</name> + </file> + </group> + <group> + <name>FreeRTOS_Source</name> + <group> + <name>Portable</name> + <file> + <name>$PROJ_DIR$\..\..\Source\portable\MemMang\heap_1.c</name> + </file> + <file> + <name>$PROJ_DIR$\..\..\Source\portable\IAR\MSP430X\port.c</name> + </file> + <file> + <name>$PROJ_DIR$\..\..\Source\portable\IAR\MSP430X\portext.s43</name> + </file> + </group> + <file> + <name>$PROJ_DIR$\..\..\Source\list.c</name> + </file> + <file> + <name>$PROJ_DIR$\..\..\Source\queue.c</name> + </file> + <file> + <name>$PROJ_DIR$\..\..\Source\tasks.c</name> + </file> + </group> + <group> + <name>MSP-EXP430F5438_HAL</name> + <file> + <name>$PROJ_DIR$\MSP-EXP430F5438_HAL\hal_board.c</name> + </file> + <file> + <name>$PROJ_DIR$\MSP-EXP430F5438_HAL\hal_buttons.c</name> + </file> + <file> + <name>$PROJ_DIR$\MSP-EXP430F5438_HAL\hal_lcd.c</name> + </file> + <file> + <name>$PROJ_DIR$\MSP-EXP430F5438_HAL\hal_lcd_fonts.c</name> + </file> + <file> + <name>$PROJ_DIR$\MSP-EXP430F5438_HAL\hal_MSP-EXP430F5438.h</name> + </file> + </group> + <group> + <name>Standard_Demo_Tasks</name> + <file> + <name>$PROJ_DIR$\..\Common\Minimal\comtest.c</name> + </file> + <file> + <name>$PROJ_DIR$\..\Common\Minimal\dynamic.c</name> + </file> + <file> + <name>$PROJ_DIR$\..\Common\Minimal\GenQTest.c</name> + </file> + </group> + <file> + <name>$PROJ_DIR$\lnk430F5438A_mod.xcl</name> + </file> + <file> + <name>$PROJ_DIR$\low_level_init.c</name> + </file> + <file> + <name>$PROJ_DIR$\main.c</name> + </file> + <file> + <name>$PROJ_DIR$\ParTest.c</name> + </file> + <file> + <name>$PROJ_DIR$\RegTest.s43</name> + </file> + <file> + <name>$PROJ_DIR$\RunTimeStatsConfig.c</name> + </file> + <file> + <name>$PROJ_DIR$\serial.c</name> + </file> +</project> + + diff --git a/FreeRTOS/Demo/MSP430X_MSP430F5438_IAR/settings/RTOSDemo.dbgdt b/FreeRTOS/Demo/MSP430X_MSP430F5438_IAR/settings/RTOSDemo.dbgdt index beeea5c356..b90eb10802 100644 --- a/FreeRTOS/Demo/MSP430X_MSP430F5438_IAR/settings/RTOSDemo.dbgdt +++ b/FreeRTOS/Demo/MSP430X_MSP430F5438_IAR/settings/RTOSDemo.dbgdt @@ -31,7 +31,7 @@ - <Wnd0> + <Wnd3> <Tabs> <Tab> <Identity>TabID-11539-27703</Identity> @@ -43,20 +43,20 @@ </Tab> </Tabs> - <SelectedTab>0</SelectedTab></Wnd0><Wnd1><Tabs><Tab><Identity>TabID-25774-15685</Identity><TabName>Terminal I/O</TabName><Factory>TerminalIO</Factory><Session/></Tab></Tabs><SelectedTab>0</SelectedTab></Wnd1><Wnd2><Tabs><Tab><Identity>TabID-408-3295</Identity><TabName>Debug Log</TabName><Factory>Debug-Log</Factory><Session/></Tab></Tabs><SelectedTab>0</SelectedTab></Wnd2></Windows> + <SelectedTab>0</SelectedTab></Wnd3><Wnd4><Tabs><Tab><Identity>TabID-25774-15685</Identity><TabName>Terminal I/O</TabName><Factory>TerminalIO</Factory><Session/></Tab></Tabs><SelectedTab>0</SelectedTab></Wnd4><Wnd5><Tabs><Tab><Identity>TabID-408-3295</Identity><TabName>Debug Log</TabName><Factory>Debug-Log</Factory><Session/></Tab></Tabs><SelectedTab>0</SelectedTab></Wnd5></Windows> <Editor> - <Pane><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\main.c</Filename><XPos>0</XPos><YPos>425</YPos><SelStart>19939</SelStart><SelEnd>19939</SelEnd></Tab><ActiveTab>0</ActiveTab></Pane><ActivePane>0</ActivePane><Sizes><Pane><X>1000000</X><Y>1000000</Y></Pane></Sizes><SplitMode>1</SplitMode></Editor> + <Pane><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\main.c</Filename><XPos>0</XPos><YPos>0</YPos><SelStart>0</SelStart><SelEnd>0</SelEnd><XPos2>0</XPos2><YPos2>242</YPos2><SelStart2>13129</SelStart2><SelEnd2>13129</SelEnd2></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\..\..\Source\queue.c</Filename><XPos>0</XPos><YPos>0</YPos><SelStart>0</SelStart><SelEnd>0</SelEnd><XPos2>0</XPos2><YPos2>310</YPos2><SelStart2>14921</SelStart2><SelEnd2>14921</SelEnd2></Tab><ActiveTab>1</ActiveTab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\F5XX_6XX_Core_Lib\HAL_PMM.c</Filename><XPos>0</XPos><YPos>0</YPos><SelStart>0</SelStart><SelEnd>0</SelEnd><XPos2>0</XPos2><YPos2>56</YPos2><SelStart2>3206</SelStart2><SelEnd2>3206</SelEnd2></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\..\..\Source\tasks.c</Filename><XPos>0</XPos><YPos>0</YPos><SelStart>0</SelStart><SelEnd>0</SelEnd><XPos2>0</XPos2><YPos2>1630</YPos2><SelStart2>57706</SelStart2><SelEnd2>57706</SelEnd2></Tab></Pane><ActivePane>0</ActivePane><Sizes><Pane><X>1000000</X><Y>1000000</Y></Pane></Sizes><SplitMode>1</SplitMode></Editor> <Positions> - <Top><Row0><Sizes><Toolbar-01349480><key>iaridepm.enu1</key></Toolbar-01349480><Toolbar-053ff260><key>430fet1</key></Toolbar-053ff260></Sizes></Row0><Row1><Sizes><Toolbar-05b3fdc8><key>debuggergui.enu1</key></Toolbar-05b3fdc8></Sizes></Row1></Top><Left><Row0><Sizes><Wnd0><Rect><Top>-2</Top><Left>-2</Left><Bottom>716</Bottom><Right>259</Right><x>-2</x><y>-2</y><xscreen>121</xscreen><yscreen>150</yscreen><sizeHorzCX>72024</sizeHorzCX><sizeHorzCY>152749</sizeHorzCY><sizeVertCX>155357</sizeVertCX><sizeVertCY>731161</sizeVertCY></Rect></Wnd0></Sizes></Row0></Left><Right><Row0><Sizes><Wnd1><Rect><Top>-2</Top><Left>-2</Left><Bottom>716</Bottom><Right>514</Right><x>-2</x><y>-2</y><xscreen>200</xscreen><yscreen>200</yscreen><sizeHorzCX>119048</sizeHorzCX><sizeHorzCY>203666</sizeHorzCY><sizeVertCX>307143</sizeVertCX><sizeVertCY>731161</sizeVertCY></Rect></Wnd1></Sizes></Row0></Right><Bottom><Row0><Sizes><Wnd2><Rect><Top>-2</Top><Left>-2</Left><Bottom>198</Bottom><Right>1682</Right><x>-2</x><y>-2</y><xscreen>1684</xscreen><yscreen>200</yscreen><sizeHorzCX>1002381</sizeHorzCX><sizeHorzCY>203666</sizeHorzCY><sizeVertCX>119048</sizeVertCX><sizeVertCY>203666</sizeVertCY></Rect></Wnd2></Sizes></Row0></Bottom><Float><Sizes/></Float></Positions> + <Top><Row0><Sizes><Toolbar-00DD53D8><key>iaridepm.enu1</key></Toolbar-00DD53D8></Sizes></Row0><Row1><Sizes><Toolbar-1319C5A0><key>debuggergui.enu1</key></Toolbar-1319C5A0></Sizes></Row1></Top><Left><Row0><Sizes><Wnd3><Rect><Top>-2</Top><Left>-2</Left><Bottom>718</Bottom><Right>259</Right><x>-2</x><y>-2</y><xscreen>121</xscreen><yscreen>150</yscreen><sizeHorzCX>72024</sizeHorzCX><sizeHorzCY>152439</sizeHorzCY><sizeVertCX>155357</sizeVertCX><sizeVertCY>731707</sizeVertCY></Rect></Wnd3></Sizes></Row0></Left><Right><Row0><Sizes><Wnd4><Rect><Top>-2</Top><Left>-2</Left><Bottom>718</Bottom><Right>514</Right><x>-2</x><y>-2</y><xscreen>200</xscreen><yscreen>200</yscreen><sizeHorzCX>119048</sizeHorzCX><sizeHorzCY>203252</sizeHorzCY><sizeVertCX>307143</sizeVertCX><sizeVertCY>731707</sizeVertCY></Rect></Wnd4></Sizes></Row0></Right><Bottom><Row0><Sizes><Wnd5><Rect><Top>-2</Top><Left>-2</Left><Bottom>198</Bottom><Right>1682</Right><x>-2</x><y>-2</y><xscreen>1684</xscreen><yscreen>200</yscreen><sizeHorzCX>1002381</sizeHorzCX><sizeHorzCY>203252</sizeHorzCY><sizeVertCX>119048</sizeVertCX><sizeVertCY>203252</sizeVertCY></Rect></Wnd5></Sizes></Row0></Bottom><Float><Sizes/></Float></Positions> </Desktop> </Project> diff --git a/FreeRTOS/Demo/MSP430X_MSP430F5438_IAR/settings/RTOSDemo.dni b/FreeRTOS/Demo/MSP430X_MSP430F5438_IAR/settings/RTOSDemo.dni index f24622ccbe..650e12accd 100644 --- a/FreeRTOS/Demo/MSP430X_MSP430F5438_IAR/settings/RTOSDemo.dni +++ b/FreeRTOS/Demo/MSP430X_MSP430F5438_IAR/settings/RTOSDemo.dni @@ -1,5 +1,5 @@ [DebugChecksum] -Checksum=1421140093 +Checksum=-1721563698 [DisAssemblyWindow] NumStates=_ 1 State 1=_ 1 @@ -38,6 +38,14 @@ UseTrigger=1 TriggerName=main LimitSize=0 ByteLimit=50 +[CallStack] +ShowArgs=0 +[EEM State Storage] +Buffer=BAAAAAAADAAAAAAAAAAAAAAA +[NumberOfSequencerBp] +Number=4 +[CallStackLog] +Enabled=0 [Log file] LoggingEnabled=_ 0 LogFile=_ "" @@ -45,16 +53,38 @@ Category=_ 0 [TermIOLog] LoggingEnabled=_ 0 LogFile=_ "" -[CallStack] -ShowArgs=0 -[CallStackLog] -Enabled=0 [DriverProfiling] Enabled=0 -Mode=0 +Mode=1 Graph=0 Symbiont=0 Exclusions= +[InterruptLog] +LogEnabled=0 +SumEnabled=0 +GraphEnabled=0 +ShowTimeLog=1 +ShowTimeSum=1 +SumSortOrder=0 +[DataLog] +LogEnabled=0 +SumEnabled=0 +GraphEnabled=0 +ShowTimeLog=1 +ShowTimeSum=1 +[Breakpoints2] +Count=0 +[Interrupts] +Enabled=1 +[MemoryMap] +Enabled=0 +Base=0 +UseAuto=0 +TypeViolation=1 +UnspecRange=1 +ActionState=1 +[Simulator] +Freq=1000000 [Breakpoints] Count=0 [FET] diff --git a/FreeRTOS/Demo/MSP430X_MSP430F5438_IAR/settings/RTOSDemo.wsdt b/FreeRTOS/Demo/MSP430X_MSP430F5438_IAR/settings/RTOSDemo.wsdt index c5cfe63a4c..27f558a50a 100644 --- a/FreeRTOS/Demo/MSP430X_MSP430F5438_IAR/settings/RTOSDemo.wsdt +++ b/FreeRTOS/Demo/MSP430X_MSP430F5438_IAR/settings/RTOSDemo.wsdt @@ -25,7 +25,7 @@ <Windows> - <Wnd2> + <Wnd0> <Tabs> <Tab> <Identity>TabID-18858-27566</Identity> @@ -37,20 +37,20 @@ </Tab> </Tabs> - <SelectedTab>0</SelectedTab></Wnd2><Wnd3><Tabs><Tab><Identity>TabID-15348-8476</Identity><TabName>Build</TabName><Factory>Build</Factory><Session/></Tab><Tab><Identity>TabID-12693-9958</Identity><TabName>Debug Log</TabName><Factory>Debug-Log</Factory><Session/></Tab></Tabs><SelectedTab>0</SelectedTab></Wnd3></Windows> + <SelectedTab>0</SelectedTab></Wnd0><Wnd1><Tabs><Tab><Identity>TabID-15348-8476</Identity><TabName>Build</TabName><Factory>Build</Factory><Session/></Tab><Tab><Identity>TabID-12693-9958</Identity><TabName>Debug Log</TabName><Factory>Debug-Log</Factory><Session/></Tab></Tabs><SelectedTab>0</SelectedTab></Wnd1></Windows> <Editor> - <Pane><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\main.c</Filename><XPos>0</XPos><YPos>50</YPos><SelStart>19236</SelStart><SelEnd>19236</SelEnd></Tab><ActiveTab>0</ActiveTab></Pane><ActivePane>0</ActivePane><Sizes><Pane><X>1000000</X><Y>1000000</Y></Pane></Sizes><SplitMode>1</SplitMode></Editor> + <Pane><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\main.c</Filename><XPos>0</XPos><YPos>0</YPos><SelStart>0</SelStart><SelEnd>0</SelEnd><XPos2>0</XPos2><YPos2>242</YPos2><SelStart2>13129</SelStart2><SelEnd2>13129</SelEnd2></Tab><ActiveTab>0</ActiveTab></Pane><ActivePane>0</ActivePane><Sizes><Pane><X>1000000</X><Y>1000000</Y></Pane></Sizes><SplitMode>1</SplitMode></Editor> <Positions> - <Top><Row0><Sizes><Toolbar-01349480><key>iaridepm.enu1</key></Toolbar-01349480></Sizes></Row0><Row1><Sizes/></Row1><Row2><Sizes/></Row2><Row3><Sizes/></Row3></Top><Left><Row0><Sizes><Wnd2><Rect><Top>-2</Top><Left>-2</Left><Bottom>610</Bottom><Right>409</Right><x>-2</x><y>-2</y><xscreen>331</xscreen><yscreen>267</yscreen><sizeHorzCX>197024</sizeHorzCX><sizeHorzCY>271894</sizeHorzCY><sizeVertCX>244643</sizeVertCX><sizeVertCY>623218</sizeVertCY></Rect></Wnd2></Sizes></Row0></Left><Right><Row0><Sizes/></Row0></Right><Bottom><Row0><Sizes><Wnd3><Rect><Top>-2</Top><Left>-2</Left><Bottom>328</Bottom><Right>1682</Right><x>-2</x><y>-2</y><xscreen>1684</xscreen><yscreen>330</yscreen><sizeHorzCX>1002381</sizeHorzCX><sizeHorzCY>336049</sizeHorzCY><sizeVertCX>119048</sizeVertCX><sizeVertCY>203666</sizeVertCY></Rect></Wnd3></Sizes></Row0></Bottom><Float><Sizes/></Float></Positions> + <Top><Row0><Sizes><Toolbar-00DD53D8><key>iaridepm.enu1</key></Toolbar-00DD53D8></Sizes></Row0></Top><Left><Row0><Sizes><Wnd0><Rect><Top>-2</Top><Left>-2</Left><Bottom>611</Bottom><Right>409</Right><x>-2</x><y>-2</y><xscreen>331</xscreen><yscreen>268</yscreen><sizeHorzCX>197024</sizeHorzCX><sizeHorzCY>272358</sizeHorzCY><sizeVertCX>244643</sizeVertCX><sizeVertCY>622967</sizeVertCY></Rect></Wnd0></Sizes></Row0></Left><Right><Row0><Sizes/></Row0></Right><Bottom><Row0><Sizes><Wnd1><Rect><Top>-2</Top><Left>-2</Left><Bottom>329</Bottom><Right>1682</Right><x>-2</x><y>-2</y><xscreen>1684</xscreen><yscreen>331</yscreen><sizeHorzCX>1002381</sizeHorzCX><sizeHorzCY>336382</sizeHorzCY><sizeVertCX>119048</sizeVertCX><sizeVertCY>203252</sizeVertCY></Rect></Wnd1></Sizes></Row0></Bottom><Float><Sizes/></Float></Positions> </Desktop> </Workspace> diff --git a/FreeRTOS/Demo/msp430_IAR/RTOSDemo.ewd b/FreeRTOS/Demo/msp430_IAR/RTOSDemo.ewd index 0fe98c6ec9..227fc141f5 100644 --- a/FreeRTOS/Demo/msp430_IAR/RTOSDemo.ewd +++ b/FreeRTOS/Demo/msp430_IAR/RTOSDemo.ewd @@ -12,7 +12,7 @@ <name>C-SPY</name> <archiveVersion>4</archiveVersion> <data> - <version>21</version> + <version>27</version> <wantNonLocal>1</wantNonLocal> <debug>1</debug> <option> @@ -57,7 +57,7 @@ </option> <option> <name>DdfFileName</name> - <state>$TOOLKIT_DIR$\config\MSP430F449.ddf</state> + <state>$TOOLKIT_DIR$\config\debugger\MSP430F449.ddf</state> </option> <option> <name>ProcTMS</name> @@ -79,23 +79,87 @@ <name>CompilerDataModel</name> <state>1</state> </option> + <option> + <name>IVBASE</name> + <state>1</state> + </option> + <option> + <name>OCImagesSuppressCheck1</name> + <state>0</state> + </option> + <option> + <name>OCImagesPath1</name> + <state></state> + </option> + <option> + <name>OCImagesSuppressCheck2</name> + <state>0</state> + </option> + <option> + <name>OCImagesPath2</name> + <state></state> + </option> + <option> + <name>OCImagesSuppressCheck3</name> + <state>0</state> + </option> + <option> + <name>OCImagesPath3</name> + <state></state> + </option> + <option> + <name>CPUTAG</name> + <state>1</state> + </option> + <option> + <name>L092Mode</name> + <state>1</state> + </option> + <option> + <name>OCImagesOffset1</name> + <state></state> + </option> + <option> + <name>OCImagesOffset2</name> + <state></state> + </option> + <option> + <name>OCImagesOffset3</name> + <state></state> + </option> + <option> + <name>OCImagesUse1</name> + <state>0</state> + </option> + <option> + <name>OCImagesUse2</name> + <state>0</state> + </option> + <option> + <name>OCImagesUse3</name> + <state>0</state> + </option> + <option> + <name>ENERGYTRACE</name> + <state>1</state> + </option> + <option> + <name>FETIPE</name> + <state>1</state> + </option> </data> </settings> <settings> <name>430FET</name> <archiveVersion>1</archiveVersion> <data> - <version>14</version> + <version>26</version> <wantNonLocal>1</wantNonLocal> <debug>1</debug> <option> <name>CFetMandatory</name> <state>0</state> </option> - <option> - <name>EMUSuppressLoadP7</name> - <state>0</state> - </option> <option> <name>Erase</name> <state>1</state> @@ -104,10 +168,6 @@ <name>EMUVerifyDownloadP7</name> <state>1</state> </option> - <option> - <name>EMUAskSuppressP7</name> - <state>0</state> - </option> <option> <name>EraseOptionSlaveP7</name> <state>0</state> @@ -135,7 +195,7 @@ </option> <option> <name>TargetVoltage</name> - <state>3.0</state> + <state>3.3</state> </option> <option> <name>AllowLockedFlashAccessP7</name> @@ -149,10 +209,6 @@ <name>AttachOptionSlave</name> <state>0</state> </option> - <option> - <name>OProtocolTypeDefault</name> - <state>0</state> - </option> <option> <name>CRadioProtocolType</name> <state>1</state> @@ -179,7 +235,7 @@ </option> <option> <name>FetConnection</name> - <version>1</version> + <version>2</version> <state>1</state> </option> <option> @@ -198,13 +254,61 @@ <name>AllowAccessToBSL</name> <state>0</state> </option> + <option> + <name>OTargetVccTypeDefault</name> + <state>0</state> + </option> + <option> + <name>CCBetaDll</name> + <state>1</state> + </option> + <option> + <name>GPassword</name> + <state></state> + </option> + <option> + <name>DebugLPM5</name> + <state>0</state> + </option> + <option> + <name>LPM5Slave</name> + <state>0</state> + </option> + <option> + <name>CRadioAutoManualType</name> + <state>0</state> + </option> + <option> + <name>ExternalCodeDownload</name> + <state>0</state> + </option> + <option> + <name>CCVCCDefault</name> + <state>1</state> + </option> + <option> + <name>Retain</name> + <state>0</state> + </option> + <option> + <name>jstatebit</name> + <state>0</state> + </option> + <option> + <name>RadioJtagSpeedType</name> + <state>1</state> + </option> + <option> + <name>memoryTypeSlave</name> + <state>0</state> + </option> </data> </settings> <settings> <name>SIM430</name> <archiveVersion>1</archiveVersion> <data> - <version>2</version> + <version>4</version> <wantNonLocal>1</wantNonLocal> <debug>1</debug> <option> @@ -215,6 +319,22 @@ <name>CSimMandatory</name> <state>1</state> </option> + <option> + <name>derivativeSim</name> + <state>0</state> + </option> + <option> + <name>SimEnablePSP</name> + <state>0</state> + </option> + <option> + <name>SimPspOverrideConfig</name> + <state>0</state> + </option> + <option> + <name>SimPspConfigFile</name> + <state>$TOOLKIT_DIR$\CONFIG\test.psp.config</state> + </option> </data> </settings> <debuggerPlugins> @@ -222,14 +342,46 @@ <file>$TOOLKIT_DIR$\plugins\Lcd\lcd.ewplugin</file> <loadFlag>1</loadFlag> </plugin> + <plugin> + <file>$TOOLKIT_DIR$\plugins\rtos\CMX\CmxPlugin.ENU.ewplugin</file> + <loadFlag>0</loadFlag> + </plugin> + <plugin> + <file>$TOOLKIT_DIR$\plugins\rtos\CMX\CmxTinyPlugin.ENU.ewplugin</file> + <loadFlag>0</loadFlag> + </plugin> <plugin> <file>$TOOLKIT_DIR$\plugins\rtos\embOS\embOSPlugin.ewplugin</file> <loadFlag>0</loadFlag> </plugin> + <plugin> + <file>$TOOLKIT_DIR$\plugins\rtos\OpenRTOS\OpenRTOSPlugin.ewplugin</file> + <loadFlag>0</loadFlag> + </plugin> + <plugin> + <file>$TOOLKIT_DIR$\plugins\rtos\PowerPac\PowerPacRTOS.ewplugin</file> + <loadFlag>0</loadFlag> + </plugin> + <plugin> + <file>$TOOLKIT_DIR$\plugins\rtos\SafeRTOS\SafeRTOSPlugin.ewplugin</file> + <loadFlag>0</loadFlag> + </plugin> + <plugin> + <file>$TOOLKIT_DIR$\plugins\rtos\TI-RTOS\tirtosplugin.ewplugin</file> + <loadFlag>0</loadFlag> + </plugin> + <plugin> + <file>$TOOLKIT_DIR$\plugins\rtos\uCOS-II\uCOS-II-286-KA-CSpy.ewplugin</file> + <loadFlag>0</loadFlag> + </plugin> <plugin> <file>$TOOLKIT_DIR$\plugins\rtos\uCOS-II\uCOS-II-KA-CSpy.ewplugin</file> <loadFlag>0</loadFlag> </plugin> + <plugin> + <file>$TOOLKIT_DIR$\plugins\rtos\uCOS-III\uCOS-III-KA-CSpy.ewplugin</file> + <loadFlag>0</loadFlag> + </plugin> <plugin> <file>$EW_DIR$\common\plugins\CodeCoverage\CodeCoverage.ENU.ewplugin</file> <loadFlag>1</loadFlag> @@ -238,18 +390,14 @@ <file>$EW_DIR$\common\plugins\Orti\Orti.ENU.ewplugin</file> <loadFlag>0</loadFlag> </plugin> - <plugin> - <file>$EW_DIR$\common\plugins\Profiling\Profiling.ENU.ewplugin</file> - <loadFlag>1</loadFlag> - </plugin> - <plugin> - <file>$EW_DIR$\common\plugins\Stack\Stack.ENU.ewplugin</file> - <loadFlag>1</loadFlag> - </plugin> <plugin> <file>$EW_DIR$\common\plugins\SymList\SymList.ENU.ewplugin</file> <loadFlag>1</loadFlag> </plugin> + <plugin> + <file>$EW_DIR$\common\plugins\uCProbe\uCProbePlugin.ENU.ewplugin</file> + <loadFlag>0</loadFlag> + </plugin> </debuggerPlugins> </configuration> <configuration> @@ -262,7 +410,7 @@ <name>C-SPY</name> <archiveVersion>4</archiveVersion> <data> - <version>21</version> + <version>27</version> <wantNonLocal>1</wantNonLocal> <debug>0</debug> <option> @@ -329,23 +477,87 @@ <name>CompilerDataModel</name> <state>1</state> </option> + <option> + <name>IVBASE</name> + <state>1</state> + </option> + <option> + <name>OCImagesSuppressCheck1</name> + <state>0</state> + </option> + <option> + <name>OCImagesPath1</name> + <state></state> + </option> + <option> + <name>OCImagesSuppressCheck2</name> + <state>0</state> + </option> + <option> + <name>OCImagesPath2</name> + <state></state> + </option> + <option> + <name>OCImagesSuppressCheck3</name> + <state>0</state> + </option> + <option> + <name>OCImagesPath3</name> + <state></state> + </option> + <option> + <name>CPUTAG</name> + <state>1</state> + </option> + <option> + <name>L092Mode</name> + <state>1</state> + </option> + <option> + <name>OCImagesOffset1</name> + <state></state> + </option> + <option> + <name>OCImagesOffset2</name> + <state></state> + </option> + <option> + <name>OCImagesOffset3</name> + <state></state> + </option> + <option> + <name>OCImagesUse1</name> + <state>0</state> + </option> + <option> + <name>OCImagesUse2</name> + <state>0</state> + </option> + <option> + <name>OCImagesUse3</name> + <state>0</state> + </option> + <option> + <name>ENERGYTRACE</name> + <state>1</state> + </option> + <option> + <name>FETIPE</name> + <state>1</state> + </option> </data> </settings> <settings> <name>430FET</name> <archiveVersion>1</archiveVersion> <data> - <version>14</version> + <version>26</version> <wantNonLocal>1</wantNonLocal> <debug>0</debug> <option> <name>CFetMandatory</name> <state>0</state> </option> - <option> - <name>EMUSuppressLoadP7</name> - <state>0</state> - </option> <option> <name>Erase</name> <state>1</state> @@ -354,10 +566,6 @@ <name>EMUVerifyDownloadP7</name> <state>0</state> </option> - <option> - <name>EMUAskSuppressP7</name> - <state>0</state> - </option> <option> <name>EraseOptionSlaveP7</name> <state>0</state> @@ -399,10 +607,6 @@ <name>AttachOptionSlave</name> <state>0</state> </option> - <option> - <name>OProtocolTypeDefault</name> - <state>0</state> - </option> <option> <name>CRadioProtocolType</name> <state>1</state> @@ -429,7 +633,7 @@ </option> <option> <name>FetConnection</name> - <version>1</version> + <version>2</version> <state>1</state> </option> <option> @@ -448,13 +652,61 @@ <name>AllowAccessToBSL</name> <state>0</state> </option> + <option> + <name>OTargetVccTypeDefault</name> + <state>0</state> + </option> + <option> + <name>CCBetaDll</name> + <state>1</state> + </option> + <option> + <name>GPassword</name> + <state>###Uninitialized###</state> + </option> + <option> + <name>DebugLPM5</name> + <state>0</state> + </option> + <option> + <name>LPM5Slave</name> + <state>0</state> + </option> + <option> + <name>CRadioAutoManualType</name> + <state>0</state> + </option> + <option> + <name>ExternalCodeDownload</name> + <state>0</state> + </option> + <option> + <name>CCVCCDefault</name> + <state>1</state> + </option> + <option> + <name>Retain</name> + <state>0</state> + </option> + <option> + <name>jstatebit</name> + <state>0</state> + </option> + <option> + <name>RadioJtagSpeedType</name> + <state>1</state> + </option> + <option> + <name>memoryTypeSlave</name> + <state>0</state> + </option> </data> </settings> <settings> <name>SIM430</name> <archiveVersion>1</archiveVersion> <data> - <version>2</version> + <version>4</version> <wantNonLocal>1</wantNonLocal> <debug>0</debug> <option> @@ -465,6 +717,22 @@ <name>CSimMandatory</name> <state>1</state> </option> + <option> + <name>derivativeSim</name> + <state>0</state> + </option> + <option> + <name>SimEnablePSP</name> + <state>0</state> + </option> + <option> + <name>SimPspOverrideConfig</name> + <state>0</state> + </option> + <option> + <name>SimPspConfigFile</name> + <state>###Uninitialized###</state> + </option> </data> </settings> <debuggerPlugins> @@ -472,14 +740,46 @@ <file>$TOOLKIT_DIR$\plugins\Lcd\lcd.ewplugin</file> <loadFlag>1</loadFlag> </plugin> + <plugin> + <file>$TOOLKIT_DIR$\plugins\rtos\CMX\CmxPlugin.ENU.ewplugin</file> + <loadFlag>0</loadFlag> + </plugin> + <plugin> + <file>$TOOLKIT_DIR$\plugins\rtos\CMX\CmxTinyPlugin.ENU.ewplugin</file> + <loadFlag>0</loadFlag> + </plugin> <plugin> <file>$TOOLKIT_DIR$\plugins\rtos\embOS\embOSPlugin.ewplugin</file> <loadFlag>0</loadFlag> </plugin> + <plugin> + <file>$TOOLKIT_DIR$\plugins\rtos\OpenRTOS\OpenRTOSPlugin.ewplugin</file> + <loadFlag>0</loadFlag> + </plugin> + <plugin> + <file>$TOOLKIT_DIR$\plugins\rtos\PowerPac\PowerPacRTOS.ewplugin</file> + <loadFlag>0</loadFlag> + </plugin> + <plugin> + <file>$TOOLKIT_DIR$\plugins\rtos\SafeRTOS\SafeRTOSPlugin.ewplugin</file> + <loadFlag>0</loadFlag> + </plugin> + <plugin> + <file>$TOOLKIT_DIR$\plugins\rtos\TI-RTOS\tirtosplugin.ewplugin</file> + <loadFlag>0</loadFlag> + </plugin> + <plugin> + <file>$TOOLKIT_DIR$\plugins\rtos\uCOS-II\uCOS-II-286-KA-CSpy.ewplugin</file> + <loadFlag>0</loadFlag> + </plugin> <plugin> <file>$TOOLKIT_DIR$\plugins\rtos\uCOS-II\uCOS-II-KA-CSpy.ewplugin</file> <loadFlag>0</loadFlag> </plugin> + <plugin> + <file>$TOOLKIT_DIR$\plugins\rtos\uCOS-III\uCOS-III-KA-CSpy.ewplugin</file> + <loadFlag>0</loadFlag> + </plugin> <plugin> <file>$EW_DIR$\common\plugins\CodeCoverage\CodeCoverage.ENU.ewplugin</file> <loadFlag>1</loadFlag> @@ -488,18 +788,14 @@ <file>$EW_DIR$\common\plugins\Orti\Orti.ENU.ewplugin</file> <loadFlag>0</loadFlag> </plugin> - <plugin> - <file>$EW_DIR$\common\plugins\Profiling\Profiling.ENU.ewplugin</file> - <loadFlag>1</loadFlag> - </plugin> - <plugin> - <file>$EW_DIR$\common\plugins\Stack\Stack.ENU.ewplugin</file> - <loadFlag>1</loadFlag> - </plugin> <plugin> <file>$EW_DIR$\common\plugins\SymList\SymList.ENU.ewplugin</file> <loadFlag>1</loadFlag> </plugin> + <plugin> + <file>$EW_DIR$\common\plugins\uCProbe\uCProbePlugin.ENU.ewplugin</file> + <loadFlag>0</loadFlag> + </plugin> </debuggerPlugins> </configuration> </project> diff --git a/FreeRTOS/Demo/msp430_IAR/RTOSDemo.ewp b/FreeRTOS/Demo/msp430_IAR/RTOSDemo.ewp index 3e08bfcf04..ed784d394f 100644 --- a/FreeRTOS/Demo/msp430_IAR/RTOSDemo.ewp +++ b/FreeRTOS/Demo/msp430_IAR/RTOSDemo.ewp @@ -10,9 +10,9 @@ <debug>1</debug> <settings> <name>General</name> - <archiveVersion>7</archiveVersion> + <archiveVersion>14</archiveVersion> <data> - <version>24</version> + <version>32</version> <wantNonLocal>1</wantNonLocal> <debug>1</debug> <option> @@ -31,10 +31,6 @@ <name>ListPath</name> <state>Debug\List</state> </option> - <option> - <name>PosIndCode</name> - <state>0</state> - </option> <option> <name>Hardware Multiplier</name> <state>0</state> @@ -62,16 +58,16 @@ </option> <option> <name>RTConfigPath</name> - <state>$TOOLKIT_DIR$\LIB\DLIB\dl430fn.h</state> + <state>$TOOLKIT_DIR$\lib\dlib\dl430fn.h</state> </option> <option> <name>RTLibraryPath</name> - <state>$TOOLKIT_DIR$\LIB\DLIB\dl430fn.r43</state> + <state>$TOOLKIT_DIR$\lib\dlib\dl430fn.r43</state> </option> <option> <name>Input variant</name> - <version>0</version> - <state>3</state> + <version>2</version> + <state>6</state> </option> <option> <name>Input description</name> @@ -79,8 +75,8 @@ </option> <option> <name>Output variant</name> - <version>0</version> - <state>4</state> + <version>2</version> + <state>8</state> </option> <option> <name>Output description</name> @@ -128,13 +124,106 @@ <version>0</version> <state>1000111110110101101110011100111111101110011011000101110111101101100111111111111100110011111001110111001111111111111111111111111</state> </option> + <option> + <name>RadioHeapSizeType</name> + <state>0</state> + </option> + <option> + <name>RadioHardwareMultiplierType</name> + <state>0</state> + </option> + <option> + <name>GeneralMisraVer</name> + <state>0</state> + </option> + <option> + <name>GeneralMisraRules04</name> + <version>0</version> + <state>111101110010111111111000110111111111111111111111111110010111101111010101111111111111111111111111101111111011111001111011111011111111111111111</state> + </option> + <option> + <name>RadioL092ModelType</name> + <state>0</state> + </option> + <option> + <name>Ropi</name> + <state>0</state> + </option> + <option> + <name>NoRwDynamicInit</name> + <state>0</state> + </option> + <option> + <name>GRuntimeLibThreads</name> + <state>0</state> + </option> + <option> + <name>MathLib</name> + <state>0</state> + </option> + <option> + <name>RadioCodeModelType</name> + <state>1</state> + </option> + <option> + <name>GEnableMpu</name> + <state>1</state> + </option> + <option> + <name>GESupportMpu</name> + <state>0</state> + </option> + <option> + <name>GELockMpu</name> + <state>0</state> + </option> + <option> + <name>GENMIViolationMpu</name> + <state>0</state> + </option> + <option> + <name>GEAssertMpu</name> + <state>0</state> + </option> + <option> + <name>GEInfoReadMpu</name> + <state>1</state> + </option> + <option> + <name>GEInfoWriteMpu</name> + <state>1</state> + </option> + <option> + <name>GEInfoExecuteMpu</name> + <state>0</state> + </option> + <option> + <name>GEInfoAssertMpu</name> + <state>0</state> + </option> + <option> + <name>GEnableIpe</name> + <state>1</state> + </option> + <option> + <name>GESupportIpe</name> + <state>0</state> + </option> + <option> + <name>GAssertIpe</name> + <state>0</state> + </option> + <option> + <name>GLockIpe</name> + <state>0</state> + </option> </data> </settings> <settings> <name>ICC430</name> <archiveVersion>4</archiveVersion> <data> - <version>27</version> + <version>37</version> <wantNonLocal>1</wantNonLocal> <debug>1</debug> <option> @@ -262,18 +351,10 @@ <name>OCCR5Utilize</name> <state>0</state> </option> - <option> - <name>CCLangSelect</name> - <state>0</state> - </option> <option> <name>CCLibConfigHeader</name> <state>1</state> </option> - <option> - <name>CPIC</name> - <state>1</state> - </option> <option> <name>IExtraOptionsCheck</name> <state>0</state> @@ -308,11 +389,6 @@ <name>CCStdIncCheck</name> <state>0</state> </option> - <option> - <name>CCStdIncludePaths</name> - <state>$TOOLKIT_DIR$\INC\</state> - <state>$TOOLKIT_DIR$\INC\DLIB\</state> - </option> <option> <name>CompilerMisraOverride</name> <state>0</state> @@ -355,13 +431,110 @@ <version>0</version> <state>1000111110110101101110011100111111101110011011000101110111101101100111111111111100110011111001110111001111111111111111111111111</state> </option> + <option> + <name>CompilerMisraRules04</name> + <version>0</version> + <state>111101110010111111111000110111111111111111111111111110010111101111010101111111111111111111111111101111111011111001111011111011111111111111111</state> + </option> + <option> + <name>IccLang</name> + <state>0</state> + </option> + <option> + <name>IccCDialect</name> + <state>1</state> + </option> + <option> + <name>IccAllowVLA</name> + <state>0</state> + </option> + <option> + <name>IccCppDialect</name> + <state>1</state> + </option> + <option> + <name>CCPUTAG</name> + <state>1</state> + </option> + <option> + <name>CCCodeFunctions</name> + <state>CODE</state> + </option> + <option> + <name>CCData16</name> + <state>DATA16</state> + </option> + <option> + <name>CCData20</name> + <state>DATA20</state> + </option> + <option> + <name>CCIntvec</name> + <state>INTVEC</state> + </option> + <option> + <name>CCCstack</name> + <state>CSTACK</state> + </option> + <option> + <name>CCRamFuncCode</name> + <state>RAMFUNC_CODE</state> + </option> + <option> + <name>CCIsrCode</name> + <state>ISR_CODE</state> + </option> + <option> + <name>CCDifunct</name> + <state>DIFUNCT</state> + </option> + <option> + <name>IccCppInlineSemantics</name> + <state>0</state> + </option> + <option> + <name>IccStaticDestr</name> + <state>1</state> + </option> + <option> + <name>IccFloatSemantics</name> + <state>0</state> + </option> + <option> + <name>CROPI</name> + <state>1</state> + </option> + <option> + <name>CNoRwDynamicInit</name> + <state>1</state> + </option> + <option> + <name>CCOptimizationNoSizeConstraints</name> + <state>0</state> + </option> + <option> + <name>ADefines</name> + <state></state> + </option> + <option> + <name>CCGuardCalls</name> + <state>0</state> + </option> + <option> + <name>OCGuardCallsSlave</name> + <state>0</state> + </option> + <option> + <name>CompilerCodeModel</name> + <state>1</state> + </option> </data> </settings> <settings> <name>A430</name> - <archiveVersion>4</archiveVersion> + <archiveVersion>5</archiveVersion> <data> - <version>13</version> + <version>14</version> <wantNonLocal>1</wantNonLocal> <debug>1</debug> <option> @@ -518,6 +691,10 @@ <state>$PROJ_DIR$</state> <state>$PROJ_DIR$\..\..\Source\include</state> </option> + <option> + <name>ACPUTAG</name> + <state>1</state> + </option> </data> </settings> <settings> @@ -545,7 +722,7 @@ <name>XLINK</name> <archiveVersion>4</archiveVersion> <data> - <version>22</version> + <version>27</version> <wantNonLocal>1</wantNonLocal> <debug>1</debug> <option> @@ -620,7 +797,7 @@ </option> <option> <name>XclFile</name> - <state>$TOOLKIT_DIR$\CONFIG\lnk430F449.xcl</state> + <state>$TOOLKIT_DIR$\config\linker\lnk430F449.xcl</state> </option> <option> <name>XclFileSlave</name> @@ -786,7 +963,7 @@ </option> <option> <name>OverlaySystemMap</name> - <state>1</state> + <state>0</state> </option> <option> <name>RawBinaryFile</name> @@ -820,6 +997,27 @@ <name>XLibraryHeap20</name> <state>1</state> </option> + <option> + <name>CrcUnitSize</name> + <version>0</version> + <state>0</state> + </option> + <option> + <name>LinkMathLib</name> + <state>0</state> + </option> + <option> + <name>IlinkThreadsSlave</name> + <state>1</state> + </option> + <option> + <name>XlinkMPU</name> + <state>1</state> + </option> + <option> + <name>XlinkIPE</name> + <state>1</state> + </option> </data> </settings> <settings> @@ -843,6 +1041,40 @@ </option> </data> </settings> + <settings> + <name>ULP430</name> + <archiveVersion>1</archiveVersion> + <data> + <version>1</version> + <wantNonLocal>1</wantNonLocal> + <debug>1</debug> + <option> + <name>CUTest</name> + <state>-I$TOOLKIT_DIR$\inc</state> + <state>-@$TOOLKIT_DIR$\bin\iar.cmd</state> + <state>-@$PROJ_DIR$\source.txt</state> + <state>-@$PROJ_DIR$\include.txt</state> + <state>--preinclude=$PROJ_DIR$\IAR_ULPAdvisor_Defs.h</state> + </option> + <option> + <name>ULPRules</name> + <version>0</version> + <state>1111111111111111111</state> + </option> + <option> + <name>ULPEnable</name> + <state>0</state> + </option> + <option> + <name>OutputFile</name> + <state>$PROJ_FNAME$.ulp</state> + </option> + <option> + <name>ULPStatus</name> + <state>1</state> + </option> + </data> + </settings> <settings> <name>BILINK</name> <archiveVersion>0</archiveVersion> @@ -857,9 +1089,9 @@ <debug>0</debug> <settings> <name>General</name> - <archiveVersion>7</archiveVersion> + <archiveVersion>14</archiveVersion> <data> - <version>24</version> + <version>32</version> <wantNonLocal>1</wantNonLocal> <debug>0</debug> <option> @@ -878,10 +1110,6 @@ <name>ListPath</name> <state>Release\List</state> </option> - <option> - <name>PosIndCode</name> - <state>0</state> - </option> <option> <name>Hardware Multiplier</name> <state>1</state> @@ -917,8 +1145,8 @@ </option> <option> <name>Input variant</name> - <version>0</version> - <state>1</state> + <version>2</version> + <state>3</state> </option> <option> <name>Input description</name> @@ -926,8 +1154,8 @@ </option> <option> <name>Output variant</name> - <version>0</version> - <state>1</state> + <version>2</version> + <state>3</state> </option> <option> <name>Output description</name> @@ -975,13 +1203,106 @@ <version>0</version> <state>1000111110110101101110011100111111101110011011000101110111101101100111111111111100110011111001110111001111111111111111111111111</state> </option> + <option> + <name>RadioHeapSizeType</name> + <state>0</state> + </option> + <option> + <name>RadioHardwareMultiplierType</name> + <state>0</state> + </option> + <option> + <name>GeneralMisraVer</name> + <state>0</state> + </option> + <option> + <name>GeneralMisraRules04</name> + <version>0</version> + <state>111101110010111111111000110111111111111111111111111110010111101111010101111111111111111111111111101111111011111001111011111011111111111111111</state> + </option> + <option> + <name>RadioL092ModelType</name> + <state>0</state> + </option> + <option> + <name>Ropi</name> + <state>0</state> + </option> + <option> + <name>NoRwDynamicInit</name> + <state>0</state> + </option> + <option> + <name>GRuntimeLibThreads</name> + <state>0</state> + </option> + <option> + <name>MathLib</name> + <state>0</state> + </option> + <option> + <name>RadioCodeModelType</name> + <state>1</state> + </option> + <option> + <name>GEnableMpu</name> + <state>1</state> + </option> + <option> + <name>GESupportMpu</name> + <state>0</state> + </option> + <option> + <name>GELockMpu</name> + <state>0</state> + </option> + <option> + <name>GENMIViolationMpu</name> + <state>0</state> + </option> + <option> + <name>GEAssertMpu</name> + <state>0</state> + </option> + <option> + <name>GEInfoReadMpu</name> + <state>1</state> + </option> + <option> + <name>GEInfoWriteMpu</name> + <state>1</state> + </option> + <option> + <name>GEInfoExecuteMpu</name> + <state>0</state> + </option> + <option> + <name>GEInfoAssertMpu</name> + <state>0</state> + </option> + <option> + <name>GEnableIpe</name> + <state>1</state> + </option> + <option> + <name>GESupportIpe</name> + <state>0</state> + </option> + <option> + <name>GAssertIpe</name> + <state>0</state> + </option> + <option> + <name>GLockIpe</name> + <state>0</state> + </option> </data> </settings> <settings> <name>ICC430</name> <archiveVersion>4</archiveVersion> <data> - <version>27</version> + <version>37</version> <wantNonLocal>1</wantNonLocal> <debug>0</debug> <option> @@ -1109,18 +1430,10 @@ <name>OCCR5Utilize</name> <state>0</state> </option> - <option> - <name>CCLangSelect</name> - <state>0</state> - </option> <option> <name>CCLibConfigHeader</name> <state>1</state> </option> - <option> - <name>CPIC</name> - <state>1</state> - </option> <option> <name>IExtraOptionsCheck</name> <state>0</state> @@ -1153,10 +1466,6 @@ <name>CCStdIncCheck</name> <state>0</state> </option> - <option> - <name>CCStdIncludePaths</name> - <state>###Uninitialized###</state> - </option> <option> <name>CompilerMisraOverride</name> <state>0</state> @@ -1199,13 +1508,110 @@ <version>0</version> <state>1000111110110101101110011100111111101110011011000101110111101101100111111111111100110011111001110111001111111111111111111111111</state> </option> + <option> + <name>CompilerMisraRules04</name> + <version>0</version> + <state>111101110010111111111000110111111111111111111111111110010111101111010101111111111111111111111111101111111011111001111011111011111111111111111</state> + </option> + <option> + <name>IccLang</name> + <state>0</state> + </option> + <option> + <name>IccCDialect</name> + <state>1</state> + </option> + <option> + <name>IccAllowVLA</name> + <state>0</state> + </option> + <option> + <name>IccCppDialect</name> + <state>1</state> + </option> + <option> + <name>CCPUTAG</name> + <state>1</state> + </option> + <option> + <name>CCCodeFunctions</name> + <state>CODE</state> + </option> + <option> + <name>CCData16</name> + <state>DATA16</state> + </option> + <option> + <name>CCData20</name> + <state>DATA20</state> + </option> + <option> + <name>CCIntvec</name> + <state>INTVEC</state> + </option> + <option> + <name>CCCstack</name> + <state>CSTACK</state> + </option> + <option> + <name>CCRamFuncCode</name> + <state>RAMFUNC_CODE</state> + </option> + <option> + <name>CCIsrCode</name> + <state>ISR_CODE</state> + </option> + <option> + <name>CCDifunct</name> + <state>DIFUNCT</state> + </option> + <option> + <name>IccCppInlineSemantics</name> + <state>0</state> + </option> + <option> + <name>IccStaticDestr</name> + <state>1</state> + </option> + <option> + <name>IccFloatSemantics</name> + <state>0</state> + </option> + <option> + <name>CROPI</name> + <state>1</state> + </option> + <option> + <name>CNoRwDynamicInit</name> + <state>1</state> + </option> + <option> + <name>CCOptimizationNoSizeConstraints</name> + <state>0</state> + </option> + <option> + <name>ADefines</name> + <state>NDEBUG</state> + </option> + <option> + <name>CCGuardCalls</name> + <state>0</state> + </option> + <option> + <name>OCGuardCallsSlave</name> + <state>0</state> + </option> + <option> + <name>CompilerCodeModel</name> + <state>1</state> + </option> </data> </settings> <settings> <name>A430</name> - <archiveVersion>4</archiveVersion> + <archiveVersion>5</archiveVersion> <data> - <version>13</version> + <version>14</version> <wantNonLocal>1</wantNonLocal> <debug>0</debug> <option> @@ -1361,6 +1767,10 @@ <name>AUserIncludes</name> <state></state> </option> + <option> + <name>ACPUTAG</name> + <state>1</state> + </option> </data> </settings> <settings> @@ -1388,7 +1798,7 @@ <name>XLINK</name> <archiveVersion>4</archiveVersion> <data> - <version>22</version> + <version>27</version> <wantNonLocal>1</wantNonLocal> <debug>0</debug> <option> @@ -1663,6 +2073,27 @@ <name>XLibraryHeap20</name> <state>1</state> </option> + <option> + <name>CrcUnitSize</name> + <version>0</version> + <state>0</state> + </option> + <option> + <name>LinkMathLib</name> + <state>0</state> + </option> + <option> + <name>IlinkThreadsSlave</name> + <state>1</state> + </option> + <option> + <name>XlinkMPU</name> + <state>1</state> + </option> + <option> + <name>XlinkIPE</name> + <state>1</state> + </option> </data> </settings> <settings> @@ -1686,6 +2117,36 @@ </option> </data> </settings> + <settings> + <name>ULP430</name> + <archiveVersion>1</archiveVersion> + <data> + <version>1</version> + <wantNonLocal>1</wantNonLocal> + <debug>0</debug> + <option> + <name>CUTest</name> + <state>###Uninitialized###</state> + </option> + <option> + <name>ULPRules</name> + <version>0</version> + <state>1111111111111111111</state> + </option> + <option> + <name>ULPEnable</name> + <state>0</state> + </option> + <option> + <name>OutputFile</name> + <state></state> + </option> + <option> + <name>ULPStatus</name> + <state>1</state> + </option> + </data> + </settings> <settings> <name>BILINK</name> <archiveVersion>0</archiveVersion> diff --git a/FreeRTOS/Demo/msp430_IAR/RTOSDemo.ewt b/FreeRTOS/Demo/msp430_IAR/RTOSDemo.ewt new file mode 100644 index 0000000000..20153c749b --- /dev/null +++ b/FreeRTOS/Demo/msp430_IAR/RTOSDemo.ewt @@ -0,0 +1,72 @@ +<?xml version="1.0" encoding="iso-8859-1"?> + +<project> + <fileVersion>2</fileVersion> + <configuration> + <name>Debug</name> + <toolchain> + <name>MSP430</name> + </toolchain> + <debug>1</debug> + </configuration> + <configuration> + <name>Release</name> + <toolchain> + <name>MSP430</name> + </toolchain> + <debug>0</debug> + </configuration> + <group> + <name>Demo Source</name> + <file> + <name>$PROJ_DIR$\..\Common\Minimal\comtest.c</name> + </file> + <file> + <name>$PROJ_DIR$\..\Common\Minimal\flash.c</name> + </file> + <file> + <name>$PROJ_DIR$\..\..\Source\portable\MemMang\heap_1.c</name> + </file> + <file> + <name>$PROJ_DIR$\..\Common\Minimal\integer.c</name> + </file> + <file> + <name>$PROJ_DIR$\main.c</name> + </file> + <file> + <name>$PROJ_DIR$\ParTest\ParTest.c</name> + </file> + <file> + <name>$PROJ_DIR$\..\Common\Minimal\PollQ.c</name> + </file> + <file> + <name>$PROJ_DIR$\serial\serial.c</name> + </file> + <file> + <name>$PROJ_DIR$\serial\serialASM.s43</name> + </file> + </group> + <group> + <name>FreeRTOS Source</name> + <file> + <name>$PROJ_DIR$\..\..\Source\croutine.c</name> + </file> + <file> + <name>$PROJ_DIR$\..\..\Source\list.c</name> + </file> + <file> + <name>$PROJ_DIR$\..\..\Source\portable\IAR\MSP430\port.c</name> + </file> + <file> + <name>$PROJ_DIR$\..\..\Source\portable\IAR\MSP430\portext.s43</name> + </file> + <file> + <name>$PROJ_DIR$\..\..\Source\queue.c</name> + </file> + <file> + <name>$PROJ_DIR$\..\..\Source\tasks.c</name> + </file> + </group> +</project> + + diff --git a/FreeRTOS/Demo/msp430_IAR/settings/RTOSDemo.dbgdt b/FreeRTOS/Demo/msp430_IAR/settings/RTOSDemo.dbgdt index b28708d838..e7c82103bf 100644 --- a/FreeRTOS/Demo/msp430_IAR/settings/RTOSDemo.dbgdt +++ b/FreeRTOS/Demo/msp430_IAR/settings/RTOSDemo.dbgdt @@ -3,7 +3,7 @@ <Project> <Desktop> <Static> - <Debug-Log/> + <Debug-Log><ColumnWidth0>19</ColumnWidth0><ColumnWidth1>1623</ColumnWidth1></Debug-Log> <Build> <ColumnWidth0>20</ColumnWidth0> <ColumnWidth1>1006</ColumnWidth1> @@ -16,7 +16,7 @@ - <Column0>304</Column0><Column1>27</Column1><Column2>27</Column2><Column3>27</Column3></ColumnWidths> + <Column0>380</Column0><Column1>27</Column1><Column2>27</Column2><Column3>27</Column3></ColumnWidths> </Workspace> <Disassembly> @@ -28,7 +28,7 @@ - <Wnd0> + <Wnd2> <Tabs> <Tab> <Identity>TabID-22310-31641</Identity> @@ -44,7 +44,7 @@ </Tab> <Tab><Identity>TabID-3522-7304</Identity><TabName>Breakpoints</TabName><Factory>Breakpoints</Factory></Tab></Tabs> - <SelectedTab>0</SelectedTab></Wnd0><Wnd1> + <SelectedTab>0</SelectedTab></Wnd2><Wnd3> <Tabs> <Tab> <Identity>TabID-290-31644</Identity> @@ -56,20 +56,20 @@ </Tab> </Tabs> - <SelectedTab>0</SelectedTab></Wnd1></Windows> + <SelectedTab>0</SelectedTab></Wnd3></Windows> <Editor> - <Pane><Tab><Factory>TextEditor</Factory><Filename>C:\E\Dev\FreeRTOS\WorkingCopy2\Demo\msp430_IAR\main.c</Filename><XPos>0</XPos><YPos>94</YPos><SelStart>6347</SelStart><SelEnd>6347</SelEnd></Tab><ActiveTab>0</ActiveTab><Tab><Factory>TextEditor</Factory><Filename>C:\E\Dev\FreeRTOS\WorkingCopy2\Source\tasks.c</Filename><XPos>0</XPos><YPos>790</YPos><SelStart>27298</SelStart><SelEnd>27310</SelEnd></Tab></Pane><ActivePane>0</ActivePane><Sizes><Pane><X>1000000</X><Y>1000000</Y></Pane></Sizes><SplitMode>1</SplitMode></Editor> + <Pane><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\..\..\Source\portable\MemMang\heap_1.c</Filename><XPos>0</XPos><YPos>0</YPos><SelStart>0</SelStart><SelEnd>0</SelEnd><XPos2>0</XPos2><YPos2>95</YPos2><SelStart2>5287</SelStart2><SelEnd2>5308</SelEnd2></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\..\..\Source\include\FreeRTOS.h</Filename><XPos>0</XPos><YPos>0</YPos><SelStart>0</SelStart><SelEnd>0</SelEnd><XPos2>0</XPos2><YPos2>294</YPos2><SelStart2>11885</SelStart2><SelEnd2>11885</SelEnd2></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\..\..\Source\tasks.c</Filename><XPos>0</XPos><YPos>0</YPos><SelStart>0</SelStart><SelEnd>0</SelEnd><XPos2>0</XPos2><YPos2>1309</YPos2><SelStart2>47918</SelStart2><SelEnd2>47940</SelEnd2></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\main.c</Filename><XPos>0</XPos><YPos>0</YPos><SelStart>0</SelStart><SelEnd>0</SelEnd><XPos2>0</XPos2><YPos2>180</YPos2><SelStart2>9061</SelStart2><SelEnd2>9061</SelEnd2></Tab><ActiveTab>3</ActiveTab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\..\..\Source\portable\IAR\MSP430\portmacro.h</Filename><XPos>0</XPos><YPos>0</YPos><SelStart>0</SelStart><SelEnd>0</SelEnd><XPos2>0</XPos2><YPos2>132</YPos2><SelStart2>6572</SelStart2><SelEnd2>6572</SelEnd2></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\..\..\Source\queue.c</Filename><XPos>0</XPos><YPos>0</YPos><SelStart>0</SelStart><SelEnd>0</SelEnd><XPos2>0</XPos2><YPos2>317</YPos2><SelStart2>14921</SelStart2><SelEnd2>14921</SelEnd2></Tab></Pane><ActivePane>0</ActivePane><Sizes><Pane><X>1000000</X><Y>1000000</Y></Pane></Sizes><SplitMode>1</SplitMode></Editor> <Positions> - <Top><Row0><Sizes><Toolbar-0088f570><key>iaridepm.enu1</key></Toolbar-0088f570><Toolbar-01b6a7a8><key>debuggergui.enu1</key></Toolbar-01b6a7a8></Sizes></Row0><Row1><Sizes><Toolbar-01b6a668><key>430fet1</key></Toolbar-01b6a668></Sizes></Row1></Top><Left><Row0><Sizes><Wnd1><Rect><Top>-2</Top><Left>-2</Left><Bottom>644</Bottom><Right>378</Right><x>-2</x><y>-2</y><xscreen>200</xscreen><yscreen>200</yscreen><sizeHorzCX>142857</sizeHorzCX><sizeHorzCY>203666</sizeHorzCY><sizeVertCX>271429</sizeVertCX><sizeVertCY>657841</sizeVertCY></Rect></Wnd1></Sizes></Row0></Left><Right><Row0><Sizes/></Row0></Right><Bottom><Row0><Sizes><Wnd0><Rect><Top>-2</Top><Left>-2</Left><Bottom>270</Bottom><Right>1402</Right><x>-2</x><y>-2</y><xscreen>1404</xscreen><yscreen>272</yscreen><sizeHorzCX>1002857</sizeHorzCX><sizeHorzCY>276986</sizeHorzCY><sizeVertCX>142857</sizeVertCX><sizeVertCY>203666</sizeVertCY></Rect></Wnd0></Sizes></Row0></Bottom><Float><Sizes/></Float></Positions> + <Top><Row0><Sizes><Toolbar-00D553C8><key>iaridepm.enu1</key></Toolbar-00D553C8><Toolbar-0C9CA4C8><key>debuggergui.enu1</key></Toolbar-0C9CA4C8></Sizes></Row0></Top><Left><Row0><Sizes><Wnd3><Rect><Top>-2</Top><Left>-2</Left><Bottom>669</Bottom><Right>454</Right><x>-2</x><y>-2</y><xscreen>240</xscreen><yscreen>200</yscreen><sizeHorzCX>142857</sizeHorzCX><sizeHorzCY>203252</sizeHorzCY><sizeVertCX>271429</sizeVertCX><sizeVertCY>681911</sizeVertCY></Rect></Wnd3></Sizes></Row0></Left><Right><Row0><Sizes/></Row0></Right><Bottom><Row0><Sizes><Wnd2><Rect><Top>-2</Top><Left>-2</Left><Bottom>271</Bottom><Right>1682</Right><x>-2</x><y>-2</y><xscreen>1684</xscreen><yscreen>273</yscreen><sizeHorzCX>1002381</sizeHorzCX><sizeHorzCY>277439</sizeHorzCY><sizeVertCX>142857</sizeVertCX><sizeVertCY>203252</sizeVertCY></Rect></Wnd2></Sizes></Row0></Bottom><Float><Sizes/></Float></Positions> </Desktop> </Project> diff --git a/FreeRTOS/Demo/msp430_IAR/settings/RTOSDemo.dni b/FreeRTOS/Demo/msp430_IAR/settings/RTOSDemo.dni index 4fb0096e71..9510b6a01c 100644 --- a/FreeRTOS/Demo/msp430_IAR/settings/RTOSDemo.dni +++ b/FreeRTOS/Demo/msp430_IAR/settings/RTOSDemo.dni @@ -1,12 +1,3 @@ -[Interrupts] -Enabled=1 -[MemoryMap] -Enabled=0 -Base=0 -UseAuto=0 -TypeViolation=1 -UnspecRange=1 -ActionState=1 [TraceHelper] Enabled=0 ShowSource=1 @@ -34,6 +25,28 @@ UseTrigger=1 TriggerName=main LimitSize=0 ByteLimit=50 +[Stack] +FillEnabled=0 +OverflowWarningsEnabled=1 +WarningThreshold=90 +SpWarningsEnabled=1 +WarnLogOnly=1 +UseTrigger=1 +TriggerName=main +LimitSize=0 +ByteLimit=50 +[EEM State Storage] +Buffer=BAAAAAAADAAAAAAAAAAAAAAA +[NumberOfSequencerBp] +Number=4 +[DebugChecksum] +Checksum=-1810430738 +[CodeCoverage] +Enabled=_ 0 +[CallStack] +ShowArgs=0 +[CallStackLog] +Enabled=0 [Log file] LoggingEnabled=_ 0 LogFile=_ "" @@ -41,12 +54,45 @@ Category=_ 0 [TermIOLog] LoggingEnabled=_ 0 LogFile=_ "" +[DriverProfiling] +Enabled=0 +Mode=1 +Graph=0 +Symbiont=0 +Exclusions= +[InterruptLog] +LogEnabled=0 +SumEnabled=0 +GraphEnabled=0 +ShowTimeLog=1 +ShowTimeSum=1 +SumSortOrder=0 +[DataLog] +LogEnabled=0 +SumEnabled=0 +GraphEnabled=0 +ShowTimeLog=1 +ShowTimeSum=1 +[Breakpoints2] +Count=0 +[Interrupts] +Enabled=1 +[MemoryMap] +Enabled=0 +Base=0 +UseAuto=0 +TypeViolation=1 +UnspecRange=1 +ActionState=1 +[Simulator] +Freq=1000000 [Breakpoints] Count=0 [FET] Clock mode=14 Extended Clock mode=61663 -Extended Clock Control Enable=0 +Secure Password= +Extended Clock Control Enable=1 Advanced Extended Clock Control=0 Emulation mode=0 Free running=0 @@ -62,3 +108,6 @@ SP=0 SR=0 all registers=0 File name= +[Aliases] +Count=0 +SuppressDialog=0 diff --git a/FreeRTOS/Demo/msp430_IAR/settings/RTOSDemo.wsdt b/FreeRTOS/Demo/msp430_IAR/settings/RTOSDemo.wsdt index 19323e09fe..3442a55046 100644 --- a/FreeRTOS/Demo/msp430_IAR/settings/RTOSDemo.wsdt +++ b/FreeRTOS/Demo/msp430_IAR/settings/RTOSDemo.wsdt @@ -12,7 +12,7 @@ - <Column0>344</Column0><Column1>27</Column1><Column2>27</Column2><Column3>27</Column3></ColumnWidths> + <Column0>213</Column0><Column1>27</Column1><Column2>27</Column2><Column3>27</Column3></ColumnWidths> </Workspace> <Build> @@ -24,7 +24,7 @@ <Windows> - <Wnd0> + <Wnd2> <Tabs> <Tab> <Identity>TabID-14502-17068</Identity> @@ -32,11 +32,11 @@ <Factory>Workspace</Factory> <Session> - <NodeDict><ExpandedNode>RTOSDemo</ExpandedNode><ExpandedNode>RTOSDemo/Demo Source</ExpandedNode></NodeDict></Session> + <NodeDict><ExpandedNode>RTOSDemo</ExpandedNode></NodeDict></Session> </Tab> </Tabs> - <SelectedTab>0</SelectedTab></Wnd0><Wnd1> + <SelectedTab>0</SelectedTab></Wnd2><Wnd3> <Tabs> <Tab> <Identity>TabID-7853-19854</Identity> @@ -46,20 +46,20 @@ </Tab> <Tab><Identity>TabID-9700-31468</Identity><TabName>Debug Log</TabName><Factory>Debug-Log</Factory><Session/></Tab><Tab><Identity>TabID-26943-7889</Identity><TabName>Breakpoints</TabName><Factory>Breakpoints</Factory></Tab></Tabs> - <SelectedTab>0</SelectedTab></Wnd1></Windows> + <SelectedTab>0</SelectedTab></Wnd3></Windows> <Editor> - <Pane><Tab><Factory>TextEditor</Factory><Filename>C:\E\Dev\FreeRTOS\WorkingCopy2\Demo\msp430_IAR\main.c</Filename><XPos>0</XPos><YPos>145</YPos><SelStart>6347</SelStart><SelEnd>6347</SelEnd></Tab><ActiveTab>0</ActiveTab></Pane><ActivePane>0</ActivePane><Sizes><Pane><X>1000000</X><Y>1000000</Y></Pane></Sizes><SplitMode>1</SplitMode></Editor> + <Pane><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\..\..\Source\portable\MemMang\heap_1.c</Filename><XPos>0</XPos><YPos>0</YPos><SelStart>0</SelStart><SelEnd>0</SelEnd><XPos2>0</XPos2><YPos2>95</YPos2><SelStart2>5287</SelStart2><SelEnd2>5308</SelEnd2></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\..\..\Source\include\FreeRTOS.h</Filename><XPos>0</XPos><YPos>0</YPos><SelStart>0</SelStart><SelEnd>0</SelEnd><XPos2>0</XPos2><YPos2>294</YPos2><SelStart2>11885</SelStart2><SelEnd2>11885</SelEnd2></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\..\..\Source\tasks.c</Filename><XPos>0</XPos><YPos>0</YPos><SelStart>0</SelStart><SelEnd>0</SelEnd><XPos2>0</XPos2><YPos2>1309</YPos2><SelStart2>47918</SelStart2><SelEnd2>47940</SelEnd2></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\main.c</Filename><XPos>0</XPos><YPos>0</YPos><SelStart>0</SelStart><SelEnd>0</SelEnd><XPos2>0</XPos2><YPos2>180</YPos2><SelStart2>9061</SelStart2><SelEnd2>9061</SelEnd2></Tab><ActiveTab>3</ActiveTab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\..\..\Source\portable\IAR\MSP430\portmacro.h</Filename><XPos>0</XPos><YPos>0</YPos><SelStart>0</SelStart><SelEnd>0</SelEnd><XPos2>0</XPos2><YPos2>132</YPos2><SelStart2>6572</SelStart2><SelEnd2>6572</SelEnd2></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\..\..\Source\queue.c</Filename><XPos>0</XPos><YPos>0</YPos><SelStart>0</SelStart><SelEnd>0</SelEnd><XPos2>0</XPos2><YPos2>317</YPos2><SelStart2>14921</SelStart2><SelEnd2>14921</SelEnd2></Tab></Pane><ActivePane>0</ActivePane><Sizes><Pane><X>1000000</X><Y>1000000</Y></Pane></Sizes><SplitMode>1</SplitMode></Editor> <Positions> - <Top><Row0><Sizes><Toolbar-00aa9ba0><key>iaridepm.enu1</key></Toolbar-00aa9ba0></Sizes></Row0></Top><Left><Row0><Sizes><Wnd0><Rect><Top>-2</Top><Left>-2</Left><Bottom>679</Bottom><Right>418</Right><x>-2</x><y>-2</y><xscreen>240</xscreen><yscreen>200</yscreen><sizeHorzCX>142857</sizeHorzCX><sizeHorzCY>203666</sizeHorzCY><sizeVertCX>250000</sizeVertCX><sizeVertCY>693483</sizeVertCY></Rect></Wnd0></Sizes></Row0></Left><Right><Row0><Sizes/></Row0></Right><Bottom><Row0><Sizes><Wnd1><Rect><Top>-2</Top><Left>-2</Left><Bottom>259</Bottom><Right>1682</Right><x>-2</x><y>-2</y><xscreen>1684</xscreen><yscreen>261</yscreen><sizeHorzCX>1002381</sizeHorzCX><sizeHorzCY>265784</sizeHorzCY><sizeVertCX>142857</sizeVertCX><sizeVertCY>203666</sizeVertCY></Rect></Wnd1></Sizes></Row0></Bottom><Float><Sizes/></Float></Positions> + <Top><Row0><Sizes><Toolbar-00BD53C8><key>iaridepm.enu1</key></Toolbar-00BD53C8></Sizes></Row0></Top><Left><Row0><Sizes><Wnd2><Rect><Top>-2</Top><Left>-2</Left><Bottom>680</Bottom><Right>287</Right><x>-2</x><y>-2</y><xscreen>240</xscreen><yscreen>200</yscreen><sizeHorzCX>142857</sizeHorzCX><sizeHorzCY>203252</sizeHorzCY><sizeVertCX>172024</sizeVertCX><sizeVertCY>693089</sizeVertCY></Rect></Wnd2></Sizes></Row0></Left><Right><Row0><Sizes/></Row0></Right><Bottom><Row0><Sizes><Wnd3><Rect><Top>-2</Top><Left>-2</Left><Bottom>260</Bottom><Right>1682</Right><x>-2</x><y>-2</y><xscreen>1684</xscreen><yscreen>262</yscreen><sizeHorzCX>1002381</sizeHorzCX><sizeHorzCY>266260</sizeHorzCY><sizeVertCX>142857</sizeVertCX><sizeVertCY>203252</sizeVertCY></Rect></Wnd3></Sizes></Row0></Bottom><Float><Sizes/></Float></Positions> </Desktop> </Workspace>