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

This commit is contained in:
Aleksandr Kutuzov 2023-09-14 18:35:28 +09:00
commit dba34f25fe
5 changed files with 31 additions and 8 deletions

View File

@ -5,10 +5,10 @@ description: |
inputs:
catalog-url:
description: The URL of the Catalog API
description: The URL of the Catalog API. Must not be empty or end with a /.
required: true
catalog-api-token:
description: The token to use to authenticate with the Catalog API
description: The token to use to authenticate with the Catalog API. Must not be empty.
required: true
firmware-api:
description: Fimware's API version, major.minor
@ -17,12 +17,35 @@ inputs:
description: Firmware's target, e.g. f7/f18
required: true
firmware-version:
description: Firmware's version, e.g. 0.13.37-rc3
description: Firmware's version, e.g. 0.13.37-rc3, or 0.13.37
required: true
runs:
using: composite
steps:
- name: Check inputs
shell: bash
run: |
if [ -z "${{ inputs.catalog-url }}" ] ; then
echo "Invalid catalog-url: ${{ inputs.catalog-url }}"
exit 1
fi
if [ -z "${{ inputs.catalog-api-token }}" ] ; then
echo "Invalid catalog-api-token: ${{ inputs.catalog-api-token }}"
exit 1
fi
if ! echo "${{ inputs.firmware-api }}" | grep -q "^[0-9]\+\.[0-9]\+$" ; then
echo "Invalid firmware-api: ${{ inputs.firmware-api }}"
exit 1
fi
if ! echo "${{ inputs.firmware-target }}" | grep -q "^f[0-9]\+$" ; then
echo "Invalid firmware-target: ${{ inputs.firmware-target }}"
exit 1
fi
if ! echo "${{ inputs.firmware-version }}" | grep -q "^[0-9]\+\.[0-9]\+\.[0-9]\+\(-rc\)\?\([0-9]\+\)\?$" ; then
echo "Invalid firmware-version: ${{ inputs.firmware-version }}"
exit 1
fi
- name: Submit SDK
shell: bash
run: |

View File

@ -165,5 +165,5 @@ jobs:
catalog-url: ${{ secrets.CATALOG_URL }}
catalog-api-token: ${{ secrets.CATALOG_API_TOKEN }}
firmware-api: ${{ steps.build-fw.outputs.firmware_api }}
firwmare-target: ${{ matrix.target }}
firmware-target: ${{ matrix.target }}
firmware-version: ${{ steps.names.outputs.suffix }}

View File

@ -333,7 +333,7 @@ bool subghz_device_cc1101_ext_rx_pipe_not_empty() {
(CC1101_STATUS_RXBYTES) | CC1101_BURST,
(uint8_t*)status);
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) {
return true;
} else {
return false;

View File

@ -283,7 +283,7 @@ bool furi_hal_spi_bus_trx_dma(
if(tx_buffer == NULL) {
// RX mode, use dummy data instead of TX buffer
tx_buffer = (uint8_t*)&dma_dummy_u32;
tx_mem_increase_mode = LL_DMA_PERIPH_NOINCREMENT;
tx_mem_increase_mode = LL_DMA_MEMORY_NOINCREMENT;
} else {
tx_mem_increase_mode = LL_DMA_MEMORY_INCREMENT;
}

View File

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