diff --git a/Demo/MSP430X_MSP430F5438_IAR/RTOSDemo.ewd b/Demo/MSP430X_MSP430F5438_IAR/RTOSDemo.ewd index aba9d35fc..fcb909d3f 100644 --- a/Demo/MSP430X_MSP430F5438_IAR/RTOSDemo.ewd +++ b/Demo/MSP430X_MSP430F5438_IAR/RTOSDemo.ewd @@ -240,7 +240,7 @@ TargetSettlingtime - 10 + 0 AllowAccessToBSL @@ -373,14 +373,14 @@ MSP430 - 0 + 1 C-SPY 4 25 1 - 0 + 1 CInput 1 @@ -399,7 +399,7 @@ GoToEnable - 1 + 0 GoToName @@ -407,7 +407,7 @@ DynDriver - SIM430 + 430FET dDllSlave @@ -423,7 +423,7 @@ DdfFileName - + $TOOLKIT_DIR$\config\MSP430F5438A.ddf ProcTMS @@ -513,7 +513,7 @@ 22 1 - 0 + 1 CFetMandatory 0 @@ -524,7 +524,7 @@ EMUVerifyDownloadP7 - 0 + 1 EraseOptionSlaveP7 @@ -553,7 +553,7 @@ TargetVoltage - ###Uninitialized### + 3.3 AllowLockedFlashAccessP7 @@ -622,7 +622,7 @@ GPassword - ###Uninitialized### + DebugLPM5 @@ -652,7 +652,7 @@ 4 1 - 0 + 1 SimOddAddressCheckP7 1 @@ -675,7 +675,7 @@ SimPspConfigFile - ###Uninitialized### + $TOOLKIT_DIR$\CONFIG\test.psp.config @@ -690,7 +690,7 @@ $TOOLKIT_DIR$\plugins\rtos\OpenRTOS\OpenRTOSPlugin.ewplugin - 0 + 1 $TOOLKIT_DIR$\plugins\rtos\PowerPac\PowerPacRTOS.ewplugin diff --git a/Demo/MSP430X_MSP430F5438_IAR/RTOSDemo.ewp b/Demo/MSP430X_MSP430F5438_IAR/RTOSDemo.ewp index d9fd0a34f..c05a495b5 100644 --- a/Demo/MSP430X_MSP430F5438_IAR/RTOSDemo.ewp +++ b/Demo/MSP430X_MSP430F5438_IAR/RTOSDemo.ewp @@ -898,14 +898,14 @@ MSP430 - 0 + 1 General 7 27 1 - 0 + 1 ExePath Release\Exe @@ -941,42 +941,42 @@ GRuntimeLibSelect 0 - 1 + 2 RTDescription - + 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. RTConfigPath - xxx.h + $TOOLKIT_DIR$\LIB\DLIB\dl430xlff.h RTLibraryPath - xxx.r43 + $TOOLKIT_DIR$\LIB\DLIB\dl430xlff.r43 Input variant 0 - 0 + 3 Input description - + No specifier n, no float or long long, no scan set, no assignment suppressing. Output variant 0 - 0 + 4 Output description - + No specifier a or A, no specifier n, no float or long long, no flags. GRuntimeLibSelectSlave 0 - 1 + 2 OGCore @@ -992,7 +992,7 @@ OGChipSelectMenu - + MSP430F5438A MSP430F5438A GStackHeapOverride @@ -1000,19 +1000,19 @@ GStackSize2 - ###Uninitialized### + 160 GHeapSize2 - ###Uninitialized### + 160 RadioDataModelType - 0 + 2 GHeap20Size - ###Uninitialized### + 80 GeneralMisraRules98 @@ -1048,10 +1048,10 @@ 30 1 - 0 + 1 CCDefines - NDEBUG + CCPreprocFile @@ -1091,7 +1091,7 @@ CCDiagSuppress - + Pa082 CCDiagRemark @@ -1128,7 +1128,7 @@ CCDebugInfo - 0 + 1 IProcessor @@ -1164,7 +1164,7 @@ OutputFile - + $FILE_BNAME$.r43 CCLibConfigHeader @@ -1208,7 +1208,13 @@ newCCIncludePaths - + $PROJ_DIR$\F5XX_6XX_Core_Lib + $PROJ_DIR$\MSP-EXP430F5438_HAL + $PROJ_DIR$\UserExperienceDemo + $PROJ_DIR$\..\Common\include + $PROJ_DIR$\..\..\Source\include + $PROJ_DIR$\..\..\Source\portable\IAR\MSP430X + $PROJ_DIR$ CCStdIncCheck @@ -1245,7 +1251,7 @@ CCOptLevelSlave - 1 + 3 CInput @@ -1293,7 +1299,7 @@ 13 1 - 0 + 1 AObjPrefix 1 @@ -1397,7 +1403,7 @@ ADebug - 0 + 1 ADebugType @@ -1417,7 +1423,7 @@ OutputFile - + $FILE_BNAME$.r43 AMultibyteSupport @@ -1445,7 +1451,7 @@ AUserIncludes - + $PROJ_DIR$ @@ -1476,14 +1482,14 @@ 22 1 - 0 + 1 XOutOverride 0 OutputFile - + RTOSDemo.d43 OutputFormat @@ -1497,7 +1503,7 @@ SecondaryOutputFile - + (None for the selected format) XDefines @@ -1517,7 +1523,7 @@ XList - 0 + 1 SegmentMap @@ -1537,7 +1543,7 @@ XIncludes - ###Uninitialized### + $TOOLKIT_DIR$\LIB\ ModuleStatus @@ -1545,11 +1551,11 @@ XclOverride - 0 + 1 XclFile - lnk0t.xcl + $PROJ_DIR$\lnk430F5438A_mod.xcl XclFileSlave @@ -1595,7 +1601,7 @@ SuppressDiags - + w6 TreatAsWarn @@ -1637,11 +1643,11 @@ xcProgramEntryLabel - + __program_start DebugInformation - 1 + 0 RuntimeControl @@ -1677,7 +1683,7 @@ ExtraOutputFile - + RTOSDemo.a43 ExtraOutputFormat @@ -1757,7 +1763,7 @@ 0 1 - 0 + 1 XAROutOverride 0 @@ -1780,24 +1786,9 @@ F5XX_6XX_Core_Lib - - $PROJ_DIR$\F5XX_6XX_Core_Lib\hal_macros.h - - - $PROJ_DIR$\F5XX_6XX_Core_Lib\hal_PMM.c - - Debug - - - - $PROJ_DIR$\F5XX_6XX_Core_Lib\hal_PMM.h - $PROJ_DIR$\F5XX_6XX_Core_Lib\hal_UCS.c - - $PROJ_DIR$\F5XX_6XX_Core_Lib\hal_UCS.h - FreeRTOS_Source @@ -1825,84 +1816,21 @@ MSP-EXP430F5438_HAL - - $PROJ_DIR$\MSP-EXP430F5438_HAL\cc2500.h - - - $PROJ_DIR$\MSP-EXP430F5438_HAL\hal_adc.c - - Debug - - - - $PROJ_DIR$\MSP-EXP430F5438_HAL\hal_adc.h - $PROJ_DIR$\MSP-EXP430F5438_HAL\hal_board.c - - $PROJ_DIR$\MSP-EXP430F5438_HAL\hal_board.h - $PROJ_DIR$\MSP-EXP430F5438_HAL\hal_buttons.c - - $PROJ_DIR$\MSP-EXP430F5438_HAL\hal_buttons.h - $PROJ_DIR$\MSP-EXP430F5438_HAL\hal_lcd.c - - $PROJ_DIR$\MSP-EXP430F5438_HAL\hal_lcd.h - $PROJ_DIR$\MSP-EXP430F5438_HAL\hal_lcd_fonts.c - - $PROJ_DIR$\MSP-EXP430F5438_HAL\hal_lcd_fonts.h - $PROJ_DIR$\MSP-EXP430F5438_HAL\hal_MSP-EXP430F5438.h - - $PROJ_DIR$\MSP-EXP430F5438_HAL\hal_rf.c - - Debug - - - - $PROJ_DIR$\MSP-EXP430F5438_HAL\hal_rf.h - - - $PROJ_DIR$\MSP-EXP430F5438_HAL\hal_rf_settings.h - - - $PROJ_DIR$\MSP-EXP430F5438_HAL\hal_rtc.c - - Debug - - - - $PROJ_DIR$\MSP-EXP430F5438_HAL\hal_rtc.h - - - $PROJ_DIR$\MSP-EXP430F5438_HAL\hal_tlv.c - - Debug - - - - $PROJ_DIR$\MSP-EXP430F5438_HAL\hal_tlv.h - - - $PROJ_DIR$\MSP-EXP430F5438_HAL\hal_usb.c - - Debug - - - - $PROJ_DIR$\MSP-EXP430F5438_HAL\hal_usb.h - Standard_Demo_Tasks @@ -1916,141 +1844,6 @@ $PROJ_DIR$\..\Common\Minimal\GenQTest.c - - UserExperienceDemo - - $PROJ_DIR$\UserExperienceDemo\5xx_ACTIVE_test.h - - - $PROJ_DIR$\UserExperienceDemo\5xx_ACTIVE_test.s43 - - - $PROJ_DIR$\UserExperienceDemo\adcTemp.c - - Debug - - - - $PROJ_DIR$\UserExperienceDemo\adcTemp.h - - - $PROJ_DIR$\UserExperienceDemo\audio.c - - Debug - - - - $PROJ_DIR$\UserExperienceDemo\audio.h - - - $PROJ_DIR$\UserExperienceDemo\balanceBall.c - - Debug - - - - $PROJ_DIR$\UserExperienceDemo\balanceBall.h - - - $PROJ_DIR$\UserExperienceDemo\clock.c - - Debug - - - - $PROJ_DIR$\UserExperienceDemo\clock.h - - - $PROJ_DIR$\UserExperienceDemo\FFT.c - - Debug - - - - $PROJ_DIR$\UserExperienceDemo\FFT.h - - - $PROJ_DIR$\UserExperienceDemo\FFT_430.h - - - $PROJ_DIR$\UserExperienceDemo\FFT_430.s43 - - Debug - - - - $PROJ_DIR$\UserExperienceDemo\flashUtils.c - - Debug - - - - $PROJ_DIR$\UserExperienceDemo\flashUtils.h - - - $PROJ_DIR$\UserExperienceDemo\LPM.c - - Debug - - - - $PROJ_DIR$\UserExperienceDemo\LPM.h - - - $PROJ_DIR$\UserExperienceDemo\menuSetting.c - - Debug - - - - $PROJ_DIR$\UserExperienceDemo\menuSetting.h - - - $PROJ_DIR$\UserExperienceDemo\PMM.c - - Debug - - - - $PROJ_DIR$\UserExperienceDemo\PMM.h - - - $PROJ_DIR$\UserExperienceDemo\PowerTest.c - - Debug - - - - $PROJ_DIR$\UserExperienceDemo\PowerTest.h - - - $PROJ_DIR$\UserExperienceDemo\usbTest.c - - Debug - - - - $PROJ_DIR$\UserExperienceDemo\usbTest.h - - - $PROJ_DIR$\UserExperienceDemo\UserExperience_F5438A.c - - Debug - - - - $PROJ_DIR$\UserExperienceDemo\UserExperience_F5438A.h - - - $PROJ_DIR$\UserExperienceDemo\UserExperienceGraphics.c - - Debug - - - - $PROJ_DIR$\UserExperienceDemo\UserExperienceGraphics.h - - $PROJ_DIR$\lnk430F5438A_mod.xcl diff --git a/Demo/MSP430X_MSP430F5438_IAR/lnk430F5438A_mod.xcl b/Demo/MSP430X_MSP430F5438_IAR/lnk430F5438A_mod.xcl index 001b52bbc..99dc499d9 100644 --- a/Demo/MSP430X_MSP430F5438_IAR/lnk430F5438A_mod.xcl +++ b/Demo/MSP430X_MSP430F5438_IAR/lnk430F5438A_mod.xcl @@ -195,9 +195,10 @@ // *** Modified to place code in high memory and insodoing, testing the port. // Original code --P(CODE)CODE=5C00-FF7F,10000-45BFF +//-P(CODE)CODE=5C00-FF7F,10000-45BFF // Modified code -//-P(CODE)CODE=10000-45BFF +-P(CODE)CODE=10000-45BFF + -Z(CODE)CODE_ID // --------------------------- diff --git a/Demo/MSP430X_MSP430F5438_IAR/main.c b/Demo/MSP430X_MSP430F5438_IAR/main.c index 802bf53e4..9a922b81c 100644 --- 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 ); vTaskStartScheduler(); } + for( ;; ); } /*-----------------------------------------------------------*/ @@ -322,6 +323,8 @@ unsigned long ulCPU_Clock_KHz = ( configCPU_CLOCK_HZ / 1000UL ); halLcdClearScreen(); halLcdPrintLine( " www.FreeRTOS.org", 0, OVERWRITE_TEXT ); + +while( ( halButtonsPressed() & BUTTON_UP ) == 0 ); } /*-----------------------------------------------------------*/