Mirror/Momentum-Firmware
1
0
Fork 0
mirror of https://github.com/Next-Flip/Momentum-Firmware.git synced 2026-05-13 20:28:36 -07:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dev' of https://github.com/flipperdevices/flipperzero-firmware into xfw-dev

Browse Source 
--nobuild
This commit is contained in:
Willy-JL
2023-09-01 00:13:09 +02:00
parent 9f840e95f3 aa1c1fd905
commit 8ea7613953
3 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
applications/main/gpio/scenes/gpio_scene_usb_uart.c
View File

@@ -19,7 +19,7 @@ void gpio_scene_usb_uart_on_enter(void* context) {
uint32_t prev_state = scene_manager_get_scene_state(app->scene_manager, GpioAppViewUsbUart); uint32_t prev_state = scene_manager_get_scene_state(app->scene_manager, GpioAppViewUsbUart);
if(prev_state == 0) { if(prev_state == 0) {
scene_usb_uart = malloc(sizeof(SceneUsbUartBridge)); scene_usb_uart = malloc(sizeof(SceneUsbUartBridge));
scene_usb_uart->cfg.vcp_ch = 0; // TODO FL-3495: settings load scene_usb_uart->cfg.vcp_ch = 0;
scene_usb_uart->cfg.uart_ch = 0; scene_usb_uart->cfg.uart_ch = 0;
scene_usb_uart->cfg.flow_pins = 0; scene_usb_uart->cfg.flow_pins = 0;
scene_usb_uart->cfg.baudrate_mode = 0; scene_usb_uart->cfg.baudrate_mode = 0;

4
applications/main/subghz/scenes/subghz_scene_receiver.c
View File

@@ -167,7 +167,7 @@ void subghz_scene_receiver_on_enter(void* context) {
} }
furi_string_free(item_name); furi_string_free(item_name);
furi_string_free(item_time); furi_string_free(item_time);
subghz_scene_receiver_update_statusbar(subghz);
subghz_view_receiver_set_callback( subghz_view_receiver_set_callback(
subghz->subghz_receiver, subghz_scene_receiver_callback, subghz); subghz->subghz_receiver, subghz_scene_receiver_callback, subghz);
subghz_txrx_set_rx_calback(subghz->txrx, subghz_scene_add_to_history_callback, subghz); subghz_txrx_set_rx_calback(subghz->txrx, subghz_scene_add_to_history_callback, subghz);
@@ -182,6 +182,8 @@ void subghz_scene_receiver_on_enter(void* context) {
furi_check( furi_check(
subghz_txrx_load_decoder_by_name_protocol(subghz->txrx, SUBGHZ_PROTOCOL_BIN_RAW_NAME)); subghz_txrx_load_decoder_by_name_protocol(subghz->txrx, SUBGHZ_PROTOCOL_BIN_RAW_NAME));
subghz_scene_receiver_update_statusbar(subghz);
view_dispatcher_switch_to_view(subghz->view_dispatcher, SubGhzViewIdReceiver); view_dispatcher_switch_to_view(subghz->view_dispatcher, SubGhzViewIdReceiver);
} }

4
firmware/targets/f7/furi_hal/furi_hal_nfc.c
View File

@@ -701,7 +701,9 @@ bool furi_hal_nfc_tx_rx(FuriHalNfcTxRxContext* tx_rx, uint16_t timeout_ms) {
rfalNfcWorker(); rfalNfcWorker();
state = rfalNfcGetState(); state = rfalNfcGetState();
ret = rfalNfcDataExchangeGetStatus(); ret = rfalNfcDataExchangeGetStatus();
if(ret == ERR_BUSY) { if(ret == ERR_WRONG_STATE) {
return false;
} else if(ret == ERR_BUSY) {
if(DWT->CYCCNT - start > timeout_ms * clocks_in_ms) { if(DWT->CYCCNT - start > timeout_ms * clocks_in_ms) {
FURI_LOG_D(TAG, "Timeout during data exchange"); FURI_LOG_D(TAG, "Timeout during data exchange");
return false; return false;