Merge branch 'ul-dev' into xfw-dev

This commit is contained in:
Willy-JL
2023-04-25 17:39:55 +01:00
26 changed files with 242 additions and 38 deletions

View File

@@ -43,11 +43,19 @@ volatile FuriHalSubGhz furi_hal_subghz = {
.timestamp_file_names = false,
};
bool furi_hal_subghz_set_radio_type(SubGhzRadioType state) {
void furi_hal_subghz_select_radio_type(SubGhzRadioType state) {
furi_hal_subghz.radio_type = state;
}
bool furi_hal_subghz_init_radio_type(SubGhzRadioType state) {
if(state == SubGhzRadioInternal && furi_hal_subghz.cc1101_g0_pin == &gpio_cc1101_g0) {
return true;
} else if(state == SubGhzRadioExternal && furi_hal_subghz.cc1101_g0_pin == &gpio_cc1101_g0_ext) {
return true;
}
furi_hal_spi_bus_handle_deinit(furi_hal_subghz.spi_bus_handle);
if(furi_hal_subghz.radio_type == SubGhzRadioInternal) {
if(state == SubGhzRadioInternal) {
furi_hal_subghz.spi_bus_handle = &furi_hal_spi_bus_handle_subghz;
furi_hal_subghz.cc1101_g0_pin = &gpio_cc1101_g0;
} else {
@@ -120,6 +128,8 @@ void furi_hal_subghz_disable_ext_power(void) {
bool furi_hal_subghz_check_radio(void) {
bool result = true;
furi_hal_subghz_init_radio_type(furi_hal_subghz.radio_type);
furi_hal_spi_acquire(furi_hal_subghz.spi_bus_handle);
uint8_t ver = cc1101_get_version(furi_hal_subghz.spi_bus_handle);

View File

@@ -306,7 +306,7 @@ void furi_hal_subghz_stop_async_tx();
* @param state SubGhzRadioInternal or SubGhzRadioExternal
* @return true if switching is successful
*/
bool furi_hal_subghz_set_radio_type(SubGhzRadioType state);
bool furi_hal_subghz_init_radio_type(SubGhzRadioType state);
/** Get current radio
* @return SubGhzRadioInternal or SubGhzRadioExternal
@@ -353,6 +353,10 @@ void furi_hal_subghz_set_timestamp_file_names(bool state);
*/
bool furi_hal_subghz_get_timestamp_file_names(void);
/** Set what radio module we will be using
*/
void furi_hal_subghz_select_radio_type(SubGhzRadioType state);
#ifdef __cplusplus
}
#endif