Continue work on the MSP430X demo - still a work in progress.

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

diff --git a/Demo/MSP430X_MSP430F5438_IAR/RTOSDemo.ewd b/Demo/MSP430X_MSP430F5438_IAR/RTOSDemo.ewd
index aba9d35fcd79bb1f2b0de49fda59891da7ce05a0..fcb909d3fb3ae0fecca576c6ee66e086b8d013c2 100644 (file)
--- a/Demo/MSP430X_MSP430F5438_IAR/RTOSDemo.ewd
+++ b/Demo/MSP430X_MSP430F5438_IAR/RTOSDemo.ewd
@@ -240,7 +240,7 @@
         </option>\r
         <option>\r
           <name>TargetSettlingtime</name>\r
-          <state>10</state>\r
+          <state>0</state>\r
         </option>\r
         <option>\r
           <name>AllowAccessToBSL</name>\r
@@ -373,14 +373,14 @@
     <toolchain>\r
       <name>MSP430</name>\r
     </toolchain>\r
-    <debug>0</debug>\r
+    <debug>1</debug>\r
     <settings>\r
       <name>C-SPY</name>\r
       <archiveVersion>4</archiveVersion>\r
       <data>\r
         <version>25</version>\r
         <wantNonLocal>1</wantNonLocal>\r
-        <debug>0</debug>\r
+        <debug>1</debug>\r
         <option>\r
           <name>CInput</name>\r
           <state>1</state>\r
@@ -399,7 +399,7 @@
         </option>\r
         <option>\r
           <name>GoToEnable</name>\r
-          <state>1</state>\r
+          <state>0</state>\r
         </option>\r
         <option>\r
           <name>GoToName</name>\r
@@ -407,7 +407,7 @@
         </option>\r
         <option>\r
           <name>DynDriver</name>\r
-          <state>SIM430</state>\r
+          <state>430FET</state>\r
         </option>\r
         <option>\r
           <name>dDllSlave</name>\r
@@ -423,7 +423,7 @@
         </option>\r
         <option>\r
           <name>DdfFileName</name>\r
-          <state></state>\r
+          <state>$TOOLKIT_DIR$\config\MSP430F5438A.ddf</state>\r
         </option>\r
         <option>\r
           <name>ProcTMS</name>\r
@@ -513,7 +513,7 @@
       <data>\r
         <version>22</version>\r
         <wantNonLocal>1</wantNonLocal>\r
-        <debug>0</debug>\r
+        <debug>1</debug>\r
         <option>\r
           <name>CFetMandatory</name>\r
           <state>0</state>\r
@@ -524,7 +524,7 @@
         </option>\r
         <option>\r
           <name>EMUVerifyDownloadP7</name>\r
-          <state>0</state>\r
+          <state>1</state>\r
         </option>\r
         <option>\r
           <name>EraseOptionSlaveP7</name>\r
@@ -553,7 +553,7 @@
         </option>\r
         <option>\r
           <name>TargetVoltage</name>\r
-          <state>###Uninitialized###</state>\r
+          <state>3.3</state>\r
         </option>\r
         <option>\r
           <name>AllowLockedFlashAccessP7</name>\r
@@ -622,7 +622,7 @@
         </option>\r
         <option>\r
           <name>GPassword</name>\r
-          <state>###Uninitialized###</state>\r
+          <state></state>\r
         </option>\r
         <option>\r
           <name>DebugLPM5</name>\r
@@ -652,7 +652,7 @@
       <data>\r
         <version>4</version>\r
         <wantNonLocal>1</wantNonLocal>\r
-        <debug>0</debug>\r
+        <debug>1</debug>\r
         <option>\r
           <name>SimOddAddressCheckP7</name>\r
           <state>1</state>\r
@@ -675,7 +675,7 @@
         </option>\r
         <option>\r
           <name>SimPspConfigFile</name>\r
-          <state>###Uninitialized###</state>\r
+          <state>$TOOLKIT_DIR$\CONFIG\test.psp.config</state>\r
         </option>\r
       </data>\r
     </settings>\r
@@ -690,7 +690,7 @@
       </plugin>\r
       <plugin>\r
         <file>$TOOLKIT_DIR$\plugins\rtos\OpenRTOS\OpenRTOSPlugin.ewplugin</file>\r
-        <loadFlag>0</loadFlag>\r
+        <loadFlag>1</loadFlag>\r
       </plugin>\r
       <plugin>\r
         <file>$TOOLKIT_DIR$\plugins\rtos\PowerPac\PowerPacRTOS.ewplugin</file>\r

diff --git a/Demo/MSP430X_MSP430F5438_IAR/RTOSDemo.ewp b/Demo/MSP430X_MSP430F5438_IAR/RTOSDemo.ewp
index d9fd0a34f7d9a7fc2102655cce28c058fab758b1..c05a495b55bb2066cb82dc413055f7285bb65eb6 100644 (file)
--- a/Demo/MSP430X_MSP430F5438_IAR/RTOSDemo.ewp
+++ b/Demo/MSP430X_MSP430F5438_IAR/RTOSDemo.ewp
@@ -898,14 +898,14 @@
     <toolchain>\r
       <name>MSP430</name>\r
     </toolchain>\r
-    <debug>0</debug>\r
+    <debug>1</debug>\r
     <settings>\r
       <name>General</name>\r
       <archiveVersion>7</archiveVersion>\r
       <data>\r
         <version>27</version>\r
         <wantNonLocal>1</wantNonLocal>\r
-        <debug>0</debug>\r
+        <debug>1</debug>\r
         <option>\r
           <name>ExePath</name>\r
           <state>Release\Exe</state>\r
@@ -941,42 +941,42 @@
         <option>\r
           <name>GRuntimeLibSelect</name>\r
           <version>0</version>\r
-          <state>1</state>\r
+          <state>2</state>\r
         </option>\r
         <option>\r
           <name>RTDescription</name>\r
-          <state></state>\r
+          <state>Use the full configuration of the C/EC++ runtime library. Full locale interface, C locale, file descriptor support, multibytes in printf and scanf, and hex floats in strtod.</state>\r
         </option>\r
         <option>\r
           <name>RTConfigPath</name>\r
-          <state>xxx.h</state>\r
+          <state>$TOOLKIT_DIR$\LIB\DLIB\dl430xlff.h</state>\r
         </option>\r
         <option>\r
           <name>RTLibraryPath</name>\r
-          <state>xxx.r43</state>\r
+          <state>$TOOLKIT_DIR$\LIB\DLIB\dl430xlff.r43</state>\r
         </option>\r
         <option>\r
           <name>Input variant</name>\r
           <version>0</version>\r
-          <state>0</state>\r
+          <state>3</state>\r
         </option>\r
         <option>\r
           <name>Input description</name>\r
-          <state></state>\r
+          <state>No specifier n, no float or long long, no scan set, no assignment suppressing.</state>\r
         </option>\r
         <option>\r
           <name>Output variant</name>\r
           <version>0</version>\r
-          <state>0</state>\r
+          <state>4</state>\r
         </option>\r
         <option>\r
           <name>Output description</name>\r
-          <state></state>\r
+          <state>No specifier a or A, no specifier n, no float or long long, no flags.</state>\r
         </option>\r
         <option>\r
           <name>GRuntimeLibSelectSlave</name>\r
           <version>0</version>\r
-          <state>1</state>\r
+          <state>2</state>\r
         </option>\r
         <option>\r
           <name>OGCore</name>\r
@@ -992,7 +992,7 @@
         </option>\r
         <option>\r
           <name>OGChipSelectMenu</name>\r
-          <state></state>\r
+          <state>MSP430F5438A  MSP430F5438A</state>\r
         </option>\r
         <option>\r
           <name>GStackHeapOverride</name>\r
@@ -1000,19 +1000,19 @@
         </option>\r
         <option>\r
           <name>GStackSize2</name>\r
-          <state>###Uninitialized###</state>\r
+          <state>160</state>\r
         </option>\r
         <option>\r
           <name>GHeapSize2</name>\r
-          <state>###Uninitialized###</state>\r
+          <state>160</state>\r
         </option>\r
         <option>\r
           <name>RadioDataModelType</name>\r
-          <state>0</state>\r
+          <state>2</state>\r
         </option>\r
         <option>\r
           <name>GHeap20Size</name>\r
-          <state>###Uninitialized###</state>\r
+          <state>80</state>\r
         </option>\r
         <option>\r
           <name>GeneralMisraRules98</name>\r
@@ -1048,10 +1048,10 @@
       <data>\r
         <version>30</version>\r
         <wantNonLocal>1</wantNonLocal>\r
-        <debug>0</debug>\r
+        <debug>1</debug>\r
         <option>\r
           <name>CCDefines</name>\r
-          <state>NDEBUG</state>\r
+          <state></state>\r
         </option>\r
         <option>\r
           <name>CCPreprocFile</name>\r
@@ -1091,7 +1091,7 @@
         </option>\r
         <option>\r
           <name>CCDiagSuppress</name>\r
-          <state></state>\r
+          <state>Pa082</state>\r
         </option>\r
         <option>\r
           <name>CCDiagRemark</name>\r
@@ -1128,7 +1128,7 @@
         </option>\r
         <option>\r
           <name>CCDebugInfo</name>\r
-          <state>0</state>\r
+          <state>1</state>\r
         </option>\r
         <option>\r
           <name>IProcessor</name>\r
@@ -1164,7 +1164,7 @@
         </option>\r
         <option>\r
           <name>OutputFile</name>\r
-          <state></state>\r
+          <state>$FILE_BNAME$.r43</state>\r
         </option>\r
         <option>\r
           <name>CCLibConfigHeader</name>\r
@@ -1208,7 +1208,13 @@
         </option>\r
         <option>\r
           <name>newCCIncludePaths</name>\r
-          <state></state>\r
+          <state>$PROJ_DIR$\F5XX_6XX_Core_Lib</state>\r
+          <state>$PROJ_DIR$\MSP-EXP430F5438_HAL</state>\r
+          <state>$PROJ_DIR$\UserExperienceDemo</state>\r
+          <state>$PROJ_DIR$\..\Common\include</state>\r
+          <state>$PROJ_DIR$\..\..\Source\include</state>\r
+          <state>$PROJ_DIR$\..\..\Source\portable\IAR\MSP430X</state>\r
+          <state>$PROJ_DIR$</state>\r
         </option>\r
         <option>\r
           <name>CCStdIncCheck</name>\r
@@ -1245,7 +1251,7 @@
         </option>\r
         <option>\r
           <name>CCOptLevelSlave</name>\r
-          <state>1</state>\r
+          <state>3</state>\r
         </option>\r
         <option>\r
           <name>CInput</name>\r
@@ -1293,7 +1299,7 @@
       <data>\r
         <version>13</version>\r
         <wantNonLocal>1</wantNonLocal>\r
-        <debug>0</debug>\r
+        <debug>1</debug>\r
         <option>\r
           <name>AObjPrefix</name>\r
           <state>1</state>\r
@@ -1397,7 +1403,7 @@
         </option>\r
         <option>\r
           <name>ADebug</name>\r
-          <state>0</state>\r
+          <state>1</state>\r
         </option>\r
         <option>\r
           <name>ADebugType</name>\r
@@ -1417,7 +1423,7 @@
         </option>\r
         <option>\r
           <name>OutputFile</name>\r
-          <state></state>\r
+          <state>$FILE_BNAME$.r43</state>\r
         </option>\r
         <option>\r
           <name>AMultibyteSupport</name>\r
@@ -1445,7 +1451,7 @@
         </option>\r
         <option>\r
           <name>AUserIncludes</name>\r
-          <state></state>\r
+          <state>$PROJ_DIR$</state>\r
         </option>\r
       </data>\r
     </settings>\r
@@ -1476,14 +1482,14 @@
       <data>\r
         <version>22</version>\r
         <wantNonLocal>1</wantNonLocal>\r
-        <debug>0</debug>\r
+        <debug>1</debug>\r
         <option>\r
           <name>XOutOverride</name>\r
           <state>0</state>\r
         </option>\r
         <option>\r
           <name>OutputFile</name>\r
-          <state></state>\r
+          <state>RTOSDemo.d43</state>\r
         </option>\r
         <option>\r
           <name>OutputFormat</name>\r
@@ -1497,7 +1503,7 @@
         </option>\r
         <option>\r
           <name>SecondaryOutputFile</name>\r
-          <state></state>\r
+          <state>(None for the selected format)</state>\r
         </option>\r
         <option>\r
           <name>XDefines</name>\r
@@ -1517,7 +1523,7 @@
         </option>\r
         <option>\r
           <name>XList</name>\r
-          <state>0</state>\r
+          <state>1</state>\r
         </option>\r
         <option>\r
           <name>SegmentMap</name>\r
@@ -1537,7 +1543,7 @@
         </option>\r
         <option>\r
           <name>XIncludes</name>\r
-          <state>###Uninitialized###</state>\r
+          <state>$TOOLKIT_DIR$\LIB\</state>\r
         </option>\r
         <option>\r
           <name>ModuleStatus</name>\r
@@ -1545,11 +1551,11 @@
         </option>\r
         <option>\r
           <name>XclOverride</name>\r
-          <state>0</state>\r
+          <state>1</state>\r
         </option>\r
         <option>\r
           <name>XclFile</name>\r
-          <state>lnk0t.xcl</state>\r
+          <state>$PROJ_DIR$\lnk430F5438A_mod.xcl</state>\r
         </option>\r
         <option>\r
           <name>XclFileSlave</name>\r
@@ -1595,7 +1601,7 @@
         </option>\r
         <option>\r
           <name>SuppressDiags</name>\r
-          <state></state>\r
+          <state>w6</state>\r
         </option>\r
         <option>\r
           <name>TreatAsWarn</name>\r
@@ -1637,11 +1643,11 @@
         </option>\r
         <option>\r
           <name>xcProgramEntryLabel</name>\r
-          <state></state>\r
+          <state>__program_start</state>\r
         </option>\r
         <option>\r
           <name>DebugInformation</name>\r
-          <state>1</state>\r
+          <state>0</state>\r
         </option>\r
         <option>\r
           <name>RuntimeControl</name>\r
@@ -1677,7 +1683,7 @@
         </option>\r
         <option>\r
           <name>ExtraOutputFile</name>\r
-          <state></state>\r
+          <state>RTOSDemo.a43</state>\r
         </option>\r
         <option>\r
           <name>ExtraOutputFormat</name>\r
@@ -1757,7 +1763,7 @@
       <data>\r
         <version>0</version>\r
         <wantNonLocal>1</wantNonLocal>\r
-        <debug>0</debug>\r
+        <debug>1</debug>\r
         <option>\r
           <name>XAROutOverride</name>\r
           <state>0</state>\r
@@ -1780,24 +1786,9 @@
   </configuration>\r
   <group>\r
     <name>F5XX_6XX_Core_Lib</name>\r
-    <file>\r
-      <name>$PROJ_DIR$\F5XX_6XX_Core_Lib\hal_macros.h</name>\r
-    </file>\r
-    <file>\r
-      <name>$PROJ_DIR$\F5XX_6XX_Core_Lib\hal_PMM.c</name>\r
-      <excluded>\r
-        <configuration>Debug</configuration>\r
-      </excluded>\r
-    </file>\r
-    <file>\r
-      <name>$PROJ_DIR$\F5XX_6XX_Core_Lib\hal_PMM.h</name>\r
-    </file>\r
     <file>\r
       <name>$PROJ_DIR$\F5XX_6XX_Core_Lib\hal_UCS.c</name>\r
     </file>\r
-    <file>\r
-      <name>$PROJ_DIR$\F5XX_6XX_Core_Lib\hal_UCS.h</name>\r
-    </file>\r
   </group>\r
   <group>\r
     <name>FreeRTOS_Source</name>\r
@@ -1825,84 +1816,21 @@
   </group>\r
   <group>\r
     <name>MSP-EXP430F5438_HAL</name>\r
-    <file>\r
-      <name>$PROJ_DIR$\MSP-EXP430F5438_HAL\cc2500.h</name>\r
-    </file>\r
-    <file>\r
-      <name>$PROJ_DIR$\MSP-EXP430F5438_HAL\hal_adc.c</name>\r
-      <excluded>\r
-        <configuration>Debug</configuration>\r
-      </excluded>\r
-    </file>\r
-    <file>\r
-      <name>$PROJ_DIR$\MSP-EXP430F5438_HAL\hal_adc.h</name>\r
-    </file>\r
     <file>\r
       <name>$PROJ_DIR$\MSP-EXP430F5438_HAL\hal_board.c</name>\r
     </file>\r
-    <file>\r
-      <name>$PROJ_DIR$\MSP-EXP430F5438_HAL\hal_board.h</name>\r
-    </file>\r
     <file>\r
       <name>$PROJ_DIR$\MSP-EXP430F5438_HAL\hal_buttons.c</name>\r
     </file>\r
-    <file>\r
-      <name>$PROJ_DIR$\MSP-EXP430F5438_HAL\hal_buttons.h</name>\r
-    </file>\r
     <file>\r
       <name>$PROJ_DIR$\MSP-EXP430F5438_HAL\hal_lcd.c</name>\r
     </file>\r
-    <file>\r
-      <name>$PROJ_DIR$\MSP-EXP430F5438_HAL\hal_lcd.h</name>\r
-    </file>\r
     <file>\r
       <name>$PROJ_DIR$\MSP-EXP430F5438_HAL\hal_lcd_fonts.c</name>\r
     </file>\r
-    <file>\r
-      <name>$PROJ_DIR$\MSP-EXP430F5438_HAL\hal_lcd_fonts.h</name>\r
-    </file>\r
     <file>\r
       <name>$PROJ_DIR$\MSP-EXP430F5438_HAL\hal_MSP-EXP430F5438.h</name>\r
     </file>\r
-    <file>\r
-      <name>$PROJ_DIR$\MSP-EXP430F5438_HAL\hal_rf.c</name>\r
-      <excluded>\r
-        <configuration>Debug</configuration>\r
-      </excluded>\r
-    </file>\r
-    <file>\r
-      <name>$PROJ_DIR$\MSP-EXP430F5438_HAL\hal_rf.h</name>\r
-    </file>\r
-    <file>\r
-      <name>$PROJ_DIR$\MSP-EXP430F5438_HAL\hal_rf_settings.h</name>\r
-    </file>\r
-    <file>\r
-      <name>$PROJ_DIR$\MSP-EXP430F5438_HAL\hal_rtc.c</name>\r
-      <excluded>\r
-        <configuration>Debug</configuration>\r
-      </excluded>\r
-    </file>\r
-    <file>\r
-      <name>$PROJ_DIR$\MSP-EXP430F5438_HAL\hal_rtc.h</name>\r
-    </file>\r
-    <file>\r
-      <name>$PROJ_DIR$\MSP-EXP430F5438_HAL\hal_tlv.c</name>\r
-      <excluded>\r
-        <configuration>Debug</configuration>\r
-      </excluded>\r
-    </file>\r
-    <file>\r
-      <name>$PROJ_DIR$\MSP-EXP430F5438_HAL\hal_tlv.h</name>\r
-    </file>\r
-    <file>\r
-      <name>$PROJ_DIR$\MSP-EXP430F5438_HAL\hal_usb.c</name>\r
-      <excluded>\r
-        <configuration>Debug</configuration>\r
-      </excluded>\r
-    </file>\r
-    <file>\r
-      <name>$PROJ_DIR$\MSP-EXP430F5438_HAL\hal_usb.h</name>\r
-    </file>\r
   </group>\r
   <group>\r
     <name>Standard_Demo_Tasks</name>\r
@@ -1916,141 +1844,6 @@
       <name>$PROJ_DIR$\..\Common\Minimal\GenQTest.c</name>\r
     </file>\r
   </group>\r
-  <group>\r
-    <name>UserExperienceDemo</name>\r
-    <file>\r
-      <name>$PROJ_DIR$\UserExperienceDemo\5xx_ACTIVE_test.h</name>\r
-    </file>\r
-    <file>\r
-      <name>$PROJ_DIR$\UserExperienceDemo\5xx_ACTIVE_test.s43</name>\r
-    </file>\r
-    <file>\r
-      <name>$PROJ_DIR$\UserExperienceDemo\adcTemp.c</name>\r
-      <excluded>\r
-        <configuration>Debug</configuration>\r
-      </excluded>\r
-    </file>\r
-    <file>\r
-      <name>$PROJ_DIR$\UserExperienceDemo\adcTemp.h</name>\r
-    </file>\r
-    <file>\r
-      <name>$PROJ_DIR$\UserExperienceDemo\audio.c</name>\r
-      <excluded>\r
-        <configuration>Debug</configuration>\r
-      </excluded>\r
-    </file>\r
-    <file>\r
-      <name>$PROJ_DIR$\UserExperienceDemo\audio.h</name>\r
-    </file>\r
-    <file>\r
-      <name>$PROJ_DIR$\UserExperienceDemo\balanceBall.c</name>\r
-      <excluded>\r
-        <configuration>Debug</configuration>\r
-      </excluded>\r
-    </file>\r
-    <file>\r
-      <name>$PROJ_DIR$\UserExperienceDemo\balanceBall.h</name>\r
-    </file>\r
-    <file>\r
-      <name>$PROJ_DIR$\UserExperienceDemo\clock.c</name>\r
-      <excluded>\r
-        <configuration>Debug</configuration>\r
-      </excluded>\r
-    </file>\r
-    <file>\r
-      <name>$PROJ_DIR$\UserExperienceDemo\clock.h</name>\r
-    </file>\r
-    <file>\r
-      <name>$PROJ_DIR$\UserExperienceDemo\FFT.c</name>\r
-      <excluded>\r
-        <configuration>Debug</configuration>\r
-      </excluded>\r
-    </file>\r
-    <file>\r
-      <name>$PROJ_DIR$\UserExperienceDemo\FFT.h</name>\r
-    </file>\r
-    <file>\r
-      <name>$PROJ_DIR$\UserExperienceDemo\FFT_430.h</name>\r
-    </file>\r
-    <file>\r
-      <name>$PROJ_DIR$\UserExperienceDemo\FFT_430.s43</name>\r
-      <excluded>\r
-        <configuration>Debug</configuration>\r
-      </excluded>\r
-    </file>\r
-    <file>\r
-      <name>$PROJ_DIR$\UserExperienceDemo\flashUtils.c</name>\r
-      <excluded>\r
-        <configuration>Debug</configuration>\r
-      </excluded>\r
-    </file>\r
-    <file>\r
-      <name>$PROJ_DIR$\UserExperienceDemo\flashUtils.h</name>\r
-    </file>\r
-    <file>\r
-      <name>$PROJ_DIR$\UserExperienceDemo\LPM.c</name>\r
-      <excluded>\r
-        <configuration>Debug</configuration>\r
-      </excluded>\r
-    </file>\r
-    <file>\r
-      <name>$PROJ_DIR$\UserExperienceDemo\LPM.h</name>\r
-    </file>\r
-    <file>\r
-      <name>$PROJ_DIR$\UserExperienceDemo\menuSetting.c</name>\r
-      <excluded>\r
-        <configuration>Debug</configuration>\r
-      </excluded>\r
-    </file>\r
-    <file>\r
-      <name>$PROJ_DIR$\UserExperienceDemo\menuSetting.h</name>\r
-    </file>\r
-    <file>\r
-      <name>$PROJ_DIR$\UserExperienceDemo\PMM.c</name>\r
-      <excluded>\r
-        <configuration>Debug</configuration>\r
-      </excluded>\r
-    </file>\r
-    <file>\r
-      <name>$PROJ_DIR$\UserExperienceDemo\PMM.h</name>\r
-    </file>\r
-    <file>\r
-      <name>$PROJ_DIR$\UserExperienceDemo\PowerTest.c</name>\r
-      <excluded>\r
-        <configuration>Debug</configuration>\r
-      </excluded>\r
-    </file>\r
-    <file>\r
-      <name>$PROJ_DIR$\UserExperienceDemo\PowerTest.h</name>\r
-    </file>\r
-    <file>\r
-      <name>$PROJ_DIR$\UserExperienceDemo\usbTest.c</name>\r
-      <excluded>\r
-        <configuration>Debug</configuration>\r
-      </excluded>\r
-    </file>\r
-    <file>\r
-      <name>$PROJ_DIR$\UserExperienceDemo\usbTest.h</name>\r
-    </file>\r
-    <file>\r
-      <name>$PROJ_DIR$\UserExperienceDemo\UserExperience_F5438A.c</name>\r
-      <excluded>\r
-        <configuration>Debug</configuration>\r
-      </excluded>\r
-    </file>\r
-    <file>\r
-      <name>$PROJ_DIR$\UserExperienceDemo\UserExperience_F5438A.h</name>\r
-    </file>\r
-    <file>\r
-      <name>$PROJ_DIR$\UserExperienceDemo\UserExperienceGraphics.c</name>\r
-      <excluded>\r
-        <configuration>Debug</configuration>\r
-      </excluded>\r
-    </file>\r
-    <file>\r
-      <name>$PROJ_DIR$\UserExperienceDemo\UserExperienceGraphics.h</name>\r
-    </file>\r
-  </group>\r
   <file>\r
     <name>$PROJ_DIR$\lnk430F5438A_mod.xcl</name>\r
   </file>\r

diff --git a/Demo/MSP430X_MSP430F5438_IAR/lnk430F5438A_mod.xcl b/Demo/MSP430X_MSP430F5438_IAR/lnk430F5438A_mod.xcl
index 001b52bbc8febf1dc247225026c9a6b037ef7156..99dc499d94db3838c09fd6aa8bb32ac73b654eac 100644 (file)
--- a/Demo/MSP430X_MSP430F5438_IAR/lnk430F5438A_mod.xcl
+++ b/Demo/MSP430X_MSP430F5438_IAR/lnk430F5438A_mod.xcl
@@ -195,9 +195,10 @@
 \r
 // *** Modified to place code in high memory and insodoing, testing the port.\r
 // Original code\r
--P(CODE)CODE=5C00-FF7F,10000-45BFF\r
+//-P(CODE)CODE=5C00-FF7F,10000-45BFF\r
 // Modified code\r
-//-P(CODE)CODE=10000-45BFF\r
+-P(CODE)CODE=10000-45BFF\r
+\r
 -Z(CODE)CODE_ID\r
 \r
 // ---------------------------\r

diff --git a/Demo/MSP430X_MSP430F5438_IAR/main.c b/Demo/MSP430X_MSP430F5438_IAR/main.c
index 802bf53e42a83fd8053f9f42009b2a756e2af6e6..9a922b81cb9b82cd49b208071de17aa79b7107b3 100644 (file)
--- a/Demo/MSP430X_MSP430F5438_IAR/main.c
+++ b/Demo/MSP430X_MSP430F5438_IAR/main.c
@@ -155,6 +155,7 @@ void main( void )
                xTaskCreate( vRegTest2Task, "Reg2", configMINIMAL_STACK_SIZE, NULL, 0, NULL );\r
                vTaskStartScheduler();\r
        }\r
+       \r
        for( ;; );\r
 }\r
 /*-----------------------------------------------------------*/\r
@@ -322,6 +323,8 @@ unsigned long ulCPU_Clock_KHz = ( configCPU_CLOCK_HZ / 1000UL );
        halLcdClearScreen();\r
        \r
        halLcdPrintLine( " www.FreeRTOS.org", 0,  OVERWRITE_TEXT );\r
+       \r
+while( ( halButtonsPressed() & BUTTON_UP ) == 0 );\r
 }\r
 /*-----------------------------------------------------------*/\r
 \r