Skip to content

Commit 88f3537

Browse files
committed
9kHz, 20kHz, 200kHz frequency steps added egzumer#295
1 parent de8c501 commit 88f3537

File tree

2 files changed

+45
-39
lines changed

2 files changed

+45
-39
lines changed

frequencies.c

+24-21
Original file line numberDiff line numberDiff line change
@@ -65,35 +65,38 @@ const freq_band_table_t frequencyBandTable[] =
6565
// this order of steps has to be preserved for backwards compatibility with other/stock firmwares
6666
const uint16_t gStepFrequencyTable[] = {
6767
// standard steps
68-
[STEP_2_5kHz] = 250,
69-
[STEP_5kHz] = 500,
70-
[STEP_6_25kHz] = 625,
71-
[STEP_10kHz] = 1000,
72-
[STEP_12_5kHz] = 1250,
73-
[STEP_25kHz] = 2500,
68+
[STEP_2_5kHz] = 250,
69+
[STEP_5kHz] = 500,
70+
[STEP_6_25kHz] = 625,
71+
[STEP_10kHz] = 1000,
72+
[STEP_12_5kHz] = 1250,
73+
[STEP_25kHz] = 2500,
7474
[STEP_8_33kHz] = 833,
7575
// custom steps
76-
[STEP_0_01kHz] = 1,
77-
[STEP_0_05kHz] = 5,
78-
[STEP_0_1kHz] = 10,
79-
[STEP_0_25kHz] = 25,
80-
[STEP_0_5kHz] = 50,
81-
[STEP_1kHz] = 100,
82-
[STEP_1_25kHz] = 125,
83-
[STEP_15kHz] = 1500,
84-
[STEP_30kHz] = 3000,
85-
[STEP_50kHz] = 5000,
86-
[STEP_100kHz] = 10000,
87-
[STEP_125kHz] = 12500,
88-
[STEP_250kHz] = 25000,
76+
[STEP_0_01kHz] = 1,
77+
[STEP_0_05kHz] = 5,
78+
[STEP_0_1kHz] = 10,
79+
[STEP_0_25kHz] = 25,
80+
[STEP_0_5kHz] = 50,
81+
[STEP_1kHz] = 100,
82+
[STEP_1_25kHz] = 125,
83+
[STEP_9kHz] = 900,
84+
[STEP_15kHz] = 1500,
85+
[STEP_20kHz] = 2000,
86+
[STEP_30kHz] = 3000,
87+
[STEP_50kHz] = 5000,
88+
[STEP_100kHz] = 10000,
89+
[STEP_125kHz] = 12500,
90+
[STEP_200kHz] = 20000,
91+
[STEP_250kHz] = 25000,
8992
[STEP_500kHz] = 50000
9093
};
9194

9295

9396
const STEP_Setting_t StepSortedIndexes[] = {
9497
STEP_0_01kHz, STEP_0_05kHz, STEP_0_1kHz, STEP_0_25kHz, STEP_0_5kHz, STEP_1kHz, STEP_1_25kHz, STEP_2_5kHz, STEP_5kHz, STEP_6_25kHz,
95-
STEP_8_33kHz, STEP_10kHz, STEP_12_5kHz, STEP_15kHz, STEP_25kHz, STEP_30kHz, STEP_50kHz, STEP_100kHz,
96-
STEP_125kHz, STEP_250kHz, STEP_500kHz
98+
STEP_8_33kHz, STEP_9kHz, STEP_10kHz, STEP_12_5kHz, STEP_15kHz, STEP_20kHz, STEP_25kHz, STEP_30kHz, STEP_50kHz, STEP_100kHz,
99+
STEP_125kHz, STEP_200kHz, STEP_250kHz, STEP_500kHz
97100
};
98101

99102
STEP_Setting_t FREQUENCY_GetStepIdxFromSortedIdx(uint8_t sortedIdx)

frequencies.h

+21-18
Original file line numberDiff line numberDiff line change
@@ -45,27 +45,30 @@ extern const freq_band_table_t frequencyBandTable[];
4545

4646
typedef enum {
4747
// standard steps
48-
STEP_2_5kHz,
49-
STEP_5kHz,
50-
STEP_6_25kHz,
51-
STEP_10kHz,
52-
STEP_12_5kHz,
53-
STEP_25kHz,
48+
STEP_2_5kHz,
49+
STEP_5kHz,
50+
STEP_6_25kHz,
51+
STEP_10kHz,
52+
STEP_12_5kHz,
53+
STEP_25kHz,
5454
STEP_8_33kHz,
5555
// custom steps
56-
STEP_0_01kHz,
57-
STEP_0_05kHz,
58-
STEP_0_1kHz,
59-
STEP_0_25kHz,
60-
STEP_0_5kHz,
61-
STEP_1kHz,
62-
STEP_1_25kHz,
56+
STEP_0_01kHz,
57+
STEP_0_05kHz,
58+
STEP_0_1kHz,
59+
STEP_0_25kHz,
60+
STEP_0_5kHz,
61+
STEP_1kHz,
62+
STEP_1_25kHz,
63+
STEP_9kHz,
6364
STEP_15kHz,
64-
STEP_30kHz,
65-
STEP_50kHz,
66-
STEP_100kHz,
67-
STEP_125kHz,
68-
STEP_250kHz,
65+
STEP_20kHz,
66+
STEP_30kHz,
67+
STEP_50kHz,
68+
STEP_100kHz,
69+
STEP_125kHz,
70+
STEP_200kHz,
71+
STEP_250kHz,
6972
STEP_500kHz,
7073
STEP_N_ELEM
7174
} STEP_Setting_t;

0 commit comments

Comments
 (0)