Merge remote-tracking branch 'ofw/dev' into mntm-dev

This commit is contained in:
Willy-JL
2024-08-05 01:50:20 +02:00
109 changed files with 1115 additions and 1860 deletions

View File

@@ -72,55 +72,68 @@ const FuriHalRegion furi_hal_region_jp = {
.duty_cycle = 50,
}}};
static const FuriHalRegion* furi_hal_region = NULL;
static const FuriHalRegion* const furi_hal_static_regions[] = {
[FuriHalVersionRegionUnknown] = &furi_hal_region_zero,
[FuriHalVersionRegionEuRu] = &furi_hal_region_eu_ru,
[FuriHalVersionRegionUsCaAu] = &furi_hal_region_us_ca_au,
[FuriHalVersionRegionJp] = &furi_hal_region_jp,
};
static FuriHalRegion* furi_hal_dynamic_region;
static FuriMutex* furi_hal_dynamic_region_mutex;
void furi_hal_region_init(void) {
FuriHalVersionRegion region = furi_hal_version_get_hw_region();
if(region == FuriHalVersionRegionUnknown) {
furi_hal_region = &furi_hal_region_zero;
} else if(region == FuriHalVersionRegionEuRu) {
furi_hal_region = &furi_hal_region_eu_ru;
} else if(region == FuriHalVersionRegionUsCaAu) {
furi_hal_region = &furi_hal_region_us_ca_au;
} else if(region == FuriHalVersionRegionJp) {
furi_hal_region = &furi_hal_region_jp;
}
furi_assert(furi_hal_dynamic_region_mutex == NULL);
furi_hal_dynamic_region_mutex = furi_mutex_alloc(FuriMutexTypeNormal);
}
const FuriHalRegion* furi_hal_region_get(void) {
return furi_hal_region;
const FuriHalVersionRegion region = furi_hal_version_get_hw_region();
const FuriHalRegion* ret;
furi_check(furi_mutex_acquire(furi_hal_dynamic_region_mutex, FuriWaitForever) == FuriStatusOk);
if(region < FuriHalVersionRegionWorld && furi_hal_dynamic_region == NULL) {
ret = furi_hal_static_regions[region];
} else {
ret = furi_hal_dynamic_region;
}
furi_check(furi_mutex_release(furi_hal_dynamic_region_mutex) == FuriStatusOk);
return ret;
}
void furi_hal_region_set(FuriHalRegion* region) {
furi_check(region);
furi_hal_region = region;
furi_check(furi_mutex_acquire(furi_hal_dynamic_region_mutex, FuriWaitForever) == FuriStatusOk);
if(furi_hal_dynamic_region) {
free(furi_hal_dynamic_region);
}
furi_hal_dynamic_region = region;
furi_check(furi_mutex_release(furi_hal_dynamic_region_mutex) == FuriStatusOk);
}
bool furi_hal_region_is_provisioned(void) {
return furi_hal_region != NULL;
return furi_hal_region_get() != NULL;
}
const char* furi_hal_region_get_name(void) {
if(furi_hal_region) {
return furi_hal_region->country_code;
const FuriHalRegion* region = furi_hal_region_get();
if(region) {
return region->country_code;
} else {
return "--";
}
}
bool _furi_hal_region_is_frequency_allowed(uint32_t frequency) {
if(!furi_hal_region) {
return false;
}
const FuriHalRegionBand* band = furi_hal_region_get_band(frequency);
if(!band) {
return false;
}
return true;
return furi_hal_region_get_band(frequency) != NULL;
}
// Check furi_hal_subghz settings for region bypass, if not it uses function above
@@ -129,14 +142,15 @@ bool furi_hal_region_is_frequency_allowed(uint32_t frequency) {
}
const FuriHalRegionBand* furi_hal_region_get_band(uint32_t frequency) {
if(!furi_hal_region) {
const FuriHalRegion* region = furi_hal_region_get();
if(!region) {
return NULL;
}
for(size_t i = 0; i < furi_hal_region->bands_count; i++) {
if(furi_hal_region->bands[i].start <= frequency &&
furi_hal_region->bands[i].end >= frequency) {
return &furi_hal_region->bands[i];
for(size_t i = 0; i < region->bands_count; i++) {
if(region->bands[i].start <= frequency && region->bands[i].end >= frequency) {
return &region->bands[i];
}
}