Merge pull request #13374 from caoyuan96421/bugfix2

0xc0170 · web-flow · commit e127bb245e8c · 2020-08-10T11:45:37.000+01:00
Fixed ThisThread flag_wait_any functions (fix #13360)
diff --git a/rtos/source/ThisThread.cpp b/rtos/source/ThisThread.cpp
@@ -200,7 +200,7 @@ uint32_t ThisThread::flags_wait_any_for(uint32_t flags, uint32_t millisec, bool
 
 uint32_t ThisThread::flags_wait_any_for(uint32_t flags, Clock::duration_u32 rel_time, bool clear)
 {
-    return flags_wait_for(flags, rel_time, clear, osFlagsWaitAll);
+    return flags_wait_for(flags, rel_time, clear, osFlagsWaitAny);
 }
 
 uint32_t ThisThread::flags_wait_any_until(uint32_t flags, uint64_t millisec, bool clear)

Original file line number	Diff line number	Diff line change
`@@ -200,7 +200,7 @@ uint32_t ThisThread::flags_wait_any_for(uint32_t flags, uint32_t millisec, bool`
`200`	`200`
`201`	`201`	`uint32_t ThisThread::flags_wait_any_for(uint32_t flags, Clock::duration_u32 rel_time, bool clear)`
`202`	`202`	`{`
`203`		`- return flags_wait_for(flags, rel_time, clear, osFlagsWaitAll);`
	`203`	`+ return flags_wait_for(flags, rel_time, clear, osFlagsWaitAny);`
`204`	`204`	`}`
`205`	`205`
`206`	`206`	`uint32_t ThisThread::flags_wait_any_until(uint32_t flags, uint64_t millisec, bool clear)`