Mirror/Momentum-Firmware
1
0
Fork 0
mirror of https://github.com/Next-Flip/Momentum-Firmware.git synced 2026-04-24 03:29:57 -07:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'OFW/dev' into dev

Browse Source
This commit is contained in:
MX
2024-04-02 17:02:56 +03:00
parent e436ea275a d32f195557
commit 3ccb2956f3
17 changed files with 63 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
targets/f7/ble_glue/ble_glue.c
View File

@@ -49,7 +49,7 @@ static BleGlue* ble_glue = NULL;
// static int32_t ble_glue_shci_thread(void* argument);
static void ble_sys_status_not_callback(SHCI_TL_CmdStatus_t status);
static void ble_sys_user_event_callback(void* pPayload);
static void ble_glue_clear_shared_memory();
static void ble_glue_clear_shared_memory(void);
void ble_glue_set_key_storage_changed_callback(
BleGlueKeyStorageChangedCallback callback,

4
targets/f7/ble_glue/gap.c
View File

@@ -410,7 +410,7 @@ static void gap_advertise_start(GapState new_state) {
uint16_t min_interval;
uint16_t max_interval;
FURI_LOG_I(TAG, "Start: %d", new_state);
FURI_LOG_D(TAG, "Start: %d", new_state);
if(new_state == GapStateAdvFast) {
min_interval = 0x80; // 80 ms
@@ -455,7 +455,7 @@ static void gap_advertise_start(GapState new_state) {
}
static void gap_advertise_stop(void) {
FURI_LOG_I(TAG, "Stop");
FURI_LOG_D(TAG, "Stop");
tBleStatus ret;
if(gap->state > GapStateIdle) {
if(gap->state == GapStateConnected) {

16
targets/f7/ble_glue/hw_ipcc.c
View File

@@ -15,14 +15,14 @@
(LL_C2_IPCC_IsActiveFlag_CHx(IPCC, channel) && \
LL_C1_IPCC_IsEnabledReceiveChannel(IPCC, channel))
static void (*FreeBufCb)();
static void (*FreeBufCb)(void);
static void HW_IPCC_BLE_EvtHandler();
static void HW_IPCC_BLE_AclDataEvtHandler();
static void HW_IPCC_MM_FreeBufHandler();
static void HW_IPCC_SYS_CmdEvtHandler();
static void HW_IPCC_SYS_EvtHandler();
static void HW_IPCC_TRACES_EvtHandler();
static void HW_IPCC_BLE_EvtHandler(void);
static void HW_IPCC_BLE_AclDataEvtHandler(void);
static void HW_IPCC_MM_FreeBufHandler(void);
static void HW_IPCC_SYS_CmdEvtHandler(void);
static void HW_IPCC_SYS_EvtHandler(void);
static void HW_IPCC_TRACES_EvtHandler(void);
void HW_IPCC_Rx_Handler(void) {
if(HW_IPCC_RX_PENDING(HW_IPCC_SYSTEM_EVENT_CHANNEL)) {
@@ -134,7 +134,7 @@ static void HW_IPCC_SYS_EvtHandler(void) {
LL_C1_IPCC_ClearFlag_CHx(IPCC, HW_IPCC_SYSTEM_EVENT_CHANNEL);
}
void HW_IPCC_MM_SendFreeBuf(void (*cb)()) {
void HW_IPCC_MM_SendFreeBuf(void (*cb)(void)) {
if(LL_C1_IPCC_IsActiveFlag_CHx(IPCC, HW_IPCC_MM_RELEASE_BUFFER_CHANNEL)) {
FreeBufCb = cb;
LL_C1_IPCC_EnableTransmitChannel(IPCC, HW_IPCC_MM_RELEASE_BUFFER_CHANNEL);

4
targets/f7/furi_hal/furi_hal_infrared.c
View File

@@ -92,8 +92,8 @@ static void furi_hal_infrared_tx_dma_set_polarity(uint8_t buf_num, uint8_t polar
static void furi_hal_infrared_tx_dma_set_buffer(uint8_t buf_num);
static void furi_hal_infrared_tx_fill_buffer_last(uint8_t buf_num);
static uint8_t furi_hal_infrared_get_current_dma_tx_buffer(void);
static void furi_hal_infrared_tx_dma_polarity_isr();
static void furi_hal_infrared_tx_dma_isr();
static void furi_hal_infrared_tx_dma_polarity_isr(void*);
static void furi_hal_infrared_tx_dma_isr(void*);
static void furi_hal_infrared_tim_rx_isr(void* context) {
UNUSED(context);

4
targets/f7/furi_hal/furi_hal_interrupt.c
View File

@@ -305,8 +305,8 @@ void DebugMon_Handler(void) {
extern usbd_device udev;
extern void HW_IPCC_Tx_Handler();
extern void HW_IPCC_Rx_Handler();
extern void HW_IPCC_Tx_Handler(void);
extern void HW_IPCC_Rx_Handler(void);
void SysTick_Handler(void) {
furi_hal_os_tick();

2
targets/f7/furi_hal/furi_hal_os.c
View File

@@ -51,7 +51,7 @@ void furi_hal_os_timer_callback(void) {
}
#endif
extern void xPortSysTickHandler();
extern void xPortSysTickHandler(void);
static volatile uint32_t furi_hal_os_skew;