diff options
| author | あく <alleteam@gmail.com> | 2021-12-21 15:16:25 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-12-21 15:16:25 +0300 |
| commit | 439fb9c18dde63e3b4420e618978226ab50e75ff (patch) | |
| tree | 9a80cf6bab6bfd892f97ab1fd554a574843f6eba /applications/subghz | |
| parent | 26b2d07dd623dbc781bd712e481d1fd375ddc1c3 (diff) | |
[FL-1910, FL-2146] Update to new FreeRTOS, fix CMSIS thread flags collision with stream buffer. New cube. (#917)
* Libs: add FreeRTOS submodule. FuriHal: replace ST provided FreeRTOS with original one. FuriHal: for cmsis os hal and patch it for better compatibility with stream buffer.
* Makefile: fix svd plugin on blackmagic
* Lib: update STM32CubeWB package. Project: update project to match new cube package.
* Lib: properly rebase and upload STM32CubeWB
* BleGlue: switch ack logging level to trace
Diffstat (limited to 'applications/subghz')
| -rw-r--r-- | applications/subghz/views/subghz_test_carrier.c | 2 | ||||
| -rw-r--r-- | applications/subghz/views/subghz_test_packet.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/applications/subghz/views/subghz_test_carrier.c b/applications/subghz/views/subghz_test_carrier.c index e6e1ac30..a569db1f 100644 --- a/applications/subghz/views/subghz_test_carrier.c +++ b/applications/subghz/views/subghz_test_carrier.c @@ -8,7 +8,7 @@ struct SubghzTestCarrier { View* view; - osTimerId timer; + osTimerId_t timer; SubghzTestCarrierCallback callback; void* context; }; diff --git a/applications/subghz/views/subghz_test_packet.c b/applications/subghz/views/subghz_test_packet.c index 01c4bbff..155d4f07 100644 --- a/applications/subghz/views/subghz_test_packet.c +++ b/applications/subghz/views/subghz_test_packet.c @@ -12,7 +12,7 @@ struct SubghzTestPacket { View* view; - osTimerId timer; + osTimerId_t timer; SubGhzDecoderPrinceton* decoder; SubGhzEncoderPrinceton* encoder; @@ -262,4 +262,4 @@ void subghz_test_packet_free(SubghzTestPacket* instance) { View* subghz_test_packet_get_view(SubghzTestPacket* instance) { furi_assert(instance); return instance->view; -}
\ No newline at end of file +} |