diff --git a/firmware/application/freqman.hpp b/firmware/application/freqman.hpp index 688801c3852c899d2e78cd7e9e669dc8b7d13981..daaad1efb98db4d63b41d4b925f516fea9846e6f 100644 --- a/firmware/application/freqman.hpp +++ b/firmware/application/freqman.hpp @@ -30,8 +30,8 @@ #define __FREQMAN_H__ #define FREQMAN_DESC_MAX_LEN 30 -#define FREQMAN_MAX_PER_FILE 30 -#define FREQMAN_MAX_PER_FILE_STR "30" +#define FREQMAN_MAX_PER_FILE 99 +#define FREQMAN_MAX_PER_FILE_STR "99" using namespace ui; using namespace std; diff --git a/sdcard/FREQMAN/CB21-40.TXT b/sdcard/FREQMAN/CB.TXT similarity index 55% rename from sdcard/FREQMAN/CB21-40.TXT rename to sdcard/FREQMAN/CB.TXT index 2a107bf92e6d0e1b8771c3c6b5a4d87f18230098..ab8be40f05d7e0ff93bc957fe20d83f8fed9d029 100644 --- a/sdcard/FREQMAN/CB21-40.TXT +++ b/sdcard/FREQMAN/CB.TXT @@ -1,3 +1,23 @@ +f=26965000,d=CH01 +f=26975000,d=CH02 +f=26985000,d=CH03 +f=27005000,d=CH04 +f=27015000,d=CH05 +f=27025000,d=CH06 +f=27035000,d=CH07 +f=27055000,d=CH08 +f=27065000,d=CH09 +f=27075000,d=CH10 +f=27085000,d=CH11 +f=27105000,d=CH12 +f=27115000,d=CH13 +f=27125000,d=CH14 +f=27135000,d=CH15 +f=27155000,d=CH16 +f=27165000,d=CH17 +f=27175000,d=CH18 +f=27185000,d=CH19 +f=27205000,d=CH20 f=27215000,d=CB CH 21 f=27225000,d=CB CH 22 f=27255000,d=CB CH 23 diff --git a/sdcard/FREQMAN/CB1-20.TXT b/sdcard/FREQMAN/CB1-20.TXT deleted file mode 100644 index 31919245f78d5ddd36983cbe5e642c828550de06..0000000000000000000000000000000000000000 --- a/sdcard/FREQMAN/CB1-20.TXT +++ /dev/null @@ -1,20 +0,0 @@ -f=26965000,d=CH01 -f=26975000,d=CH02 -f=26985000,d=CH03 -f=27005000,d=CH04 -f=27015000,d=CH05 -f=27025000,d=CH06 -f=27035000,d=CH07 -f=27055000,d=CH08 -f=27065000,d=CH09 -f=27075000,d=CH10 -f=27085000,d=CH11 -f=27105000,d=CH12 -f=27115000,d=CH13 -f=27125000,d=CH14 -f=27135000,d=CH15 -f=27155000,d=CH16 -f=27165000,d=CH17 -f=27175000,d=CH18 -f=27185000,d=CH19 -f=27205000,d=CH20 diff --git a/sdcard/FREQMAN/GSM.TXT b/sdcard/FREQMAN/GSM-FR.TXT similarity index 100% rename from sdcard/FREQMAN/GSM.TXT rename to sdcard/FREQMAN/GSM-FR.TXT diff --git a/sdcard/FREQMAN/LPD433-1.TXT b/sdcard/FREQMAN/LPD433-1.TXT deleted file mode 100644 index b4ecab2102b20053170c00dcec6c7a5a2abd101a..0000000000000000000000000000000000000000 --- a/sdcard/FREQMAN/LPD433-1.TXT +++ /dev/null @@ -1,29 +0,0 @@ -f=433075000,d=LPD433 CH1 -f=433100000,d=LPD433 CH2 -f=433125000,d=LPD433 CH3 -f=433150000,d=LPD433 CH4 -f=433175000,d=LPD433 CH5 -f=433200000,d=LPD433 CH6 -f=433225000,d=LPD433 CH7 -f=433250000,d=LPD433 CH8 -f=433275000,d=LPD433 CH9 -f=433300000,d=LPD433 CH10 -f=433325000,d=LPD433 CH11 -f=433350000,d=LPD433 CH12 -f=433375000,d=LPD433 CH13 -f=433400000,d=LPD433 CH14 -f=433425000,d=LPD433 CH15 -f=433450000,d=LPD433 CH16 -f=433475000,d=LPD433 CH17 -f=433500000,d=LPD433 CH18 -f=433525000,d=LPD433 CH19 -f=433550000,d=LPD433 CH20 -f=433575000,d=LPD433 CH21 -f=433600000,d=LPD433 CH22 -f=433625000,d=LPD433 CH23 -f=433650000,d=LPD433 CH24 -f=433675000,d=LPD433 CH25 -f=433700000,d=LPD433 CH26 -f=433725000,d=LPD433 CH27 -f=433750000,d=LPD433 CH28 -f=433775000,d=LPD433 CH29 diff --git a/sdcard/FREQMAN/LPD433-2.TXT b/sdcard/FREQMAN/LPD433-2.TXT deleted file mode 100644 index cb407ec49dce8ea7365c3db6ddc8a8e0f694d4e1..0000000000000000000000000000000000000000 --- a/sdcard/FREQMAN/LPD433-2.TXT +++ /dev/null @@ -1,30 +0,0 @@ -f=433800000,d=LPD433 CH30 -f=433825000,d=LPD433 CH31 -f=433850000,d=LPD433 CH32 -f=433875000,d=LPD433 CH33 -f=433900000,d=LPD433 CH34 -f=433925000,d=LPD433 CH35 -f=433950000,d=LPD433 CH36 -f=433975000,d=LPD433 CH37 -f=434000000,d=LPD433 CH38 -f=434025000,d=LPD433 CH39 -f=434050000,d=LPD433 CH40 -f=434075000,d=LPD433 CH41 -f=434100000,d=LPD433 CH42 -f=434125000,d=LPD433 CH43 -f=434150000,d=LPD433 CH44 -f=434175000,d=LPD433 CH45 -f=434200000,d=LPD433 CH46 -f=434225000,d=LPD433 CH47 -f=434250000,d=LPD433 CH48 -f=434275000,d=LPD433 CH49 -f=434300000,d=LPD433 CH50 -f=434325000,d=LPD433 CH51 -f=434350000,d=LPD433 CH52 -f=434375000,d=LPD433 CH53 -f=434400000,d=LPD433 CH54 -f=434425000,d=LPD433 CH55 -f=434450000,d=LPD433 CH56 -f=434475000,d=LPD433 CH57 -f=434500000,d=LPD433 CH58 -f=434525000,d=LPD433 CH59 diff --git a/sdcard/FREQMAN/LPD433-3.TXT b/sdcard/FREQMAN/LPD433-3.TXT deleted file mode 100644 index 2a58ab79dc0557910e1046988e1fc9b2d60503db..0000000000000000000000000000000000000000 --- a/sdcard/FREQMAN/LPD433-3.TXT +++ /dev/null @@ -1,10 +0,0 @@ -f=434550000,d=LPD433 CH60 -f=434575000,d=LPD433 CH61 -f=434600000,d=LPD433 CH62 -f=434625000,d=LPD433 CH63 -f=434650000,d=LPD433 CH64 -f=434675000,d=LPD433 CH65 -f=434700000,d=LPD433 CH66 -f=434725000,d=LPD433 CH67 -f=434750000,d=LPD433 CH68 -f=434775000,d=LPD433 CH69 diff --git a/sdcard/FREQMAN/POCSAG-1.TXT b/sdcard/FREQMAN/POCSAG-1.TXT deleted file mode 100644 index 4c04b11c753a0526e8c5d3cc005ce079c4ffba58..0000000000000000000000000000000000000000 --- a/sdcard/FREQMAN/POCSAG-1.TXT +++ /dev/null @@ -1,23 +0,0 @@ -f=169625000,d=BEL Fire 2400 -f=466025000,d=FRA e-Msg1 1200 -f=466050000,d=FRA e-Msg2 1200 -f=466075000,d=FRA e-Msg3 1200 -f=466175000,d=FRA e-Msg4 1200 -f=466206250,d=FRA e-Msg5 1200 -f=466231250,d=FRA e-Msg6 1200 -f=173512500,d=FRA Fire * -f=85955000,d=FRA Fire HF -f=173550000,d=FRA Fire 1 -f=173625000,d=FRA Fire 2 -f=173550000,d=FRA Fire 3 -f=173700000,d=FRA Fire 4 -f=173875000,d=FRA Fire 5 -f=173925000,d=FRA Fire 6 -f=173550000,d=FRA Fire 7 -f=168950000,d=FRA Fire 8 -f=169025000,d=FRA Fire 9 -f=169100000,d=FRA Fire 10 -f=169275000,d=FRA Fire 11 -f=169325000,d=FRA Fire 12 -f=446475000,d=FRA Priv 1 -f=446525000,d=FRA Priv 2 diff --git a/sdcard/FREQMAN/POCSAG-2.TXT b/sdcard/FREQMAN/POCSAG-2.TXT deleted file mode 100644 index 8c786ca37002b8c6920a5031034f76e436ee11a3..0000000000000000000000000000000000000000 --- a/sdcard/FREQMAN/POCSAG-2.TXT +++ /dev/null @@ -1,15 +0,0 @@ -f=147300000,d=CH Swissphone 1 -f=147325000,d=CH Swissphone 2 -f=147375000,d=CH Swissphone 3 -f=147400000,d=CH Swissphone 4 -f=169700000,d=CH Swissphone 5 -f=448425000,d=GER Fire 1200 -f=465970000,d=GER Skyper1 -f=466075000,d=GER Skyper2 -f=169650000,d=NL Medical -f=172450000,d=NL KPN3-Public -f=169800000,d=SWE Minicall1 -f=161437500,d=SWE Minicall2 -f=152007500,d=USA Medical1 -f=157450000,d=USA Medical2 -f=163250000,d=USA Medical3 diff --git a/sdcard/FREQMAN/POCSAG.TXT b/sdcard/FREQMAN/POCSAG.TXT index 65038bd0a57b03d77785da31f0be00652bc05b92..64a1bedea7ba48489b4af06a261f35e46d6b8113 100644 --- a/sdcard/FREQMAN/POCSAG.TXT +++ b/sdcard/FREQMAN/POCSAG.TXT @@ -31,3 +31,8 @@ f=161437500,d=SWE Minicall2 f=152007500,d=USA Medical1 f=157450000,d=USA Medical2 f=163250000,d=USA Medical3 +f=147300000,d=CH Swissphone 1 +f=147325000,d=CH Swissphone 2 +f=147375000,d=CH Swissphone 3 +f=147400000,d=CH Swissphone 4 +f=169700000,d=CH Swissphone 5 diff --git a/sdcard/FREQMAN/WLAN5-2.TXT b/sdcard/FREQMAN/WLAN5-2.TXT deleted file mode 100644 index 266f254af3fa21ae656b3829b6ed7efd928c8453..0000000000000000000000000000000000000000 --- a/sdcard/FREQMAN/WLAN5-2.TXT +++ /dev/null @@ -1,19 +0,0 @@ -a=5610000000,b=5650000000,d=WLAN 5G CH126 -a=5630000000,b=5650000000,d=WLAN 5G CH128 -a=5650000000,b=5670000000,d=WLAN 5G CH132 -a=5650000000,b=5690000000,d=WLAN 5G CH134 -a=5670000000,b=5690000000,d=WLAN 5G CH136 -a=5650000000,b=5730000000,d=WLAN 5G CH138 -a=5690000000,b=5710000000,d=WLAN 5G CH140 -a=5690000000,b=5730000000,d=WLAN 5G CH142 -a=5710000000,b=5730000000,d=WLAN 5G CH144 -a=5735000000,b=5755000000,d=WLAN 5G CH149 -a=5735000000,b=5775000000,d=WLAN 5G CH151 -a=5755000000,b=5775000000,d=WLAN 5G CH153 -a=5735000000,b=5815000000,d=WLAN 5G CH155 -a=5775000000,b=5795000000,d=WLAN 5G CH157 -a=5775000000,b=5815000000,d=WLAN 5G CH159 -a=5795000000,b=5815000000,d=WLAN 5G CH161 -a=5815000000,b=5835000000,d=WLAN 5G CH165 -a=5835000000,b=5855000000,d=WLAN 5G CH169 -a=5855000000,b=5875000000,d=WLAN 5G CH173 diff --git a/sdcard/FREQMAN/WLAN5-1.TXT b/sdcard/FREQMAN/WLAN5_8.TXT similarity index 59% rename from sdcard/FREQMAN/WLAN5-1.TXT rename to sdcard/FREQMAN/WLAN5_8.TXT index c97ca8bd989f91612c8233407069d90270943ac9..a24d5fb6be92a7c49f7589c436b76629bfcb609e 100644 --- a/sdcard/FREQMAN/WLAN5-1.TXT +++ b/sdcard/FREQMAN/WLAN5_8.TXT @@ -26,3 +26,22 @@ a=5570000000,b=5610000000,d=WLAN 5G CH118 a=5590000000,b=5610000000,d=WLAN 5G CH120 a=5570000000,b=5650000000,d=WLAN 5G CH122 a=5610000000,b=5630000000,d=WLAN 5G CH124 +a=5610000000,b=5650000000,d=WLAN 5G CH126 +a=5630000000,b=5650000000,d=WLAN 5G CH128 +a=5650000000,b=5670000000,d=WLAN 5G CH132 +a=5650000000,b=5690000000,d=WLAN 5G CH134 +a=5670000000,b=5690000000,d=WLAN 5G CH136 +a=5650000000,b=5730000000,d=WLAN 5G CH138 +a=5690000000,b=5710000000,d=WLAN 5G CH140 +a=5690000000,b=5730000000,d=WLAN 5G CH142 +a=5710000000,b=5730000000,d=WLAN 5G CH144 +a=5735000000,b=5755000000,d=WLAN 5G CH149 +a=5735000000,b=5775000000,d=WLAN 5G CH151 +a=5755000000,b=5775000000,d=WLAN 5G CH153 +a=5735000000,b=5815000000,d=WLAN 5G CH155 +a=5775000000,b=5795000000,d=WLAN 5G CH157 +a=5775000000,b=5815000000,d=WLAN 5G CH159 +a=5795000000,b=5815000000,d=WLAN 5G CH161 +a=5815000000,b=5835000000,d=WLAN 5G CH165 +a=5835000000,b=5855000000,d=WLAN 5G CH169 +a=5855000000,b=5875000000,d=WLAN 5G CH173