From 909b00bdae54590b53aebf6f8d646025addc9cc0 Mon Sep 17 00:00:00 2001 From: gullradriel <3157857+gullradriel@users.noreply.github.com> Date: Wed, 10 May 2023 13:26:21 +0200 Subject: [PATCH] Fixing units KHz => kHz (#967) Co-authored-by: GullCode --- firmware/application/freqman.cpp | 64 ++++++++++++++++---------------- firmware/application/freqman.hpp | 2 +- sdcard/FREQMAN/RECON.TXT | 30 +++++++-------- 3 files changed, 48 insertions(+), 48 deletions(-) diff --git a/firmware/application/freqman.cpp b/firmware/application/freqman.cpp index 977cd803e..06712567e 100644 --- a/firmware/application/freqman.cpp +++ b/firmware/application/freqman.cpp @@ -47,46 +47,46 @@ options_t freqman_entry_bandwidths[ 4 ] = { }, { //WFM { "200k" , 0 }, - { "180K" , 1 }, - { "40K" , 2 }, + { "180k" , 1 }, + { "40k" , 2 }, } }; options_t freqman_entry_steps = { - { "0.1KHz " , 100 }, - { "1KHz " , 1000 }, - { "5KHz (SA AM)" , 5000 }, - { "6.25KHz(NFM)" , 6250 }, - { "8.33KHz(AIR)" , 8330 }, - { "9KHz (EU AM)" , 9000 }, - { "10KHz(US AM)" , 10000 }, - { "12.5KHz(NFM)" , 12500 }, - { "15KHz (HFM)" , 15000 }, - { "25KHz (N1)" , 25000 }, - { "30KHz (OIRT)" , 30000 }, - { "50KHz (FM1)" , 50000 }, - { "100KHz (FM2)" , 100000 }, - { "250KHz (N2)" , 250000 }, - { "500KHz (WFM)" , 500000 }, + { "0.1kHz " , 100 }, + { "1kHz " , 1000 }, + { "5kHz (SA AM)" , 5000 }, + { "6.25kHz(NFM)" , 6250 }, + { "8.33kHz(AIR)" , 8330 }, + { "9kHz (EU AM)" , 9000 }, + { "10kHz(US AM)" , 10000 }, + { "12.5kHz(NFM)" , 12500 }, + { "15kHz (HFM)" , 15000 }, + { "25kHz (N1)" , 25000 }, + { "30kHz (OIRT)" , 30000 }, + { "50kHz (FM1)" , 50000 }, + { "100kHz (FM2)" , 100000 }, + { "250kHz (N2)" , 250000 }, + { "500kHz (WFM)" , 500000 }, { "1MHz " , 1000000 } }; options_t freqman_entry_steps_short = { - { "0.1KHz" , 100 }, - { "1KHz" , 1000 }, - { "5KHz" , 5000 }, - { "6.25KHz" , 6250 }, - { "8.33KHz" , 8330 }, - { "9KHz" , 9000 }, - { "10KHz" , 10000 }, - { "12.5KHz" , 12500 }, - { "15KHz" , 15000 }, - { "25KHz" , 25000 }, - { "30KHz" , 30000 }, - { "50KHz" , 50000 }, - { "100KHz" , 100000 }, - { "250KHz" , 250000 }, - { "500KHz" , 500000 }, + { "0.1kHz" , 100 }, + { "1kHz" , 1000 }, + { "5kHz" , 5000 }, + { "6.25kHz" , 6250 }, + { "8.33kHz" , 8330 }, + { "9kHz" , 9000 }, + { "10kHz" , 10000 }, + { "12.5kHz" , 12500 }, + { "15kHz" , 15000 }, + { "25kHz" , 25000 }, + { "30kHz" , 30000 }, + { "50kHz" , 50000 }, + { "100kHz" , 100000 }, + { "250kHz" , 250000 }, + { "500kHz" , 500000 }, { "1MHz" , 1000000 } }; diff --git a/firmware/application/freqman.hpp b/firmware/application/freqman.hpp index 5b011f5f3..468873c82 100644 --- a/firmware/application/freqman.hpp +++ b/firmware/application/freqman.hpp @@ -87,7 +87,7 @@ struct freqman_entry { freqman_entry_type type { }; // SINGLE,RANGE,HAMRADIO freqman_index_t modulation { }; // AM,NFM,WFM freqman_index_t bandwidth { }; // AM_DSB, ... - freqman_index_t step { }; // 5Khz (SA AM,... + freqman_index_t step { }; // 5khz (SA AM,... tone_index tone { }; // 0XZ, 11 1ZB,... }; diff --git a/sdcard/FREQMAN/RECON.TXT b/sdcard/FREQMAN/RECON.TXT index 601a376ec..d1008e0a7 100644 --- a/sdcard/FREQMAN/RECON.TXT +++ b/sdcard/FREQMAN/RECON.TXT @@ -1,6 +1,6 @@ -a=150000,b=285000,m=AM,bw=DSB,s=5KHz,d=Longwave broadcast band|BCB (EU) -a=525000,b=1605000,m=AM,bw=DSB,s=5KHz,d=AM broadcast band|BCB (EU & J) -a=530000,b=1710000,m=AM,bw=DSB,s=5KHz,d=AM broadcast band|BCB (US) +a=150000,b=285000,m=AM,bw=DSB,s=5kHz,d=Longwave broadcast band|BCB (EU) +a=525000,b=1605000,m=AM,bw=DSB,s=5kHz,d=AM broadcast band|BCB (EU & J) +a=530000,b=1710000,m=AM,bw=DSB,s=5kHz,d=AM broadcast band|BCB (US) a=1800000,b=29700000,m=WFM,bw=16k,d=Amateur_radio|Amateur a=26900000,b=27400000,m=WFM,bw=16k,d=Citizens_band_radio|Citizens band a=28000000,b=30000000,m=WFM,bw=16k,d=Amateur_radio|Amateur @@ -8,15 +8,15 @@ a=29000000,b=54000000,m=WFM,bw=16k,d=Land mobile a=50000000,b=54000000,m=WFM,bw=16k,d=Amateur_radio|Amateur a=65000000,b=85000000,m=WFM,bw=16k,d=Land mobile (EU) a=108000000,b=136000000,m=WFM,bw=16k,d=Aircraft -a=120000000,b=160000000,m=WFM,bw=16k,s=50KHz,d=Land mobile (EU) -a=132000000,b=174000000,m=WFM,bw=16k,s=50KHz,d=Land mobile -a=142000000,b=170000000,m=WFM,bw=16k,s=50KHz,d=Land mobile (J) -a=144000000,b=148000000,m=WFM,bw=16k,s=50KHz,d=Amateur_radio|Amateur -a=216000000,b=222000000,m=WFM,bw=16k,s=50KHz,d=Land mobile -a=222000000,b=225000000,m=WFM,bw=16k,s=50KHz,d=Amateur_radio|Amateur -a=335000000,b=384000000,m=WFM,bw=16k,s=50KHz,d=Land mobile (J) -a=406000000,b=512000000,m=WFM,bw=16k,s=50KHz,d=Land mobile -a=450000000,b=470000000,m=WFM,bw=16k,s=50KHz,d=Land mobile (J) -a=430000000,b=450000000,m=WFM,bw=16k,s=50KHz,d=Amateur_radio|Amateur -a=806000000,b=947000000,m=WFM,bw=16k,s=50KHz,d=Land mobile -a=1200000000,b=1600000000,m=WFM,bw=16k,s=50KHz,d=Amateur|Land mobile|GPS +a=120000000,b=160000000,m=WFM,bw=16k,s=50kHz,d=Land mobile (EU) +a=132000000,b=174000000,m=WFM,bw=16k,s=50kHz,d=Land mobile +a=142000000,b=170000000,m=WFM,bw=16k,s=50kHz,d=Land mobile (J) +a=144000000,b=148000000,m=WFM,bw=16k,s=50kHz,d=Amateur_radio|Amateur +a=216000000,b=222000000,m=WFM,bw=16k,s=50kHz,d=Land mobile +a=222000000,b=225000000,m=WFM,bw=16k,s=50kHz,d=Amateur_radio|Amateur +a=335000000,b=384000000,m=WFM,bw=16k,s=50kHz,d=Land mobile (J) +a=406000000,b=512000000,m=WFM,bw=16k,s=50kHz,d=Land mobile +a=450000000,b=470000000,m=WFM,bw=16k,s=50kHz,d=Land mobile (J) +a=430000000,b=450000000,m=WFM,bw=16k,s=50kHz,d=Amateur_radio|Amateur +a=806000000,b=947000000,m=WFM,bw=16k,s=50kHz,d=Land mobile +a=1200000000,b=1600000000,m=WFM,bw=16k,s=50kHz,d=Amateur|Land mobile|GPS