len0rd/FreeRTOS-Kernel
1
0
Fork 0
mirror of https://github.com/FreeRTOS/FreeRTOS-Kernel.git synced 2025-04-25 07:52:12 -04:00
Code Issues Packages Projects Releases Wiki Activity

Revert a couple of changes in Win32 demo that should not have been checked in.

Browse source
This commit is contained in:
Richard Barry 2019-07-23 17:02:59 +00:00
parent 05e7d9cc08
commit d1dd8da12e
5 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
FreeRTOS/Demo/WIN32-MSVC/.vs/WIN32/v14/.suo
View file

Binary file not shown.

3
FreeRTOS/Demo/WIN32-MSVC/FreeRTOSConfig.h
View file

@ -62,8 +62,7 @@
#define configUSE_ALTERNATIVE_API 0 #define configUSE_ALTERNATIVE_API 0
#define configUSE_QUEUE_SETS 1 #define configUSE_QUEUE_SETS 1
#define configUSE_TASK_NOTIFICATIONS 1 #define configUSE_TASK_NOTIFICATIONS 1
#define configSUPPORT_STATIC_ALLOCATION 0 #define configSUPPORT_STATIC_ALLOCATION 1
#define configSUPPORT_DYNAMIC_ALLOCATION 1
/* Software timer related configuration options. */ /* Software timer related configuration options. */
#define configUSE_TIMERS 1 #define configUSE_TIMERS 1

1
FreeRTOS/Demo/WIN32-MSVC/WIN32.vcxproj
View file

@ -81,7 +81,6 @@
<ClCompile Include="..\..\Source\event_groups.c" /> <ClCompile Include="..\..\Source\event_groups.c" />
<ClCompile Include="..\..\Source\portable\MemMang\heap_5.c" /> <ClCompile Include="..\..\Source\portable\MemMang\heap_5.c" />
<ClCompile Include="..\..\Source\stream_buffer.c" /> <ClCompile Include="..\..\Source\stream_buffer.c" />
<ClCompile Include="..\..\Source\task_pool.c" />
<ClCompile Include="..\..\Source\timers.c" /> <ClCompile Include="..\..\Source\timers.c" />
<ClCompile Include="..\Common\Minimal\AbortDelay.c" /> <ClCompile Include="..\Common\Minimal\AbortDelay.c" />
<ClCompile Include="..\Common\Minimal\BlockQ.c" /> <ClCompile Include="..\Common\Minimal\BlockQ.c" />

3
FreeRTOS/Demo/WIN32-MSVC/WIN32.vcxproj.filters
View file

@ -160,9 +160,6 @@
<ClCompile Include="..\Common\Minimal\MessageBufferAMP.c"> <ClCompile Include="..\Common\Minimal\MessageBufferAMP.c">
<Filter>Demo App Source\Full_Demo\Common Demo Tasks</Filter> <Filter>Demo App Source\Full_Demo\Common Demo Tasks</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="..\..\Source\task_pool.c">
<Filter>FreeRTOS Source\Source</Filter>
</ClCompile>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ClInclude Include="FreeRTOSConfig.h"> <ClInclude Include="FreeRTOSConfig.h">

7
FreeRTOS/Demo/WIN32-MSVC/main.c
View file

@ -54,6 +54,10 @@
#include <stdlib.h> #include <stdlib.h>
#include <conio.h> #include <conio.h>
/* Visual studio intrinsics used so the __debugbreak() function is available
should an assert get hit. */
#include <intrin.h>
/* FreeRTOS kernel includes. */ /* FreeRTOS kernel includes. */
#include "FreeRTOS.h" #include "FreeRTOS.h"
#include "task.h" #include "task.h"
@ -288,6 +292,9 @@ volatile uint32_t ulSetToNonZeroInDebuggerToContinue = 0;
} }
} }
/* Cause debugger break point if being debugged. */
__debugbreak();
/* You can step out of this function to debug the assertion by using /* You can step out of this function to debug the assertion by using
the debugger to set ulSetToNonZeroInDebuggerToContinue to a non-zero the debugger to set ulSetToNonZeroInDebuggerToContinue to a non-zero
value. */ value. */