Git-Mirrors/portapack-mayhem
1
0
Fork 0
mirror of https://github.com/eried/portapack-mayhem.git synced 2025-01-25 22:16:14 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fixed redefined define, possibly overflowing variable, missing constructors

Browse Source
This commit is contained in:
GullCode 2021-01-27 16:30:09 +01:00
parent 19ebf14e8c
commit 42113434f0
2 changed files with 17 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
firmware/application/apps/ui_looking_glass_app.cpp
View File

@ -100,7 +100,7 @@ void GlassView::on_channel_spectrum(const ChannelSpectrum &spectrum)
} }
if (pixel_index) if (pixel_index)
f_center += SEARCH_SLICE_WIDTH; //Move into the next bandwidth slice NOTE: spectrum.sampling_rate = SEARCH_SLICE_WIDTH f_center += LOOKING_GLASS_SLICE_WIDTH; //Move into the next bandwidth slice NOTE: spectrum.sampling_rate = LOOKING_GLASS_SLICE_WIDTH
else else
f_center = f_center_ini; //Start a new sweep f_center = f_center_ini; //Start a new sweep
@ -143,8 +143,8 @@ void GlassView::on_range_changed()
else else
field_marker.set_step(marker_step); //step needs to be a pixel wide. field_marker.set_step(marker_step); //step needs to be a pixel wide.
f_center_ini = f_min + (SEARCH_SLICE_WIDTH / 2); //Initial center frequency for sweep f_center_ini = f_min + (LOOKING_GLASS_SLICE_WIDTH / 2); //Initial center frequency for sweep
f_center_ini += SEARCH_SLICE_WIDTH; //euquiq: Why do I need to move the center ???!!! (shift needed for marker accuracy) f_center_ini += LOOKING_GLASS_SLICE_WIDTH; //euquiq: Why do I need to move the center ???!!! (shift needed for marker accuracy)
PlotMarker(field_marker.value()); //Refresh marker on screen PlotMarker(field_marker.value()); //Refresh marker on screen
@ -153,13 +153,13 @@ void GlassView::on_range_changed()
max_power = 0; max_power = 0;
bins_Hz_size = 0; //reset amount of Hz filled up by pixels bins_Hz_size = 0; //reset amount of Hz filled up by pixels
baseband::set_spectrum(SEARCH_SLICE_WIDTH, field_trigger.value()); baseband::set_spectrum(LOOKING_GLASS_SLICE_WIDTH, field_trigger.value());
receiver_model.set_tuning_frequency(f_center_ini); //tune rx for this slice receiver_model.set_tuning_frequency(f_center_ini); //tune rx for this slice
} }
void GlassView::PlotMarker(rf::Frequency pos) void GlassView::PlotMarker(rf::Frequency fpos)
{ {
pos = pos * MHZ_DIV; int64_t pos = fpos * MHZ_DIV;
pos -= f_min; pos -= f_min;
pos = pos / marker_pixel_step; //Real pixel pos = pos / marker_pixel_step; //Real pixel
@ -240,11 +240,11 @@ GlassView::GlassView(
field_trigger.set_value(32); //Defaults to 32, as normal triggering resolution field_trigger.set_value(32); //Defaults to 32, as normal triggering resolution
field_trigger.on_change = [this](int32_t v) { field_trigger.on_change = [this](int32_t v) {
baseband::set_spectrum(SEARCH_SLICE_WIDTH, v); baseband::set_spectrum(LOOKING_GLASS_SLICE_WIDTH, v);
}; };
display.scroll_set_area( 109, 319); display.scroll_set_area( 109, 319);
baseband::set_spectrum(SEARCH_SLICE_WIDTH, field_trigger.value()); //trigger: baseband::set_spectrum(LOOKING_GLASS_SLICE_WIDTH, field_trigger.value()); //trigger:
// Discord User jteich: WidebandSpectrum::on_message to set the trigger value. In WidebandSpectrum::execute , // Discord User jteich: WidebandSpectrum::on_message to set the trigger value. In WidebandSpectrum::execute ,
// it keeps adding the output of the fft to the buffer until "trigger" number of calls are made, // it keeps adding the output of the fft to the buffer until "trigger" number of calls are made,
//at which time it pushes the buffer up with channel_spectrum.feed //at which time it pushes the buffer up with channel_spectrum.feed
@ -252,8 +252,8 @@ GlassView::GlassView(
on_range_changed(); on_range_changed();
receiver_model.set_modulation(ReceiverModel::Mode::SpectrumAnalysis); receiver_model.set_modulation(ReceiverModel::Mode::SpectrumAnalysis);
receiver_model.set_sampling_rate(SEARCH_SLICE_WIDTH); //20mhz receiver_model.set_sampling_rate(LOOKING_GLASS_SLICE_WIDTH); //20mhz
receiver_model.set_baseband_bandwidth(SEARCH_SLICE_WIDTH); // possible values: 1.75/2.5/3.5/5/5.5/6/7/8/9/10/12/14/15/20/24/28MHz receiver_model.set_baseband_bandwidth(LOOKING_GLASS_SLICE_WIDTH); // possible values: 1.75/2.5/3.5/5/5.5/6/7/8/9/10/12/14/15/20/24/28MHz
receiver_model.set_squelch_level(0); receiver_model.set_squelch_level(0);
receiver_model.enable(); receiver_model.enable();
} }

8
firmware/application/apps/ui_looking_glass_app.hpp
View File

@ -33,7 +33,7 @@
namespace ui namespace ui
{ {
#define SEARCH_SLICE_WIDTH 20000000 // Each slice bandwidth 20 MHz #define LOOKING_GLASS_SLICE_WIDTH 20000000 // Each slice bandwidth 20 MHz
#define MHZ_DIV 1000000 #define MHZ_DIV 1000000
#define X2_MHZ_DIV 2000000 #define X2_MHZ_DIV 2000000
@ -41,6 +41,10 @@
{ {
public: public:
GlassView(NavigationView &nav); GlassView(NavigationView &nav);
GlassView( const GlassView &);
GlassView& operator=(const GlassView &nav);
~GlassView(); ~GlassView();
std::string title() const override { return "Looking Glass"; }; std::string title() const override { return "Looking Glass"; };
@ -77,7 +81,7 @@
rf::Frequency f_center { 0 }; rf::Frequency f_center { 0 };
rf::Frequency f_center_ini { 0 }; rf::Frequency f_center_ini { 0 };
rf::Frequency marker_pixel_step { 0 }; rf::Frequency marker_pixel_step { 0 };
rf::Frequency each_bin_size { SEARCH_SLICE_WIDTH / 240 }; rf::Frequency each_bin_size { LOOKING_GLASS_SLICE_WIDTH / 240 };
rf::Frequency bins_Hz_size { 0 }; rf::Frequency bins_Hz_size { 0 };
uint8_t min_color_power { 0 }; uint8_t min_color_power { 0 };
uint32_t pixel_index { 0 }; uint32_t pixel_index { 0 };