liz/flipperzero-firmware
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[FL-1910, FL-2146] Update to new FreeRTOS, fix CMSIS thread flags collision with stream buffer. New cube. (#917)

Browse Source 
* 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
This commit is contained in:
あく
2021-12-21 15:16:25 +03:00
committed by GitHub
parent 26b2d07dd6
commit 439fb9c18d
39 changed files with 4313 additions and 354 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
firmware/targets/f7/ble-glue/ble_app.c
View File

@@ -3,7 +3,6 @@
#include "hci_tl.h"
#include "ble.h"
#include "shci.h"
#include "cmsis_os.h"
#include "gap.h"
#include <furi-hal.h>

1
firmware/targets/f7/ble-glue/ble_glue.c
View File

@@ -5,7 +5,6 @@
#include "ble.h"
#include "tl.h"
#include "shci.h"
#include "cmsis_os.h"
#include "shci_tl.h"
#include "app_debug.h"
#include <furi-hal.h>

5
firmware/targets/f7/ble-glue/gap.c
View File

@@ -2,7 +2,6 @@
#include "ble.h"
#include "cmsis_os.h"
#include <furi-hal.h>
#include <furi.h>
@@ -28,7 +27,7 @@ typedef struct {
osMutexId_t state_mutex;
BleEventCallback on_event_cb;
void* context;
osTimerId advertise_timer;
osTimerId_t advertise_timer;
FuriThread* thread;
osMessageQueueId_t command_queue;
bool enable_adv;
@@ -446,7 +445,7 @@ void gap_thread_stop() {
static int32_t gap_app(void *context) {
GapCommand command;
while(1) {
osStatus status = osMessageQueueGet(gap->command_queue, &command, NULL, osWaitForever);
osStatus_t status = osMessageQueueGet(gap->command_queue, &command, NULL, osWaitForever);
if(status != osOK) {
FURI_LOG_E(TAG, "Message queue get error: %d", status);
continue;

2
firmware/targets/f7/ble-glue/serial_service.c
View File

@@ -62,7 +62,7 @@ static SVCCTL_EvtAckStatus_t serial_svc_event_handler(void *event) {
ret = SVCCTL_EvtAckFlowEnable;
}
} else if(blecore_evt->ecode == ACI_GATT_SERVER_CONFIRMATION_VSEVT_CODE) {
FURI_LOG_D(TAG, "Ack received", blecore_evt->ecode);
FURI_LOG_T(TAG, "Ack received", blecore_evt->ecode);
if(serial_svc->callback) {
SerialServiceEvent event = {
.event = SerialServiceEventTypeDataSent,