TheArchive/mayhem-firmware
1
0
Fork 0
mirror of https://github.com/portapack-mayhem/mayhem-firmware.git synced 2025-06-03 14:38:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #479 from MichalLeonBorsuk/next

Browse Source 
Some frequencies were shitfed by a few kHz
This commit is contained in:
Erwin Ried 2022-01-27 20:02:12 +01:00 committed by GitHub
commit 799a701fc3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 57 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
firmware/application/apps/capture_app.cpp
View File

@ -75,8 +75,8 @@ CaptureAppView::CaptureAppView(NavigationView& nav) {
option_bandwidth.on_change = [this](size_t, uint32_t base_rate) { option_bandwidth.on_change = [this](size_t, uint32_t base_rate) {
sampling_rate = 8 * base_rate; // Decimation by 8 done on baseband side sampling_rate = 8 * base_rate; // Decimation by 8 done on baseband side
/* base_rate is used for FFT calculation and display LCD, and also in recording writing SD Card rate. */ /* base_rate is used for FFT calculation and display LCD, and also in recording writing SD Card rate. */
/* ex. sampling_rate values, 4Mhz, when recording 500 khz (BW) and fs 8 Mhz , when selected 1 Mhz BW ...*/ /* ex. sampling_rate values, 4Mhz, when recording 500 kHz (BW) and fs 8 Mhz , when selected 1 Mhz BW ...*/
/* ex. recording 500khz BW to .C16 file, base_rate clock 500khz x2(I,Q) x 2 bytes (int signed) =2MB/sec rate SD Card */ /* ex. recording 500kHz BW to .C16 file, base_rate clock 500kHz x2(I,Q) x 2 bytes (int signed) =2MB/sec rate SD Card */
waterfall.on_hide(); waterfall.on_hide();
record_view.set_sampling_rate(sampling_rate); record_view.set_sampling_rate(sampling_rate);
@ -85,12 +85,12 @@ CaptureAppView::CaptureAppView(NavigationView& nav) {
switch(sampling_rate) { // we use the var fs (sampling_rate) , to set up BPF aprox < fs_max/2 by Nyquist theorem. switch(sampling_rate) { // we use the var fs (sampling_rate) , to set up BPF aprox < fs_max/2 by Nyquist theorem.
case 0 ... 2000000: // BW Captured range (0 <= 250Khz max ) fs = 8 x 250 Khz case 0 ... 2000000: // BW Captured range (0 <= 250kHz max ) fs = 8 x 250 kHz
anti_alias_baseband_bandwidth_filter = 1750000; // Minimum BPF MAX2837 for all those lower BW options. anti_alias_baseband_bandwidth_filter = 1750000; // Minimum BPF MAX2837 for all those lower BW options.
break; break;
case 4000000 ... 6000000: // BW capture range (500k ... 750Khz max ) fs_max = 8 x 750Khz = 6Mhz case 4000000 ... 6000000: // BW capture range (500k ... 750kHz max ) fs_max = 8 x 750kHz = 6Mhz
// BW 500k ... 750khz , ex. 500khz (fs = 8*BW = 4Mhz) , BW 600Khz (fs = 4,8Mhz) , BW 750 Khz (fs = 6Mhz) // BW 500k ... 750kHz , ex. 500kHz (fs = 8*BW = 4Mhz) , BW 600kHz (fs = 4,8Mhz) , BW 750 kHz (fs = 6Mhz)
anti_alias_baseband_bandwidth_filter = 2500000; // in some IC MAX2837 appear 2250000 , but both works similar. anti_alias_baseband_bandwidth_filter = 2500000; // in some IC MAX2837 appear 2250000 , but both works similar.
break; break;
@ -123,7 +123,7 @@ CaptureAppView::CaptureAppView(NavigationView& nav) {
waterfall.on_show(); waterfall.on_show();
}; };
option_bandwidth.set_selected_index(7); // 500k, Preselected starting default option 500khz option_bandwidth.set_selected_index(7); // 500k, Preselected starting default option 500kHz
receiver_model.set_modulation(ReceiverModel::Mode::Capture); receiver_model.set_modulation(ReceiverModel::Mode::Capture);
receiver_model.enable(); receiver_model.enable();

22
firmware/application/apps/ui_scanner.hpp
View File

@ -242,16 +242,16 @@ private:
{ 17 * 8, (26 * 8) + 4 }, { 17 * 8, (26 * 8) + 4 },
12, 12,
{ {
{ "5Khz (SA AM)", 5000 }, { "5kHz (SA AM)", 5000 },
{ "9Khz (EU AM)", 9000 }, { "9kHz (EU AM)", 9000 },
{ "10Khz(US AM)", 10000 }, { "10kHz(US AM)", 10000 },
{ "50Khz (FM1)", 50000 }, { "50kHz (FM1)", 50000 },
{ "100Khz(FM2)", 100000 }, { "100kHz(FM2)", 100000 },
{ "6.25khz(NFM)", 6250 }, { "6.25kHz(NFM)", 6250 },
{ "12.5khz(NFM)", 12500 }, { "12.5kHz(NFM)", 12500 },
{ "25khz (N1)", 25000 }, { "25kHz (N1)", 25000 },
{ "250khz (N2)", 250000 }, { "250kHz (N2)", 250000 },
{ "8.33khz(AIR)", 8330 } { "8.33kHz(AIR)", 8330 }
} }
}; };
@ -308,4 +308,4 @@ private:
}; };
}; };
} /* namespace ui */ } /* namespace ui */

18
firmware/application/freqman.hpp
View File

@ -51,15 +51,15 @@ enum freqman_entry_type {
//Entry step placed for AlainD freqman version (or any other enhanced version) //Entry step placed for AlainD freqman version (or any other enhanced version)
enum freqman_entry_step { enum freqman_entry_step {
STEP_DEF = 0, // default STEP_DEF = 0, // default
AM_US, // 10 Khz AM/CB AM_US, // 10 kHz AM/CB
AM_EUR, // 9 Khz LW/MW AM_EUR, // 9 kHz LW/MW
NFM_1, // 12,5 Khz (Analogic PMR 446) NFM_1, // 12,5 kHz (Analogic PMR 446)
NFM_2, // 6,25 Khz (Digital PMR 446) NFM_2, // 6,25 kHz (Digital PMR 446)
FM_1, // 100 Khz FM_1, // 100 kHz
FM_2, // 50 Khz FM_2, // 50 kHz
N_1, // 25 Khz N_1, // 25 kHz
N_2, // 250 Khz N_2, // 250 kHz
AIRBAND, // AIRBAND 8,33 Khz AIRBAND, // AIRBAND 8,33 kHz
ERROR_STEP ERROR_STEP
}; };

4
firmware/application/ui_record_view.cpp
View File

@ -99,13 +99,13 @@ void RecordView::focus() {
void RecordView::set_sampling_rate(const size_t new_sampling_rate) { void RecordView::set_sampling_rate(const size_t new_sampling_rate) {
/* We are changing "REC" icon background to yellow in BW rec Options >600Khz /* We are changing "REC" icon background to yellow in BW rec Options >600kHz
where we are NOT recording full IQ .C16 files (recorded files are decimated ones). where we are NOT recording full IQ .C16 files (recorded files are decimated ones).
Those decimated recorded files,has not the full IQ samples . Those decimated recorded files,has not the full IQ samples .
are ok as recorded spectrum indication, but they should not be used by Replay app. are ok as recorded spectrum indication, but they should not be used by Replay app.
We keep original black background in all the correct IQ .C16 files BW's Options */ We keep original black background in all the correct IQ .C16 files BW's Options */
if (new_sampling_rate > 4800000) { // > BW >600Khz (fs=8*BW), (750Khz ...2750Khz) if (new_sampling_rate > 4800000) { // > BW >600kHz (fs=8*BW), (750kHz ...2750kHz)
button_record.set_background(ui::Color::yellow()); button_record.set_background(ui::Color::yellow());
} else { } else {
button_record.set_background(ui::Color::black()); button_record.set_background(ui::Color::black());

58
sdcard/FREQMAN/DABPLUS.TXT
View File

@ -1,41 +1,41 @@
f=174928000,d=Channel 5A f=174928000,d=Channel 5A
f=176648000,d=Channel 5B f=176640000,d=Channel 5B
f=178358000,d=Channel 5C f=178352000,d=Channel 5C
f=180068000,d=Channel 5D f=180064000,d=Channel 5D
f=181938000,d=Channel 6A f=181936000,d=Channel 6A
f=183648000,d=Channel 6B f=183648000,d=Channel 6B
f=185368000,d=Channel 6C f=185360000,d=Channel 6C
f=187078000,d=Channel 6D f=187072000,d=Channel 6D
f=188928000,d=Channel 7A f=188928000,d=Channel 7A
f=190648000,d=Channel 7B f=190640000,d=Channel 7B
f=192358000,d=Channel 7C f=192352000,d=Channel 7C
f=194068000,d=Channel 7D f=194064000,d=Channel 7D
f=195938000,d=Channel 8A f=195936000,d=Channel 8A
f=197648000,d=Channel 8B f=197648000,d=Channel 8B
f=199368000,d=Channel 8C f=199360000,d=Channel 8C
f=201078000,d=Channel 8D f=201072000,d=Channel 8D
f=202928000,d=Channel 9A f=202928000,d=Channel 9A
f=204648000,d=Channel 9B f=204640000,d=Channel 9B
f=206358000,d=Channel 9C f=206352000,d=Channel 9C
f=208068000,d=Channel 9D f=208064000,d=Channel 9D
f=209938000,d=Channel 10A f=209936000,d=Channel 10A
f=210096000,d=Channel 10N f=210096000,d=Channel 10N
f=211648000,d=Channel 10B f=211648000,d=Channel 10B
f=213368000,d=Channel 10C f=213360000,d=Channel 10C
f=215078000,d=Channel 10D f=215072000,d=Channel 10D
f=216928000,d=Channel 11A f=216928000,d=Channel 11A
f=217088000,d=Channel 11N f=217088000,d=Channel 11N
f=218648000,d=Channel 11B f=218640000,d=Channel 11B
f=220358000,d=Channel 11C f=220352000,d=Channel 11C
f=222068000,d=Channel 11D f=222064000,d=Channel 11D
f=223938000,d=Channel 12A f=223936000,d=Channel 12A
f=224096000,d=Channel 12N f=224096000,d=Channel 12N
f=225648000,d=Channel 12B f=225648000,d=Channel 12B
f=227368000,d=Channel 12C f=227360000,d=Channel 12C
f=229078000,d=Channel 12D f=229072000,d=Channel 12D
f=230788000,d=Channel 13A f=230784000,d=Channel 13A
f=232498000,d=Channel 13B f=232496000,d=Channel 13B
f=234208000,d=Channel 13C f=234208000,d=Channel 13C
f=235778000,d=Channel 13D f=235776000,d=Channel 13D
f=237448000,d=Channel 13E f=237488000,d=Channel 13E
f=239208000,d=Channel 13F f=239200000,d=Channel 13F