Skip to content

Commit

Permalink
Fix regio typo
Browse files Browse the repository at this point in the history
  • Loading branch information
Willy-JL committed Mar 19, 2024
1 parent 8869d9b commit a84e2ef
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 9 deletions.
2 changes: 1 addition & 1 deletion applications/main/subghz/subghz_extended_freq.c
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ void subghz_extended_freq() {
}

furi_hal_subghz_set_extended_frequency(is_extended_i);
furi_hal_subghz_set_bypass_regio(is_bypassed);
furi_hal_subghz_set_bypass_region(is_bypassed);

flipper_format_free(file);
furi_record_close(RECORD_STORAGE);
Expand Down
2 changes: 1 addition & 1 deletion targets/f7/api_symbols.csv
Original file line number Diff line number Diff line change
Expand Up @@ -1664,7 +1664,7 @@ 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_set_async_mirror_pin,void,const GpioPin*
Function,+,furi_hal_subghz_set_bypass_regio,void,_Bool
Function,+,furi_hal_subghz_set_bypass_region,void,_Bool
Function,+,furi_hal_subghz_set_ext_power_amp,void,_Bool
Function,+,furi_hal_subghz_set_frequency,uint32_t,uint32_t
Function,+,furi_hal_subghz_set_frequency_and_path,uint32_t,uint32_t
Expand Down
12 changes: 6 additions & 6 deletions targets/f7/furi_hal/furi_hal_subghz.c
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ typedef struct {
int8_t rolling_counter_mult;
bool ext_power_amp : 1;
bool extended_frequency_i : 1;
bool bypass_regio : 1;
bool bypass_region : 1;
} FuriHalSubGhz;

volatile FuriHalSubGhz furi_hal_subghz = {
Expand All @@ -65,7 +65,7 @@ volatile FuriHalSubGhz furi_hal_subghz = {
.rolling_counter_mult = 1,
.ext_power_amp = false,
.extended_frequency_i = false,
.bypass_regio = false,
.bypass_region = false,
};

int8_t furi_hal_subghz_get_rolling_counter_mult(void) {
Expand All @@ -80,8 +80,8 @@ void furi_hal_subghz_set_extended_frequency(bool state_i) {
furi_hal_subghz.extended_frequency_i = state_i;
}

void furi_hal_subghz_set_bypass_regio(bool enabled) {
furi_hal_subghz.bypass_regio = enabled;
void furi_hal_subghz_set_bypass_region(bool enabled) {
furi_hal_subghz.bypass_region = enabled;
}

void furi_hal_subghz_set_ext_power_amp(bool enabled) {
Expand Down Expand Up @@ -407,12 +407,12 @@ uint32_t furi_hal_subghz_set_frequency_and_path(uint32_t value) {

bool furi_hal_subghz_is_tx_allowed(uint32_t value) {
bool allow_extended_for_int = furi_hal_subghz.extended_frequency_i;
bool bypass_regio = furi_hal_subghz.bypass_regio;
bool bypass_region = furi_hal_subghz.bypass_region;

bool allowed = false;

do {
if(bypass_regio) {
if(bypass_region) {
if(!allow_extended_for_int && !furi_hal_subghz_is_frequency_valid(value)) {
FURI_LOG_I(TAG, "Frequency blocked - outside default range");
break;
Expand Down
2 changes: 1 addition & 1 deletion targets/f7/furi_hal/furi_hal_subghz.h
Original file line number Diff line number Diff line change
Expand Up @@ -287,7 +287,7 @@ void furi_hal_subghz_set_ext_power_amp(bool enabled);

bool furi_hal_subghz_get_ext_power_amp();

void furi_hal_subghz_set_bypass_regio(bool enabled);
void furi_hal_subghz_set_bypass_region(bool enabled);

bool furi_hal_subghz_is_frequency_valid_extended(uint32_t value);

Expand Down

0 comments on commit a84e2ef

Please sign in to comment.