Merge branch 'ul-dev' into xfw-dev

firmware/targets/f7/api_symbols.csv

@@ -1453,6 +1453,7 @@ Function,+,furi_hal_subghz_get_timestamp_file_names,_Bool,
 Function,+,furi_hal_subghz_idle,void,
 Function,-,furi_hal_subghz_init,void,
 Function,+,furi_hal_subghz_init_check,_Bool,
+Function,+,furi_hal_subghz_init_radio_type,_Bool,SubGhzRadioType
 Function,+,furi_hal_subghz_is_async_tx_complete,_Bool,
 Function,+,furi_hal_subghz_is_frequency_valid,_Bool,uint32_t
 Function,+,furi_hal_subghz_is_rx_data_crc_valid,_Bool,
@@ -1465,13 +1466,13 @@ Function,+,furi_hal_subghz_read_packet,void,"uint8_t*, uint8_t*"
 Function,+,furi_hal_subghz_reset,void,
 Function,+,furi_hal_subghz_rx,void,
 Function,+,furi_hal_subghz_rx_pipe_not_empty,_Bool,
+Function,+,furi_hal_subghz_select_radio_type,void,SubGhzRadioType
 Function,+,furi_hal_subghz_set_async_mirror_pin,void,const GpioPin*
 Function,+,furi_hal_subghz_set_extend_settings,void,"_Bool, _Bool"
 Function,+,furi_hal_subghz_set_external_power_disable,void,_Bool
 Function,+,furi_hal_subghz_set_frequency,uint32_t,uint32_t
 Function,+,furi_hal_subghz_set_frequency_and_path,uint32_t,uint32_t
 Function,+,furi_hal_subghz_set_path,void,FuriHalSubGhzPath
-Function,+,furi_hal_subghz_set_radio_type,_Bool,SubGhzRadioType
 Function,+,furi_hal_subghz_set_rolling_counter_mult,void,uint8_t
 Function,+,furi_hal_subghz_set_timestamp_file_names,void,_Bool
 Function,-,furi_hal_subghz_shutdown,void,

firmware/targets/f7/furi_hal/furi_hal_subghz.c

@@ -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);

firmware/targets/f7/furi_hal/furi_hal_subghz.h

@@ -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