Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

New clock switch schema, fixes random core2 crashes #3008

Merged
merged 40 commits into from
Sep 19, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
40 commits
Select commit Hold shift + click to select a range
668b4d2
Updated stack to 1.17.0
hedger Jul 11, 2023
6cf6fa3
hal: ble: Fixed stack config
hedger Jul 11, 2023
7c9f7cc
Bumped stack version in config
hedger Jul 11, 2023
3a6ceb5
scripts: added validation of copro stack version in update bundles
hedger Jul 11, 2023
9169760
Merge branch 'dev' into hedger/3423-stack17
hedger Jul 11, 2023
dff230b
Merge branch 'dev' into hedger/3423-stack17
hedger Jul 17, 2023
6a61e49
Merge remote-tracking branch 'origin/dev' into hedger/3423-stack17
skotopes Aug 15, 2023
1a5830e
Copro: update to 1.17.2
skotopes Aug 16, 2023
52362cf
Merge remote-tracking branch 'origin/dev' into hedger/3423-stack17
skotopes Aug 23, 2023
bfaa124
Merge remote-tracking branch 'origin/dev' into aku/alt_clocking
skotopes Aug 29, 2023
2c7a5ac
FuriHal: adjust tick frequency for HSE as sys clk
skotopes Aug 29, 2023
7cae081
Merge remote-tracking branch 'origin/dev' into aku/alt_clocking
skotopes Aug 30, 2023
4fac0f1
FuriHal: adjust systick reload on sys clock change
skotopes Aug 30, 2023
d13f74b
Sync api and format sources
skotopes Aug 30, 2023
de88fef
scripts: updated ob.data for newer stack
hedger Sep 1, 2023
9641a16
Merge remote-tracking branch 'origin/dev' into aku/alt_clocking
hedger Sep 1, 2023
b992f07
Add support for Mifare Classic 4k SAK 0x38 ATQA 0x02, 0x04, 0x08 (#3009)
suaveolent Sep 1, 2023
682b578
github: workflow trigger optimizations (#3030)
hedger Sep 1, 2023
a0fb585
[FL-3314] Disconnect from BLE on protobuf error (#2955)
Astrrra Sep 1, 2023
1a77b2f
Add File Naming setting for more detailed naming (#3002)
m1-ins Sep 1, 2023
b103723
[DOC] Remove defunct link in ReadMe.md (#3036)
SimplyLinn Sep 4, 2023
1c9c45b
Storage: force mount (#3033)
skotopes Sep 12, 2023
036c87a
FuriHal: return core2 hse pll transition on deep sleep
skotopes Sep 14, 2023
32eb4cd
FuriHal: cleanup ble glue
skotopes Sep 17, 2023
ea6c3b1
FuriHal: rework ble glue, allow shci_send in critical section
skotopes Sep 17, 2023
5720862
Merge remote-tracking branch 'origin/dev' into aku/alt_clocking
skotopes Sep 17, 2023
bb99409
FuriHal: sync api symbols
skotopes Sep 17, 2023
63a84ff
FuriHal: cleanup BLE glue, remove unused garbage and duplicate declar…
skotopes Sep 17, 2023
9f430da
FuriHal: BLE glue cleanup, 2nd iteration
skotopes Sep 17, 2023
b0170b9
FuriHal: hide tick drift reports under FURI_HAL_OS_DEBUG
skotopes Sep 17, 2023
756a8be
Lib: sync stm32wb_copro with latest dev
skotopes Sep 18, 2023
78a0db0
FuriHal: ble-glue, slightly less editable device name and duplicate d…
skotopes Sep 18, 2023
dc6ca59
FuriHal: update ble config options, enable some optimizations and ext…
skotopes Sep 19, 2023
5bc0467
FuriHal: update clock switch method documentation
skotopes Sep 19, 2023
9ed9619
FuriHal: better SNBRSA bug workaround fix
skotopes Sep 19, 2023
e4c7bcb
FuriHal: complete comment about tick skew
skotopes Sep 19, 2023
5db9eca
FuriHal: proper condition in clock hsi2hse transition
skotopes Sep 19, 2023
c8656c8
FuriHal: move PLL start to hse2pll routine, fix lockup caused by core…
skotopes Sep 19, 2023
05ab4e1
FuriHal: explicit HSE start before switch
skotopes Sep 19, 2023
1bf8117
FuriHal: fix documentation and move flash latency change to later sta…
skotopes Sep 19, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions SConstruct
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,8 @@ if GetOption("fullenv") or any(
"${COPRO_DISCLAIMER}",
"--obdata",
'"${ROOT_DIR.abspath}/${COPRO_OB_DATA}"',
"--stackversion",
"${COPRO_CUBE_VERSION}",
]
dist_resource_arguments = [
"-r",
Expand Down
2 changes: 1 addition & 1 deletion fbt_options.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
COPRO_OB_DATA = "scripts/ob.data"

# Must match lib/stm32wb_copro version
COPRO_CUBE_VERSION = "1.15.0"
COPRO_CUBE_VERSION = "1.17.2"

COPRO_CUBE_DIR = "lib/stm32wb_copro"

Expand Down
6 changes: 4 additions & 2 deletions firmware/targets/f18/api_symbols.csv
Original file line number Diff line number Diff line change
Expand Up @@ -1020,8 +1020,10 @@ Function,+,furi_hal_clock_mco_disable,void,
Function,+,furi_hal_clock_mco_enable,void,"FuriHalClockMcoSourceId, FuriHalClockMcoDivisorId"
Function,-,furi_hal_clock_resume_tick,void,
Function,-,furi_hal_clock_suspend_tick,void,
Function,-,furi_hal_clock_switch_to_hsi,void,
Function,-,furi_hal_clock_switch_to_pll,void,
Function,-,furi_hal_clock_switch_hse2hsi,void,
Function,-,furi_hal_clock_switch_hse2pll,_Bool,
Function,-,furi_hal_clock_switch_hsi2hse,void,
Function,-,furi_hal_clock_switch_pll2hse,_Bool,
Function,+,furi_hal_console_disable,void,
Function,+,furi_hal_console_enable,void,
Function,+,furi_hal_console_init,void,
Expand Down
6 changes: 4 additions & 2 deletions firmware/targets/f7/api_symbols.csv
Original file line number Diff line number Diff line change
Expand Up @@ -1091,8 +1091,10 @@ Function,+,furi_hal_clock_mco_disable,void,
Function,+,furi_hal_clock_mco_enable,void,"FuriHalClockMcoSourceId, FuriHalClockMcoDivisorId"
Function,-,furi_hal_clock_resume_tick,void,
Function,-,furi_hal_clock_suspend_tick,void,
Function,-,furi_hal_clock_switch_to_hsi,void,
Function,-,furi_hal_clock_switch_to_pll,void,
Function,-,furi_hal_clock_switch_hse2hsi,void,
Function,-,furi_hal_clock_switch_hse2pll,_Bool,
Function,-,furi_hal_clock_switch_hsi2hse,void,
Function,-,furi_hal_clock_switch_pll2hse,_Bool,
Function,+,furi_hal_console_disable,void,
Function,+,furi_hal_console_enable,void,
Function,+,furi_hal_console_init,void,
Expand Down
30 changes: 1 addition & 29 deletions firmware/targets/f7/ble_glue/app_common.h
Original file line number Diff line number Diff line change
@@ -1,30 +1,4 @@
/* USER CODE BEGIN Header */
/**
******************************************************************************
* File Name : app_common.h
* Description : App Common application configuration file for STM32WPAN Middleware.
*
******************************************************************************
* @attention
*
* <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
* All rights reserved.</center></h2>
*
* This software component is licensed by ST under Ultimate Liberty license
* SLA0044, the "License"; You may not use this file except in compliance with
* the License. You may obtain a copy of the License at:
* www.st.com/SLA0044
*
******************************************************************************
*/
/* USER CODE END Header */
/* Define to prevent recursive inclusion -------------------------------------*/
#ifndef APP_COMMON_H
#define APP_COMMON_H

#ifdef __cplusplus
extern "C" {
#endif
#pragma once

#include <stdint.h>
#include <string.h>
Expand All @@ -36,5 +10,3 @@ extern "C" {
#include <tl.h>

#include "app_conf.h"

#endif
Loading