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

This commit is contained in:
Eng1n33r 2023-08-18 21:01:12 +03:00
commit 5cfc8fc536
No known key found for this signature in database
GPG Key ID: 7FAD1CA551A0D528
2 changed files with 2 additions and 2 deletions

View File

@ -357,7 +357,7 @@ bool subghz_device_cc1101_ext_rx_pipe_not_empty() {
(CC1101_STATUS_RXBYTES) | CC1101_BURST, (CC1101_STATUS_RXBYTES) | CC1101_BURST,
(uint8_t*)status); (uint8_t*)status);
furi_hal_spi_release(subghz_device_cc1101_ext->spi_bus_handle); furi_hal_spi_release(subghz_device_cc1101_ext->spi_bus_handle);
if((status->NUM_RXBYTES > 0) && (status->RXFIFO_OVERFLOW == 0)) { if((status->NUM_RXBYTES > 0) || (status->RXFIFO_OVERFLOW == 0)) {
return true; return true;
} else { } else {
return false; return false;

View File

@ -234,7 +234,7 @@ bool furi_hal_subghz_rx_pipe_not_empty() {
cc1101_read_reg( cc1101_read_reg(
&furi_hal_spi_bus_handle_subghz, (CC1101_STATUS_RXBYTES) | CC1101_BURST, (uint8_t*)status); &furi_hal_spi_bus_handle_subghz, (CC1101_STATUS_RXBYTES) | CC1101_BURST, (uint8_t*)status);
furi_hal_spi_release(&furi_hal_spi_bus_handle_subghz); furi_hal_spi_release(&furi_hal_spi_bus_handle_subghz);
if((status->NUM_RXBYTES > 0) && (status->RXFIFO_OVERFLOW == 0)) { if((status->NUM_RXBYTES > 0) || (status->RXFIFO_OVERFLOW == 0)) {
return true; return true;
} else { } else {
return false; return false;