FL-53: new NFC worker, A/B/F/V poll and display. (#283)

* GUI: view. Flooper-blooper fix compilation error.
* GUI: view and viewdispatcher bones
* GUI: view implementation, view models, view dispatcher
* GUI: view navigation, model refinement. Power: use view, view dispatcher.

* HAL Flash: proper page write. Dolphin: views. Power: views

* Dolphin: transition idle scree to Views
* Dolphin: input events on stats view. Format sources.

* HAL: flash erase. Dolphin: permanent state storage.

* Dolphin: first start welcome. HAL: flash operation status, errata 2.2.9 crutch.

* NFC: rewrite worker
* NFC: add support for B,F,V.
* NFC: replace rfal irq hanlder with realtime thread, more details about cards.

* Bootloader: LSE and RTS shenanigans, LED control, morse code for LSE failure error.

* F4: stop in Error_Handler

* BLE: handle working FUS, but empty radio stack.

* HAL: alive FUS is now sufficient for flash controller access

* Dolphin: update model after state load

* NFC: detect navigation

* RFAL: use osPriorityISR for isr thread

* NFC: emulation

* Bootloader: rollback incorrectly merged rename

* Dolphin: rollback incorrectly merged changes

* RFAL: remove volatile from thread attr

* RFAL: do not call platform ErrorHandler, error codes is enough

* NFC: improved error handling

* Format sources

* NFC: reset detect view model on start

* Format sources

* update codeowners

* NFC: hide last info if no card detected
This commit is contained in:
あく
2021-01-11 15:42:25 +03:00
committed by GitHub
parent 34dbb2ea86
commit 6928122650
22 changed files with 838 additions and 419 deletions

View File

@@ -16,8 +16,10 @@ void api_hal_bt_dump_state(string_t buffer);
/* Get BT/BLE system component state */
bool api_hal_bt_is_alive();
/* Lock shared access to flash controller */
void api_hal_bt_lock_flash();
/* Lock shared access to flash controller
* @return true if lock was successful, false if not
*/
bool api_hal_bt_lock_flash();
/* Unlock shared access to flash controller */
void api_hal_bt_unlock_flash();

View File

@@ -223,13 +223,6 @@ void SystemClock_Config(void)
Error_Handler();
}
/* USER CODE BEGIN Smps */
if (!LL_RCC_LSE_IsReady()) {
LL_RCC_ForceBackupDomainReset();
LL_RCC_ReleaseBackupDomainReset();
NVIC_SystemReset();
}
/* USER CODE END Smps */
/** Enables the Clock Security System
*/
@@ -272,7 +265,7 @@ void Error_Handler(void)
{
/* USER CODE BEGIN Error_Handler_Debug */
/* User can add his own implementation to report the HAL error return state */
asm("bkpt 1");
/* USER CODE END Error_Handler_Debug */
}

View File

@@ -39,34 +39,40 @@ bool api_hal_bt_is_alive() {
}
bool api_hal_bt_wait_transition() {
if (APPE_Status() == BleGlueStatusUninitialized) {
return false;
}
while (APPE_Status() != BleGlueStatusStarted) {
osDelay(1);
uint8_t counter = 0;
while (APPE_Status() == BleGlueStatusStartup) {
osDelay(10);
counter++;
if (counter > 1000) {
return false;
}
}
return true;
}
void api_hal_bt_lock_flash() {
bool api_hal_bt_lock_flash() {
if (!api_hal_bt_wait_transition()) {
return false;
}
if (APPE_Status() == BleGlueStatusUninitialized) {
HAL_FLASH_Unlock();
return;
} else {
while (HAL_HSEM_FastTake(CFG_HW_FLASH_SEMID) != HAL_OK) {
osDelay(1);
}
SHCI_C2_FLASH_EraseActivity(ERASE_ACTIVITY_ON);
HAL_FLASH_Unlock();
while(LL_FLASH_IsOperationSuspended()) {};
}
while (HAL_HSEM_FastTake(CFG_HW_FLASH_SEMID) != HAL_OK) {
osDelay(1);
}
SHCI_C2_FLASH_EraseActivity(ERASE_ACTIVITY_ON);
HAL_FLASH_Unlock();
while(LL_FLASH_IsOperationSuspended()) {};
return true;
}
void api_hal_bt_unlock_flash() {
if (!api_hal_bt_wait_transition()) {
if (APPE_Status() == BleGlueStatusUninitialized) {
HAL_FLASH_Lock();
return;
} else {
SHCI_C2_FLASH_EraseActivity(ERASE_ACTIVITY_OFF);
HAL_FLASH_Lock();
HAL_HSEM_Release(CFG_HW_FLASH_SEMID, HSEM_CPU1_COREID);
}
SHCI_C2_FLASH_EraseActivity(ERASE_ACTIVITY_OFF);
HAL_FLASH_Lock();
HAL_HSEM_Release(CFG_HW_FLASH_SEMID, HSEM_CPU1_COREID);
}

View File

@@ -3,7 +3,9 @@
#include <stm32wbxx.h>
bool api_hal_flash_erase(uint8_t page, uint8_t count) {
api_hal_bt_lock_flash();
if (!api_hal_bt_lock_flash()) {
return false;
}
FLASH_EraseInitTypeDef erase;
erase.TypeErase = FLASH_TYPEERASE_PAGES;
erase.Page = page;
@@ -15,14 +17,18 @@ bool api_hal_flash_erase(uint8_t page, uint8_t count) {
}
bool api_hal_flash_write_dword(size_t address, uint64_t data) {
api_hal_bt_lock_flash();
if (!api_hal_bt_lock_flash()) {
return false;
}
HAL_StatusTypeDef status = HAL_FLASH_Program(FLASH_TYPEPROGRAM_DOUBLEWORD, address, data);
api_hal_bt_unlock_flash();
return status == HAL_OK;
}
bool api_hal_flash_write_row(size_t address, size_t source_address) {
api_hal_bt_lock_flash();
if (!api_hal_bt_lock_flash()) {
return false;
}
HAL_StatusTypeDef status = HAL_FLASH_Program(FLASH_TYPEPROGRAM_FAST, address, source_address);
api_hal_bt_unlock_flash();
return status == HAL_OK;

View File

@@ -129,7 +129,7 @@ static void AdvUpdateProcess(void *argument);
static void Adv_Update( void );
void APP_BLE_Init() {
bool APP_BLE_Init() {
SHCI_C2_Ble_Init_Cmd_Packet_t ble_init_cmd_packet = {
{{0,0,0}}, /**< Header unused */
{0, /** pBleBufferAddress not used */
@@ -158,7 +158,7 @@ void APP_BLE_Init() {
HciUserEvtProcessId = osThreadNew(HciUserEvtProcess, NULL, &HciUserEvtProcess_attr);
// Starts the BLE Stack on CPU2
if (SHCI_C2_BLE_Init( &ble_init_cmd_packet ) != SHCI_Success) {
Error_Handler();
return false;
}
// Initialization of HCI & GATT & GAP layer
Ble_Hci_Gap_Gatt_Init();
@@ -191,6 +191,7 @@ void APP_BLE_Init() {
AdvIntervalMax = CFG_FAST_CONN_ADV_INTERVAL_MAX;
Adv_Request(APP_BLE_FAST_ADV);
return true;
}
SVCCTL_UserEvtFlowStatus_t SVCCTL_App_Notification( void *pckt )

View File

@@ -4,6 +4,7 @@
extern "C" {
#endif
#include <stdbool.h>
#include "hci_tl.h"
typedef enum {
@@ -16,7 +17,7 @@ typedef enum {
APP_BLE_CONNECTED_CLIENT
} APP_BLE_ConnStatus_t;
void APP_BLE_Init();
bool APP_BLE_Init();
APP_BLE_ConnStatus_t APP_BLE_Get_Server_Connection_Status();

View File

@@ -136,8 +136,12 @@ static void APPE_SysUserEvtRx( void * pPayload ) {
UNUSED(pPayload);
/* Traces channel initialization */
// APPD_EnableCPU2( );
ble_glue_status = BleGlueStatusStarted;
APP_BLE_Init( );
if (APP_BLE_Init()) {
ble_glue_status = BleGlueStatusStarted;
} else {
ble_glue_status = BleGlueStatusBroken;
}
}
/*************************************************************

View File

@@ -7,6 +7,7 @@ extern "C" {
typedef enum {
BleGlueStatusUninitialized,
BleGlueStatusStartup,
BleGlueStatusBroken,
BleGlueStatusStarted
} BleGlueStatus;