From: richardbarry Date: Mon, 18 Feb 2013 11:15:35 +0000 (+0000) Subject: Commit demos that have been updated for testing purposes before they are updated... X-Git-Tag: V7.4.0~4 X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=2a058c6cbc3fb78b8ec42a0d342d01f1fc331f55;p=freertos Commit demos that have been updated for testing purposes before they are updated once more to test new low power features. git-svn-id: https://svn.code.sf.net/p/freertos/code/trunk@1827 1d2547de-c912-0410-9cb9-b8ca96c0e9e2 --- diff --git a/FreeRTOS/Demo/CORTEX_LM3Sxxxx_IAR_Keil/FreeRTOSConfig.h b/FreeRTOS/Demo/CORTEX_LM3Sxxxx_IAR_Keil/FreeRTOSConfig.h index 6ab7fe32f..1b57885a7 100644 --- a/FreeRTOS/Demo/CORTEX_LM3Sxxxx_IAR_Keil/FreeRTOSConfig.h +++ b/FreeRTOS/Demo/CORTEX_LM3Sxxxx_IAR_Keil/FreeRTOSConfig.h @@ -92,7 +92,7 @@ #define configUSE_TRACE_FACILITY 1 #define configUSE_16_BIT_TICKS 0 #define configIDLE_SHOULD_YIELD 0 -#define configUSE_CO_ROUTINES 1 +#define configUSE_CO_ROUTINES 0 #define configUSE_MUTEXES 1 #define configUSE_RECURSIVE_MUTEXES 1 #define configCHECK_FOR_STACK_OVERFLOW 2 @@ -105,7 +105,7 @@ #define configQUEUE_REGISTRY_SIZE 10 /* Timer related defines. */ -#define configUSE_TIMERS 1 +#define configUSE_TIMERS 0 #define configTIMER_TASK_PRIORITY 2 #define configTIMER_QUEUE_LENGTH 20 #define configTIMER_TASK_STACK_DEPTH ( configMINIMAL_STACK_SIZE * 2 ) @@ -137,5 +137,9 @@ See http://www.FreeRTOS.org/RTOS-Cortex-M3-M4.html. */ version. */ #define configUSE_PORT_OPTIMISED_TASK_SELECTION 1 +#ifdef __ICCARM__ + void vAssertCalled( const char *pcFile, unsigned long ulLine ); + #define configASSERT( x ) if( x == 0 ) vAssertCalled( __FILE__, __LINE__ ); +#endif #endif /* FREERTOS_CONFIG_H */ diff --git a/FreeRTOS/Demo/CORTEX_LM3Sxxxx_IAR_Keil/RTOSDemo.Uv2 b/FreeRTOS/Demo/CORTEX_LM3Sxxxx_IAR_Keil/RTOSDemo.Uv2 index cbc6fdb79..ebcc32fed 100644 --- a/FreeRTOS/Demo/CORTEX_LM3Sxxxx_IAR_Keil/RTOSDemo.Uv2 +++ b/FreeRTOS/Demo/CORTEX_LM3Sxxxx_IAR_Keil/RTOSDemo.Uv2 @@ -24,6 +24,7 @@ File 1,1,<..\Common\Minimal\QPeek.c> File 1,1,<.\IntQueueTimer.c> File 1,1,<..\Common\Minimal\IntQueue.c> File 1,1,<..\Common\Minimal\recmutex.c> +File 1,1,<..\Common\Minimal\QueueSet.c> File 2,1,<.\rit128x96x4.c> File 2,1,<.\osram128x64x4.c> File 2,4,<..\Common\drivers\LuminaryMicro\Keil\driverlib.lib> diff --git a/FreeRTOS/Demo/CORTEX_LM3Sxxxx_IAR_Keil/RTOSDemo.uvproj b/FreeRTOS/Demo/CORTEX_LM3Sxxxx_IAR_Keil/RTOSDemo.uvproj new file mode 100644 index 000000000..d4ec7a4e7 --- /dev/null +++ b/FreeRTOS/Demo/CORTEX_LM3Sxxxx_IAR_Keil/RTOSDemo.uvproj @@ -0,0 +1,600 @@ + + + + 1.1 + +
### uVision Project, (C) Keil Software
+ + + + FreeRTOS_Demo + 0x4 + ARM-ADS + + + LM3S8962 + Luminary Micro + IRAM(0x20000000-0x2000FFFF) IROM(0-0x3FFFF) CLOCK(8000000) CPUTYPE("Cortex-M3") + + "STARTUP\Luminary\Startup.s" ("Luminary Startup Code") + UL2CM3(-UU0101L5E -O14 -S0 -C0 -N00("ARM Cortex-M3") -D00(1BA00477) -L00(4) -FO7 -FD20000000 -FC800 -FN1 -FF0LM3S_256 -FS00 -FL040000) + 4285 + LM3Sxxx.H + + + + + + + + + + + 0 + + + + Luminary\ + Luminary\ + + 0 + 0 + 0 + 0 + 1 + + .\rvmdk\ + RTOSDemo + 1 + 0 + 0 + 1 + 1 + .\rvmdk\ + 1 + 0 + 0 + + 0 + 0 + + + 0 + 0 + 0 + 0 + + + 0 + 0 + + + 0 + 0 + + + 1 + 0 + fromelf --bin --output .\rvmdk\RTOSDemo.bin .\rvmdk\RTOSDemo.axf + + 0 + 0 + + 0 + + + + 0 + 0 + 0 + 0 + 0 + 1 + 0 + 0 + 0 + 0 + 3 + + + + + SARMCM3.DLL + + DLM.DLL + -pLM3S8962 + SARMCM3.DLL + + TLM.DLL + -pLM3S8962 + + + + 1 + 0 + 0 + 0 + 16 + + + 0 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 0 + + + 1 + 1 + 0 + 1 + 1 + 1 + 0 + 1 + 0 + + 0 + 4 + + + + + + + + + + + + + + BIN\lmidk-agdi.dll + + + + + 1 + 0 + 0 + 0 + 1 + 4099 + + BIN\lmidk-agdi.dll + "" () + + + + + 0 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 0 + 1 + 1 + 0 + 0 + 0 + 0 + 0 + 1 + 0 + 0 + 0 + 1 + 1 + 0 + 0 + 0 + 0 + 0 + "Cortex-M3" + + 0 + 0 + 0 + 1 + 1 + 0 + 0 + 0 + 0 + 0 + 8 + 0 + 0 + 0 + 3 + 3 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 1 + 0 + 0 + 0 + 0 + 1 + 0 + + + 0 + 0x0 + 0x0 + + + 0 + 0x0 + 0x0 + + + 0 + 0x0 + 0x0 + + + 0 + 0x0 + 0x0 + + + 0 + 0x0 + 0x0 + + + 0 + 0x0 + 0x0 + + + 0 + 0x20000000 + 0x10000 + + + 1 + 0x0 + 0x40000 + + + 0 + 0x0 + 0x0 + + + 1 + 0x0 + 0x0 + + + 1 + 0x0 + 0x0 + + + 1 + 0x0 + 0x0 + + + 1 + 0x0 + 0x40000 + + + 1 + 0x0 + 0x0 + + + 0 + 0x0 + 0x0 + + + 0 + 0x0 + 0x0 + + + 0 + 0x0 + 0x0 + + + 0 + 0x20000000 + 0x10000 + + + 0 + 0x0 + 0x0 + + + + + + 1 + 1 + 0 + 0 + 1 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + + --diag_suppress 191,550,513,167,177,144 + RVDS_ARMCM3_LM3S102, "PACK_STRUCT_END=","ALIGN_STRUCT_END=" + + .;.\..\Common\drivers\LuminaryMicro;..\..\Source\portable\RVDS\ARM_CM3;..\..\Source\include;..\Common\include;..\Common\ethernet\uIP\uip-1.0\uip;.\webserver + + + + 1 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + + + + + + + + + 1 + 0 + 0 + 0 + 1 + 0 + 0x00000000 + 0x20000000 + + + + --entry Reset_Handler + + + + + + + + Demo_Source + + + BlockQ.c + 1 + ..\Common\Minimal\BlockQ.c + + + blocktim.c + 1 + ..\Common\Minimal\blocktim.c + + + death.c + 1 + ..\Common\Minimal\death.c + + + integer.c + 1 + ..\Common\Minimal\integer.c + + + main.c + 1 + .\main.c + + + ParTest.c + 1 + .\ParTest\ParTest.c + + + PollQ.c + 1 + ..\Common\Minimal\PollQ.c + + + semtest.c + 1 + ..\Common\Minimal\semtest.c + + + startup_rvmdk.S + 2 + .\startup_rvmdk.S + + + timertest.c + 1 + .\timertest.c + + + FreeRTOSConfig.h + 5 + .\FreeRTOSConfig.h + + + GenQTest.c + 1 + ..\Common\Minimal\GenQTest.c + + + QPeek.c + 1 + ..\Common\Minimal\QPeek.c + + + IntQueueTimer.c + 1 + .\IntQueueTimer.c + + + IntQueue.c + 1 + ..\Common\Minimal\IntQueue.c + + + recmutex.c + 1 + ..\Common\Minimal\recmutex.c + + + QueueSet.c + 1 + ..\Common\Minimal\QueueSet.c + + + + + Libraries + + + rit128x96x4.c + 1 + .\rit128x96x4.c + + + osram128x64x4.c + 1 + .\osram128x64x4.c + + + driverlib.lib + 4 + ..\Common\drivers\LuminaryMicro\Keil\driverlib.lib + + + formike128x128x16.c + 1 + .\formike128x128x16.c + + + grlib.lib + 4 + ..\Common\drivers\LuminaryMicro\Keil\grlib.lib + + + + + RTOS_Source + + + tasks.c + 1 + ..\..\Source\tasks.c + + + list.c + 1 + ..\..\Source\list.c + + + queue.c + 1 + ..\..\Source\queue.c + + + port.c + 1 + ..\..\Source\portable\RVDS\ARM_CM3\port.c + + + heap_2.c + 1 + ..\..\Source\portable\MemMang\heap_2.c + + + + + uIP_Source + + + uIP_Task.c + 1 + .\webserver\uIP_Task.c + + + emac.c + 1 + .\webserver\emac.c + + + httpd.c + 1 + .\webserver\httpd.c + + + httpd-cgi.c + 1 + .\webserver\httpd-cgi.c + + + httpd-fs.c + 1 + .\webserver\httpd-fs.c + + + http-strings.c + 1 + .\webserver\http-strings.c + + + uip_arp.c + 1 + ..\Common\ethernet\uIP\uip-1.0\uip\uip_arp.c + + + psock.c + 1 + ..\Common\ethernet\uIP\uip-1.0\uip\psock.c + + + timer.c + 1 + ..\Common\ethernet\uIP\uip-1.0\uip\timer.c + + + uip.c + 1 + ..\Common\ethernet\uIP\uip-1.0\uip\uip.c + + + + + + + + diff --git a/FreeRTOS/Demo/CORTEX_LM3Sxxxx_IAR_Keil/main.c b/FreeRTOS/Demo/CORTEX_LM3Sxxxx_IAR_Keil/main.c index 0e952d1d9..e9e77a499 100644 --- a/FreeRTOS/Demo/CORTEX_LM3Sxxxx_IAR_Keil/main.c +++ b/FreeRTOS/Demo/CORTEX_LM3Sxxxx_IAR_Keil/main.c @@ -118,6 +118,7 @@ and the TCP/IP stack together cannot be accommodated with the 32K size limit. */ /* Standard includes. */ #include +#include /* Scheduler includes. */ #include "FreeRTOS.h" @@ -381,6 +382,8 @@ portBASE_TYPE xHigherPriorityTaskWoken = pdFALSE; xMessage.pcMessage = "ERROR IN Q SET"; } + configASSERT( strcmp( ( const char * ) xMessage.pcMessage, "PASS" ) == 0 ); + /* Send the message to the OLED gatekeeper for display. */ xHigherPriorityTaskWoken = pdFALSE; xQueueSendFromISR( xOLEDQueue, &xMessage, &xHigherPriorityTaskWoken ); @@ -475,3 +478,22 @@ void vApplicationStackOverflowHook( xTaskHandle *pxTask, signed portCHAR *pcTask for( ;; ); } +/*-----------------------------------------------------------*/ + +void vAssertCalled( const char *pcFile, unsigned long ulLine ) +{ +volatile unsigned long ulSetTo1InDebuggerToExit = 0; + + taskENTER_CRITICAL(); + { + while( ulSetTo1InDebuggerToExit == 0 ) + { + /* Nothing do do here. Set the loop variable to a non zero value in + the debugger to step out of this function to the point that caused + the assertion. */ + ( void ) pcFile; + ( void ) ulLine; + } + } + taskEXIT_CRITICAL(); +} diff --git a/FreeRTOS/Demo/CORTEX_LM3Sxxxx_IAR_Keil/settings/RTOSDemo.dbgdt b/FreeRTOS/Demo/CORTEX_LM3Sxxxx_IAR_Keil/settings/RTOSDemo.dbgdt index 91aa09183..81fb875c7 100644 --- a/FreeRTOS/Demo/CORTEX_LM3Sxxxx_IAR_Keil/settings/RTOSDemo.dbgdt +++ b/FreeRTOS/Demo/CORTEX_LM3Sxxxx_IAR_Keil/settings/RTOSDemo.dbgdt @@ -32,7 +32,7 @@ - + TabID-10465-12018 @@ -48,7 +48,7 @@ TabID-31294-227BreakpointsBreakpoints - 2 + 0 TabID-21213-12021 @@ -60,20 +60,20 @@ - 0 + 0 - TextEditor$WS_DIR$\main.c0000022510984109840TextEditor$WS_DIR$\..\..\Source\portable\IAR\ARM_CM3\portmacro.h00000000TextEditor$WS_DIR$\FreeRTOSConfig.h000005551825187TextEditor$WS_DIR$\..\..\Source\tasks.c00000000TextEditor$WS_DIR$\..\..\Source\portable\IAR\ARM_CM3\port.c00000000TextEditor$WS_DIR$\..\..\Source\list.c00000000TextEditor$WS_DIR$\webserver\uIP_Task.c00000000TextEditor$WS_DIR$\webserver\emac.c00000000TextEditor$WS_DIR$\startup_ewarm.c00000000TextEditor$WS_DIR$\..\Common\Minimal\QueueSet.c0000054920567205670100000010000001 + TextEditor$WS_DIR$\main.c00000457110051100500100000010000001 - iaridepm.enu1debuggergui.enu1-2-2740238-2-2240200142857203666142857755601-2-21981682-2-216842001002381203666142857203666 + iaridepm.enu1debuggergui.enu1-2-2740238-2-2240200142857203666142857755601-2-21981682-2-216842001002381203666142857203666 diff --git a/FreeRTOS/Demo/CORTEX_LM3Sxxxx_IAR_Keil/settings/RTOSDemo.dni b/FreeRTOS/Demo/CORTEX_LM3Sxxxx_IAR_Keil/settings/RTOSDemo.dni index 9874f0df2..b77749e9a 100644 --- a/FreeRTOS/Demo/CORTEX_LM3Sxxxx_IAR_Keil/settings/RTOSDemo.dni +++ b/FreeRTOS/Demo/CORTEX_LM3Sxxxx_IAR_Keil/settings/RTOSDemo.dni @@ -28,7 +28,7 @@ ByteLimit=50 [LMIFTDIDriver] LMI_ResetMode=0x00000000 [DebugChecksum] -Checksum=-42454089 +Checksum=-1311150949 [Exceptions] StopOnUncaught=_ 0 StopOnThrow=_ 0 @@ -54,7 +54,8 @@ Exclusions= [Disassemble mode] mode=1 [Breakpoints] -Count=0 +Bp0=_ "STD_CODE" "{$PROJ_DIR$\main.c}.489.3" 1 0 0 0 "" 0 "" +Count=1 [Aliases] Count=0 SuppressDialog=0 diff --git a/FreeRTOS/Demo/CORTEX_LM3Sxxxx_IAR_Keil/settings/RTOSDemo.wsdt b/FreeRTOS/Demo/CORTEX_LM3Sxxxx_IAR_Keil/settings/RTOSDemo.wsdt index 493a5571c..c5db75fb1 100644 --- a/FreeRTOS/Demo/CORTEX_LM3Sxxxx_IAR_Keil/settings/RTOSDemo.wsdt +++ b/FreeRTOS/Demo/CORTEX_LM3Sxxxx_IAR_Keil/settings/RTOSDemo.wsdt @@ -17,7 +17,7 @@ 4826882619100726867 - + TabID-18883-22024 @@ -29,20 +29,20 @@ - 0TabID-29040-7360Find in FilesFind-in-FilesTabID-19024-10413BuildBuildTabID-19202-19100Debug LogDebug-Log1 + 0TabID-29040-7360Find in FilesFind-in-FilesTabID-19024-10413BuildBuildTabID-19202-19100Debug LogDebug-Log1 - TextEditor$WS_DIR$\main.c0000022510984109840TextEditor$WS_DIR$\..\..\Source\portable\IAR\ARM_CM3\portmacro.h00000000TextEditor$WS_DIR$\FreeRTOSConfig.h000005551825187TextEditor$WS_DIR$\..\..\Source\tasks.c00000000TextEditor$WS_DIR$\..\..\Source\portable\IAR\ARM_CM3\port.c00000000TextEditor$WS_DIR$\..\..\Source\list.c00000000TextEditor$WS_DIR$\webserver\uIP_Task.c00000000TextEditor$WS_DIR$\webserver\emac.c00000000TextEditor$WS_DIR$\startup_ewarm.c00000000TextEditor$WS_DIR$\..\Common\Minimal\QueueSet.c0000054920567205670100000010000001 + TextEditor$WS_DIR$\main.c00000443110051100500100000010000001 - iaridepm.enu1-2-2719315-2-2200200119048203666188690734216-2-22191682-2-216842211002381225051119048203666 + iaridepm.enu1-2-2719315-2-2200200119048203666188690734216-2-22191682-2-216842211002381225051119048203666 diff --git a/FreeRTOS/Demo/CORTEX_LPC1768_GCC_RedSuite/src/FreeRTOSConfig.h b/FreeRTOS/Demo/CORTEX_LPC1768_GCC_RedSuite/src/FreeRTOSConfig.h index 2b8a2a749..0aa9979e1 100644 --- a/FreeRTOS/Demo/CORTEX_LPC1768_GCC_RedSuite/src/FreeRTOSConfig.h +++ b/FreeRTOS/Demo/CORTEX_LPC1768_GCC_RedSuite/src/FreeRTOSConfig.h @@ -75,7 +75,7 @@ * executed from within the IDE! Once it has been executed, re-open or refresh * the Eclipse project and remove the #error line below. */ -//#error Ensure CreateProjectDirectoryStructure.bat has been executed before building. See comment immediately above. +#error Ensure CreateProjectDirectoryStructure.bat has been executed before building. See comment immediately above. #include "LPC17xx.h" diff --git a/FreeRTOS/Demo/WIN32-MSVC/WIN32.suo b/FreeRTOS/Demo/WIN32-MSVC/WIN32.suo index 3a7a73946..c99dcb1b2 100644 Binary files a/FreeRTOS/Demo/WIN32-MSVC/WIN32.suo and b/FreeRTOS/Demo/WIN32-MSVC/WIN32.suo differ