Skip to content

Commit 97db0dc

Browse files
added ability to keep default tx settings
1 parent e37b6e9 commit 97db0dc

File tree

2 files changed

+69
-53
lines changed

2 files changed

+69
-53
lines changed
Lines changed: 54 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -1,51 +1,54 @@
1-
Filetype: Flipper SubGhz Setting File
2-
Version: 1
3-
4-
# Add Standard frequencies for your region
5-
#add_standard_frequencies: true
6-
7-
# Default Frequency: used as default for "Read" and "Read Raw"
8-
default_frequency: 433920000
9-
10-
# Frequencies used for "Read", "Read Raw" and "Frequency Analyzer"
11-
frequency: 300000000
12-
frequency: 302757000
13-
frequency: 303875000
14-
frequency: 304250000
15-
frequency: 310000000
16-
frequency: 312000000
17-
frequency: 313850000
18-
frequency: 314000000
19-
frequency: 314350000
20-
frequency: 315000000
21-
frequency: 318000000
22-
frequency: 345000000
23-
frequency: 348000000
24-
frequency: 387000000
25-
frequency: 390000000
26-
frequency: 418000000
27-
frequency: 433075000
28-
frequency: 433220000
29-
frequency: 433420000
30-
frequency: 433889000
31-
frequency: 433920000
32-
frequency: 434420000
33-
frequency: 434775000
34-
frequency: 438900000
35-
frequency: 464000000
36-
frequency: 779000000
37-
frequency: 868350000
38-
frequency: 915000000
39-
frequency: 925000000
40-
frequency: 928000000
41-
42-
# Frequencies used for hopping mode (keep this list small or flipper will miss signal)
43-
hopper_frequency: 300000000
44-
hopper_frequency: 310000000
45-
hopper_frequency: 312000000
46-
hopper_frequency: 314000000
47-
hopper_frequency: 315000000
48-
hopper_frequency: 318000000
49-
hopper_frequency: 390000000
50-
hopper_frequency: 433920000
51-
hopper_frequency: 868350000
1+
Filetype: Flipper SubGhz Setting File
2+
Version: 1
3+
4+
# Add Standard frequencies for your region
5+
#add_standard_frequencies: true
6+
7+
# Whether to ignore the default TX region settings
8+
ignore_default_tx_region: false
9+
10+
# Default Frequency: used as default for "Read" and "Read Raw"
11+
default_frequency: 433920000
12+
13+
# Frequencies used for "Read", "Read Raw" and "Frequency Analyzer"
14+
frequency: 300000000
15+
frequency: 302757000
16+
frequency: 303875000
17+
frequency: 304250000
18+
frequency: 310000000
19+
frequency: 312000000
20+
frequency: 313850000
21+
frequency: 314000000
22+
frequency: 314350000
23+
frequency: 315000000
24+
frequency: 318000000
25+
frequency: 345000000
26+
frequency: 348000000
27+
frequency: 387000000
28+
frequency: 390000000
29+
frequency: 418000000
30+
frequency: 433075000
31+
frequency: 433220000
32+
frequency: 433420000
33+
frequency: 433889000
34+
frequency: 433920000
35+
frequency: 434420000
36+
frequency: 434775000
37+
frequency: 438900000
38+
frequency: 464000000
39+
frequency: 779000000
40+
frequency: 868350000
41+
frequency: 915000000
42+
frequency: 925000000
43+
frequency: 928000000
44+
45+
# Frequencies used for hopping mode (keep this list small or flipper will miss signal)
46+
hopper_frequency: 300000000
47+
hopper_frequency: 310000000
48+
hopper_frequency: 312000000
49+
hopper_frequency: 314000000
50+
hopper_frequency: 315000000
51+
hopper_frequency: 318000000
52+
hopper_frequency: 390000000
53+
hopper_frequency: 433920000
54+
hopper_frequency: 868350000

firmware/targets/f7/furi_hal/furi_hal_subghz.c

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@
88
#include <furi_hal_interrupt.h>
99
#include <furi_hal_resources.h>
1010

11+
#include <lib/flipper_format/flipper_format.h>
12+
1113
#include <stm32wbxx_ll_dma.h>
1214

1315
#include <furi.h>
@@ -277,7 +279,18 @@ uint32_t furi_hal_subghz_set_frequency_and_path(uint32_t value) {
277279

278280
bool furi_hal_subghz_is_tx_allowed(uint32_t value) {
279281
//checking regional settings
280-
bool is_allowed = true;
282+
bool is_allowed = false;
283+
284+
Storage* storage = furi_record_open("storage");
285+
FlipperFormat* fff_data_file = flipper_format_file_alloc(storage);
286+
287+
if(flipper_format_file_open_existing(fff_data_file, "/ext/subghz/assets/setting_user")) {
288+
flipper_format_read_bool(fff_data_file, "ignore_default_tx_region", &is_allowed, 1);
289+
}
290+
291+
flipper_format_free(fff_data_file);
292+
furi_record_close("storage");
293+
281294
switch(furi_hal_version_get_hw_region()) {
282295
case FuriHalVersionRegionEuRu:
283296
//433,05..434,79; 868,15..868,55
@@ -686,4 +699,4 @@ void furi_hal_subghz_stop_async_tx() {
686699
(double)duty_cycle);
687700

688701
furi_hal_subghz.state = SubGhzStateIdle;
689-
}
702+
}

0 commit comments

Comments
 (0)