Merge unleashed

This commit is contained in:
Willy-JL
2023-07-29 20:24:53 +02:00
parent 15824cd117
commit aba874ddab
66 changed files with 223 additions and 5610 deletions

View File

@@ -53,9 +53,8 @@ typedef struct {
const GpioPin* async_mirror_pin;
uint8_t rolling_counter_mult;
bool timestamp_file_names : 1;
bool ext_power_amp : 1;
bool extended_frequency_i : 1;
bool external_module_power_amp : 1;
} FuriHalSubGhz;
volatile FuriHalSubGhz furi_hal_subghz = {
@@ -63,8 +62,8 @@ volatile FuriHalSubGhz furi_hal_subghz = {
.regulation = SubGhzRegulationTxRx,
.async_mirror_pin = NULL,
.rolling_counter_mult = 1,
.ext_power_amp = false,
.extended_frequency_i = false,
.external_module_power_amp = false,
};
uint8_t furi_hal_subghz_get_rolling_counter_mult(void) {
@@ -79,12 +78,12 @@ void furi_hal_subghz_set_extended_frequency(bool state_i) {
furi_hal_subghz.extended_frequency_i = state_i;
}
bool furi_hal_subghz_get_ext_power_amp() {
return furi_hal_subghz.external_module_power_amp;
void furi_hal_subghz_set_ext_power_amp(bool enabled) {
furi_hal_subghz.ext_power_amp = enabled;
}
void furi_hal_subghz_set_ext_power_amp(bool enabled) {
furi_hal_subghz.external_module_power_amp = enabled;
bool furi_hal_subghz_get_ext_power_amp() {
return furi_hal_subghz.ext_power_amp;
}
void furi_hal_subghz_set_async_mirror_pin(const GpioPin* pin) {

View File

@@ -238,16 +238,6 @@ bool furi_hal_subghz_is_async_tx_complete();
*/
void furi_hal_subghz_stop_async_tx();
/** Get external amplifier power state
* @return true if amplifier is enabled
*/
bool furi_hal_subghz_get_ext_power_amp();
/** Set external amplifier power state
* @param enabled true to enable amplifier state, false to disable state
*/
void furi_hal_subghz_set_ext_power_amp(bool enabled);
// /** Initialize and switch to power save mode Used by internal API-HAL
// * initialization routine Can be used to reinitialize device to safe state and
// * send it to sleep
@@ -292,6 +282,11 @@ void furi_hal_subghz_set_ext_power_amp(bool enabled);
// */
// void furi_hal_subghz_select_radio_type(SubGhzRadioType state);
// External CC1101 Ebytes power amplifier control
void furi_hal_subghz_set_ext_power_amp(bool enabled);
bool furi_hal_subghz_get_ext_power_amp();
#ifdef __cplusplus
}
#endif