piotr/edgetx-gx12
1
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

Work on spectrum

Browse Source
This commit is contained in:
3djc
2019-12-07 14:12:17 +01:00
parent c7b70d5ac0
commit 26b892a40a
2 changed files with 16 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
radio/src/gui/colorlcd/radio_setup.cpp
+1
View File
@@ -279,6 +279,7 @@ void RadioSetupPage::build(FormWindow * window)
new Subtitle(window, grid.getLabelSlot(), STR_HAPTIC_LABEL);
grid.nextLine();
// Haptic mode
// Haptic mode
new StaticText(window, grid.getLabelSlot(true), STR_MODE);
new Choice(window, grid.getFieldSlot(), STR_VBEEPMODE, -2, 1, GET_SET_DEFAULT(g_eeGeneral.hapticMode));
radio/src/gui/colorlcd/radio_spectrum_analyser.cpp
+15 -3
View File
@@ -81,6 +81,18 @@ class ScaleWindow: public Window
Window(parent, rect)
{
}
void paint(BitmapBuffer * dc) override
{
/*for (uint32_t frequency =
((reusableBuffer.spectrumAnalyser.freq - reusableBuffer.spectrumAnalyser.span / 2) / 10000000) * 10000000 + 10000000;; frequency += 10000000) {
int offset = frequency - (reusableBuffer.spectrumAnalyser.freq - reusableBuffer.spectrumAnalyser.span / 2);
int x = offset / reusableBuffer.spectrumAnalyser.step;
if ((frequency / 1000000) % 2 == 0) {
//dc->drawNumber(x, 2, frequency / 1000000, FONT(XS) | CENTERED);
}
}*/
}
};
class SpectrumWindow : public Window
@@ -124,9 +136,9 @@ class SpectrumWindow : public Window
break;
dc->drawVerticalLine(x, 0, height(), STASHED, CURVE_AXIS_COLOR);
if ((frequency / 1000000) % 2 == 0) {
/*if ((frequency / 1000000) % 2 == 0) {
dc->drawNumber(x, SCALE_TOP - 2, frequency / 1000000, FONT(XS) | CENTERED);
}
}*/
}
for (uint8_t power = 20;; power += 20) {
@@ -172,8 +184,8 @@ RadioSpectrumAnalyser::RadioSpectrumAnalyser(uint8_t moduleIdx) :
Page(ICON_RADIO_TOOLS),
moduleIdx(moduleIdx)
{
buildBody(&body);
start();
buildBody(&body);
}
void RadioSpectrumAnalyser::buildBody(FormWindow * window)