Git-Mirrors/portapack-mayhem
1
0
Fork 0
mirror of https://github.com/eried/portapack-mayhem.git synced 2025-06-23 22:34:29 -04:00
Code Issues Projects Releases Packages Wiki Activity

correction of spelling of units

Browse source
This commit is contained in:
Michał Borsuk 2022-01-26 18:06:01 +01:00
parent 0da0431e5e
commit 0d5af740a5
4 changed files with 28 additions and 28 deletions
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());