Merge branch 'ui-enhance' into lan-alpha

merge-requests/3/head
Phil Taylor 2021-05-03 20:11:43 +01:00
commit 3715f276cd
4 zmienionych plików z 30 dodań i 7 usunięć

Wyświetl plik

@ -9,6 +9,9 @@ sudo apt-get install qt5-default
sudo apt-get install libqt5core5a
sudo apt-get install qtbase5-dev
sudo apt-get install libqt5serialport5 libqt5serialport5-dev
sudo apt-get install libqt5multimedia5
sudo apt-get install libqt5multimedia5-plugins
sudo apt-get install qtmultimedia5-dev
sudo apt-get install git
~~~
Now you need to install qcustomplot. There are two versions that are commonly found in linux distros: 1.3 and 2.0. Either will work fine. If you are not sure which version your linux install comes with, simply run both commands. One will work and the other will fail, and that's fine!
@ -53,9 +56,11 @@ if you are using the wireless 705 or any networked rig like the 7610, 7800, 785x
sudo chown $USER /dev/ttyUSB*
- most linux systems just need to have you added to the dialout group as that's persistent and more secure.
Note, on most linux systems, you just need to add your user to the dialout group, which is persistent and more secure:
~~~
sudo usermod -aG dialout $USER
~~~
(don't forget to log out and log in)
~~~

Wyświetl plik

@ -3,6 +3,7 @@
[wfview](https://gitlab.com/eliggett/wfview) is an open-source front-end application for the
- [Icom IC-705 ](https://www.icomamerica.com/en/products/amateur/hf/705/default.aspx) HF portable SDR Amateur Radio
- [Icom IC-7300](https://www.icomamerica.com/en/products/amateur/hf/7300/default.aspx) HF SDR Amateur Radio
- [Icom IC-7610](https://www.icomamerica.com/en/products/amateur/hf/7610/default.aspx) HF SDR Amateur Radio
- [Icom IC-7850](https://www.icomamerica.com/en/products/amateur/hf/7850/default.aspx) HF Hybrid SDR Amateur Radio
@ -11,6 +12,8 @@
Other models to be tested/added (including the IC-705)..
website - [WFVIEW](https://wfview.org/) wfview.org
wfview supports viewing the spectrum display waterfall and most normal radio controls. Using wfview, the radio can be operated using the mouse, or just the keyboard (great for those with visual impairments), or even a touch screen display. The gorgous waterfall spectrum can be displayed on a monitor of any size, and can even projected onto a wall for a presentation. Even a VNC session can make use of wfview for interesting remote rig posibilities. wfview runs on humble hardware, ranging from the $35 Raspberry Pi, to laptops, to desktops. wfview is designed to run on GNU Linux, but can probably be adapted to run on other operating systems. In fact we do have working example in windows as well.
@ -40,7 +43,7 @@ wfview is copyright 2017-2020 Elliott H. Liggett. All rights reserved. wfview so
5. libqcustomplot-dev
### Recommended:
* Debian-based Linux system (Debian Linux, Linux Mint, Ubuntu, etc). Any recent Linux system will do though!
* Debian-based Linux system (Debian Linux, Linux Mint, Ubuntu, etc) or opensuse 15.x. Any recent Linux system will do though!
* QT Creator for building, designing, and debugging w/gdb
### Build directions:

Wyświetl plik

@ -2873,6 +2873,7 @@ void rigCommander::parseSpectrum()
spectrumEndFreq = spectrumStartFreq + 2*(spectrumEndFreq);
// emit haveSpectrumCenterSpan(span);
}
if (payloadIn.length() > 400) // Must be a LAN packet.
{
payloadIn.chop(1);
@ -3100,7 +3101,7 @@ freqt rigCommander::parseFrequency(QByteArray data, unsigned char lastPosition)
freqs.Hz += (data[lastPosition-3] & 0x0f) * 1; // 1 Hz
freqs.Hz += ((data[lastPosition-3] & 0xf0) >> 4) * 10; // 10 Hz
freqs.MHzDouble = (double)freq;
freqs.MHzDouble = (double)(freqs.Hz / 1000000.0);
return freqs;
}

Wyświetl plik

@ -2391,6 +2391,9 @@ void wfmain::handlePlotDoubleClick(QMouseEvent *me)
//y = plot->yAxis->pixelToCoord(me->pos().y());
x = plot->xAxis->pixelToCoord(me->pos().x());
freq.Hz = x*1E6;
freq.Hz = roundFrequency(freq.Hz, tsWfScrollHz);
emit setFrequency(freq);
issueDelayedCommand(cmdGetFreq);
showStatusBarText(QString("Going to %1 MHz").arg(x));
@ -2409,6 +2412,9 @@ void wfmain::handleWFDoubleClick(QMouseEvent *me)
{
x = plot->xAxis->pixelToCoord(me->pos().x());
freq.Hz = x*1E6;
freq.Hz = roundFrequency(freq.Hz, tsWfScrollHz);
emit setFrequency(freq);
issueDelayedCommand(cmdGetFreq);
showStatusBarText(QString("Going to %1 MHz").arg(x));
@ -2848,13 +2854,21 @@ void wfmain::on_freqDial_valueChanged(int value)
f.Hz = roundFrequencyWithStep(freq.Hz, delta, tsKnobHz);
f.MHzDouble = f.Hz / (double)1E6;
freq = f;
if(f.Hz > 0)
{
freq = f;
oldFreqDialVal = value;
oldFreqDialVal = value;
ui->freqLabel->setText(QString("%1").arg(f.MHzDouble, 0, 'f'));
ui->freqLabel->setText(QString("%1").arg(f.MHzDouble, 0, 'f'));
emit setFrequency(f);
emit setFrequency(f);
} else {
ui->freqDial->blockSignals(true);
ui->freqDial->setValue(oldFreqDialVal);
ui->freqDial->blockSignals(false);
return;
}
}
void wfmain::receiveBandStackReg(float freq, char mode, bool dataOn)