Change some task priorities in the MingW simulator demo.

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

diff --git a/FreeRTOS/Demo/WIN32-MingW/.cproject b/FreeRTOS/Demo/WIN32-MingW/.cproject
index 04ec5c3bcc50e6e7fa8981d7e6bf9d229af75423..bec5ca084466742cb9c1e15445d9ecab9b49f804 100644 (file)
--- a/FreeRTOS/Demo/WIN32-MingW/.cproject
+++ b/FreeRTOS/Demo/WIN32-MingW/.cproject
@@ -16,7 +16,7 @@
                                        <folderInfo id="cdt.managedbuild.config.gnu.mingw.exe.debug.396692239." name="/" resourcePath="">\r
                                                <toolChain id="cdt.managedbuild.toolchain.gnu.mingw.exe.debug.1619684599" name="MinGW GCC" superClass="cdt.managedbuild.toolchain.gnu.mingw.exe.debug">\r
                                                        <targetPlatform id="cdt.managedbuild.target.gnu.platform.mingw.exe.debug.1827277435" name="Debug Platform" superClass="cdt.managedbuild.target.gnu.platform.mingw.exe.debug"/>\r
-                                                       <builder buildPath="${workspace_loc:/RTOSDemo}/Debug" enableCleanBuild="true" enabledIncrementalBuild="true" id="cdt.managedbuild.tool.gnu.builder.mingw.base.685662364" keepEnvironmentInBuildfile="false" managedBuildOn="true" name="CDT Internal Builder" parallelBuildOn="true" parallelizationNumber="optimal" superClass="cdt.managedbuild.tool.gnu.builder.mingw.base"/>\r
+                                                       <builder buildPath="${workspace_loc:/RTOSDemo}/Debug" id="org.eclipse.cdt.build.core.internal.builder.835905495" superClass="org.eclipse.cdt.build.core.internal.builder"/>\r
                                                        <tool id="cdt.managedbuild.tool.gnu.assembler.mingw.exe.debug.2050893079" name="GCC Assembler" superClass="cdt.managedbuild.tool.gnu.assembler.mingw.exe.debug">\r
                                                                <inputType id="cdt.managedbuild.tool.gnu.assembler.input.1919405451" superClass="cdt.managedbuild.tool.gnu.assembler.input"/>\r
                                                        </tool>\r
@@ -38,6 +38,8 @@
                                                                </option>\r
                                                                <option id="gnu.c.compiler.option.debugging.prof.53374762" name="Generate prof information (-p)" superClass="gnu.c.compiler.option.debugging.prof" value="false" valueType="boolean"/>\r
                                                                <option id="gnu.c.compiler.option.warnings.extrawarn.1804262134" name="Extra warnings (-Wextra)" superClass="gnu.c.compiler.option.warnings.extrawarn" value="true" valueType="boolean"/>\r
+                                                               <option id="gnu.c.compiler.option.misc.other.1931924410" name="Other flags" superClass="gnu.c.compiler.option.misc.other" value="-c -fmessage-length=0" valueType="string"/>\r
+                                                               <option id="gnu.c.compiler.option.debugging.gprof.444112294" name="Generate gprof information (-pg)" superClass="gnu.c.compiler.option.debugging.gprof" value="false" valueType="boolean"/>\r
                                                                <inputType id="cdt.managedbuild.tool.gnu.c.compiler.input.974248912" superClass="cdt.managedbuild.tool.gnu.c.compiler.input"/>\r
                                                        </tool>\r
                                                        <tool id="cdt.managedbuild.tool.gnu.c.linker.mingw.exe.debug.2080839343" name="MinGW C Linker" superClass="cdt.managedbuild.tool.gnu.c.linker.mingw.exe.debug">\r
@@ -45,6 +47,9 @@
                                                                <option id="gnu.c.link.option.libs.709505970" name="Libraries (-l)" superClass="gnu.c.link.option.libs" valueType="libs">\r
                                                                        <listOptionValue builtIn="false" value="winmm"/>\r
                                                                </option>\r
+                                                               <option id="gnu.c.link.option.noshared.628613709" name="No shared libraries (-static)" superClass="gnu.c.link.option.noshared" value="false" valueType="boolean"/>\r
+                                                               <option id="gnu.c.link.option.debugging.prof.1514831674" name="Generate prof information (-p)" superClass="gnu.c.link.option.debugging.prof" value="false" valueType="boolean"/>\r
+                                                               <option id="gnu.c.link.option.debugging.gprof.1432524618" name="Generate gprof information (-pg)" superClass="gnu.c.link.option.debugging.gprof" value="false" valueType="boolean"/>\r
                                                                <inputType id="cdt.managedbuild.tool.gnu.c.linker.input.1912714899" superClass="cdt.managedbuild.tool.gnu.c.linker.input">\r
                                                                        <additionalInput kind="additionalinputdependency" paths="$(USER_OBJS)"/>\r
                                                                        <additionalInput kind="additionalinput" paths="$(LIBS)"/>\r
@@ -76,4 +81,5 @@
                        <resource resourceType="PROJECT" workspacePath="/RTOSDemo"/>\r
                </configuration>\r
        </storageModule>\r
+       <storageModule moduleId="org.eclipse.cdt.internal.ui.text.commentOwnerProjectMappings"/>\r
 </cproject>\r

diff --git a/FreeRTOS/Demo/WIN32-MingW/FreeRTOSConfig.h b/FreeRTOS/Demo/WIN32-MingW/FreeRTOSConfig.h
index 0cb8c98264b57877136b8e1e696d9d8d32ba2b52..1935f454bdf351d69acf20eae31ae4f1e1f931eb 100644 (file)
--- a/FreeRTOS/Demo/WIN32-MingW/FreeRTOSConfig.h
+++ b/FreeRTOS/Demo/WIN32-MingW/FreeRTOSConfig.h
@@ -100,11 +100,11 @@
 #define configUSE_QUEUE_SETS                   1\r
 \r
 #define configUSE_TIMERS                               1\r
-#define configTIMER_TASK_PRIORITY              2\r
+#define configTIMER_TASK_PRIORITY              ( configMAX_PRIORITIES - 1 )\r
 #define configTIMER_QUEUE_LENGTH               20\r
 #define configTIMER_TASK_STACK_DEPTH   ( configMINIMAL_STACK_SIZE * 2 )\r
 \r
-#define configMAX_PRIORITIES                   ( 7 )\r
+#define configMAX_PRIORITIES                   ( 8 )\r
 \r
 /* Run time stats gathering definitions. */\r
 unsigned long ulGetRunTimeCounterValue( void );\r

diff --git a/FreeRTOS/Demo/WIN32-MingW/main.c b/FreeRTOS/Demo/WIN32-MingW/main.c
index 6d451b4626a10c676e3b6a20f290e5ec33f5c134..d09adb4d81bb37bde5112039088e646ece9d4c13 100644 (file)
--- a/FreeRTOS/Demo/WIN32-MingW/main.c
+++ b/FreeRTOS/Demo/WIN32-MingW/main.c
@@ -149,13 +149,13 @@ int main( void )
        /* Initialise the trace recorder and create the label used to post user\r
        events to the trace recording on each tick interrupt. */\r
        vTraceInitTraceData();\r
+       printf( "Trace started.  Hit a key to dump trace file to disk.  Note stdin does not work when using the Eclipse console with MingW.\r\n" );\r
+       fflush( stdout );\r
+\r
        xTickTraceUserEvent = xTraceOpenLabel( "tick" );\r
 \r
        /* Start the trace recording - the recording is written to a file if\r
        configASSERT() is called. */\r
-       printf( "\r\nTrace started.  Hit a key to dump trace file to disk.\r\n" );\r
-       printf( "Note stdin does not work when using the Eclipse console with MingW.\r\n" );\r
-       fflush( stdout );\r
        uiTraceStart();\r
 \r
        /* The mainCREATE_SIMPLE_BLINKY_DEMO_ONLY setting is described at the top\r

diff --git a/FreeRTOS/Demo/WIN32-MingW/main_full.c b/FreeRTOS/Demo/WIN32-MingW/main_full.c
index 90fbe4e27fb85cf5f01103714023b9623e57fc0e..75098dc0b3ab2f38109b6eb446338254aa553a8e 100644 (file)
--- a/FreeRTOS/Demo/WIN32-MingW/main_full.c
+++ b/FreeRTOS/Demo/WIN32-MingW/main_full.c
@@ -135,7 +135,7 @@
 #include "EventGroupsDemo.h"\r
 \r
 /* Priorities at which the tasks are created. */\r
-#define mainCHECK_TASK_PRIORITY                        ( configMAX_PRIORITIES - 1 )\r
+#define mainCHECK_TASK_PRIORITY                        ( configMAX_PRIORITIES - 2 )\r
 #define mainQUEUE_POLL_PRIORITY                        ( tskIDLE_PRIORITY + 1 )\r
 #define mainSEM_TEST_PRIORITY                  ( tskIDLE_PRIORITY + 1 )\r
 #define mainBLOCK_Q_PRIORITY                   ( tskIDLE_PRIORITY + 2 )\r