diff --git a/Demo/MSP430X_MSP430F5438_IAR/RTOSDemo.ewp b/Demo/MSP430X_MSP430F5438_IAR/RTOSDemo.ewp index a65a60456..805e6be03 100644 --- a/Demo/MSP430X_MSP430F5438_IAR/RTOSDemo.ewp +++ b/Demo/MSP430X_MSP430F5438_IAR/RTOSDemo.ewp @@ -105,7 +105,7 @@ GStackHeapOverride - 0 + 1 GStackSize2 @@ -113,7 +113,7 @@ GHeapSize2 - 160 + 4 RadioDataModelType @@ -121,7 +121,7 @@ GHeap20Size - 80 + 4 GeneralMisraRules98 diff --git a/Demo/MSP430X_MSP430F5438_IAR/RunTimeStatsConfig.c b/Demo/MSP430X_MSP430F5438_IAR/RunTimeStatsConfig.c index 434348460..fba7dc6cc 100644 --- a/Demo/MSP430X_MSP430F5438_IAR/RunTimeStatsConfig.c +++ b/Demo/MSP430X_MSP430F5438_IAR/RunTimeStatsConfig.c @@ -90,9 +90,6 @@ void vConfigureTimerForRunTimeStats( void ) /* Start up clean. */ TA1CTL |= TACLR; - /* No overflows can have occurred yet. */ - ulStatsOverflowCount = 0UL; - /* Continuous mode. */ TA1CTL |= MC__CONTINOUS; } @@ -110,10 +107,24 @@ inline unsigned long ulGetRunTimeStatsTime( void ) unsigned long ulReturn; TA1CTL &= ~MC__CONTINOUS; + + if( ( TA1CTL & TAIFG ) != 0 ) + { + /* An overflow has occurred but not yet been processed. */ + ulStatsOverflowCount++; + + /* Clear the interrupt. */ + TA1CTL &= ~TAIFG; + } + else + { + __no_operation(); + } + ulReturn = ( ulStatsOverflowCount << 16UL ); ulReturn |= ( unsigned long ) TA1R; TA1CTL |= MC__CONTINOUS; - + return ulReturn; } /*-----------------------------------------------------------*/ diff --git a/Demo/MSP430X_MSP430F5438_IAR/settings/RTOSDemo.dbgdt b/Demo/MSP430X_MSP430F5438_IAR/settings/RTOSDemo.dbgdt index 502d61f09..1608c0e22 100644 --- a/Demo/MSP430X_MSP430F5438_IAR/settings/RTOSDemo.dbgdt +++ b/Demo/MSP430X_MSP430F5438_IAR/settings/RTOSDemo.dbgdt @@ -6,7 +6,7 @@ - 300Breakpoints201622 + 300201622 @@ -26,12 +26,12 @@ 200111 - 20030010{W}Watch-0:TA1CTL4{W}Watch-0:ulSP_PC_Combined4{W}Watch-1:ulReturn4300134139124100300Debug-Log300200100100100100100100150200110$PROJ_DIR$\TermIOInput.txt10300150150300300001001300100100100100100100 + 20030010{W}Watch-0:TA1CTL4{W}Watch-0:ulLastReturn4{W}Watch-0:ulReturn4{W}Watch-0:ulSP_PC_Combined4{W}Watch-1:ulReturn4300134139124100300Debug-Log300200100100100100100100150200110$PROJ_DIR$\TermIOInput.txt10300150150300300001001300100100100100100100 - + TabID-11539-27703 @@ -43,20 +43,20 @@ - 0TabID-4842-14235Debug LogDebug-Log0TabID-25774-15685Terminal I/OTerminalIO0 + 0TabID-25774-15685Terminal I/OTerminalIO0TabID-22323-19482Debug LogDebug-Log0 - TextEditor$WS_DIR$\..\..\Source\portable\IAR\MSP430X\portext.s43013454395439TextEditor$WS_DIR$\..\..\Source\tasks.c015925073650736TextEditor$WS_DIR$\RunTimeStatsConfig.c010248314831TextEditor$WS_DIR$\main.c02361219712197TextEditor$WS_DIR$\..\..\Source\queue.c010813700937009TextEditor$WS_DIR$\..\..\Source\portable\IAR\MSP430X\port.c017879547954TextEditor$WS_DIR$\..\Common\Minimal\GenQTest.c0497173901739060100000010000001 + TextEditor$WS_DIR$\main.c02301219712197TextEditor$WS_DIR$\..\..\Source\portable\IAR\MSP430X\port.c017980318031TextEditor$WS_DIR$\..\..\Source\tasks.c01592506065060620100000010000001 - iaridepm.enu1430fet1debuggergui.enu1-2-2716191-2-212115072024152749114881731161-2-2716497-2-2200200119048203666297024731161-2-21981682-2-216842001002381203666119048203666 + iaridepm.enu1430fet1debuggergui.enu1-2-2716191-2-212115072024152749114881731161-2-2716497-2-2200200119048203666297024731161-2-21981682-2-216842001002381203666119048203666 diff --git a/Demo/MSP430X_MSP430F5438_IAR/settings/RTOSDemo.dni b/Demo/MSP430X_MSP430F5438_IAR/settings/RTOSDemo.dni index d3daa7797..87fa82e30 100644 --- a/Demo/MSP430X_MSP430F5438_IAR/settings/RTOSDemo.dni +++ b/Demo/MSP430X_MSP430F5438_IAR/settings/RTOSDemo.dni @@ -1,5 +1,5 @@ [DebugChecksum] -Checksum=1933102805 +Checksum=-1480900162 [DisAssemblyWindow] NumStates=_ 1 State 1=_ 1 @@ -14,7 +14,7 @@ Control Register=0 NextState0=0 NextState1=0 [Action Register] -Break=3 +Break=1 State Storage=0 [Profiling] Enabled=0 @@ -39,7 +39,7 @@ LogFile=_ "" Enabled=0 [DriverProfiling] Enabled=0 -Mode=-1827890804 +Mode=604119078 Graph=0 Symbiont=0 [Breakpoints] diff --git a/Demo/MSP430X_MSP430F5438_IAR/settings/RTOSDemo.wsdt b/Demo/MSP430X_MSP430F5438_IAR/settings/RTOSDemo.wsdt index 9e42bed26..1d6a92b22 100644 --- a/Demo/MSP430X_MSP430F5438_IAR/settings/RTOSDemo.wsdt +++ b/Demo/MSP430X_MSP430F5438_IAR/settings/RTOSDemo.wsdt @@ -19,13 +19,13 @@ - 20121632481300Debug-LogFind-in-FilesBreakpoints + 300Debug-LogFind-in-FilesBreakpoints20121632481 - 181624300BuildFind-in-FilesBreakpoints58082994300BuildDebug-LogBreakpoints300 + 300BuildFind-in-FilesBreakpoints18162458082994300BuildDebug-LogBreakpoints300 - + TabID-18858-27566 @@ -37,20 +37,20 @@ - 0 + 0TabID-15348-8476BuildBuildTabID-12693-9958Debug LogDebug-Log0 - TextEditor$WS_DIR$\main.c044121971219700100000010000001 + TextEditor$WS_DIR$\main.c0230121971219700100000010000001 - iaridepm.enu1-2-2938309-2-2331267197024271894185119957230 + iaridepm.enu1-2-2740309-2-2331267197024271894185119755601-2-21981682-2-216842001002381203666119048203666