mirror
/
wfview
kopia lustrzana https://gitlab.com/eliggett/wfview
1
0
Forkuj 0
Kod Zgłoszenia Projekty Wydania Wiki Aktywność

Fix spelling errors

merge-requests/7/merge
Daniele Forsi 2022-03-23 15:45:51 +00:00 zatwierdzone przez roeland jansen
rodzic daf94543ac
commit 32f438aa01
20 zmienionych plików z 48 dodań i 48 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

20
CHANGELOG
Wyświetl plik

@ -94,7 +94,7 @@
Added an IF Shift-like control for radios with Twin PBF.
Added support for IF Shift and Twin Pass-Band Filters. Currently
accessable only via the debug button.
accessible only via the debug button.
- 20211104
Added IC-736 FM mode
@ -494,7 +494,7 @@
Just helps keep the UI in sync with changes taking place at the rig. The
polling is slow enough that it doesn't impact anything. But quick enough
that it catches discrepencies pretty quickly.
that it catches discrepancies pretty quickly.
- 20210619
@ -535,7 +535,7 @@
Changed collision detection code so that we can more easily see what
message was missed.
Added collision detection for serial commands. Collisions are aparently
Added collision detection for serial commands. Collisions are apparently
frequent for true 1-wire CI-V radios.
We now calculate polling rates immediately upon receiveCommReady for
@ -689,7 +689,7 @@
- 20210601
Stop deleting audio after last client disconects
Stop deleting audio after last client disconnects
Change udpserver packet handling to be similar to udphandler
@ -807,7 +807,7 @@
Add debugging and fix silly error in audiooutput combobox
reenable audio buffers
re-enable audio buffers
Attempt to fix crash
@ -830,7 +830,7 @@
Fix for stuttering audio on mac
Fixed missing break in switchs.
Fixed missing break in switches.
Typo in message about CI-V
@ -866,7 +866,7 @@
Fixed issue where unknown rigs were identified as 0xff. All rigs are now
identified using rigCaps.modelID, populated with the raw response from
the Rig ID query. Enumerations of known rig types continue to fall into
rigCaps.model, and unknwn rigs will match to rigCaps.model=modelUnknown,
rigCaps.model, and unknown rigs will match to rigCaps.model=modelUnknown,
as before.
Serial baud rate is in the UI now. Added some enable/disable code to
@ -1055,7 +1055,7 @@
Additional bands added, Airband, WFM
added 630/2200m for 705; probably like the 7300 hardly useable for TX though. Also added auomatic switching to the view pane after non-BSR bands are selected
added 630/2200m for 705; probably like the 7300 hardly usable for TX though. Also added auomatic switching to the view pane after non-BSR bands are selected
added 630/2200m to 7300/7610/785x
@ -1131,7 +1131,7 @@
- 20210411 Added ATU feature on 7610.
Now grabs scope state on startup. Found bug, did not fix, in the
frequency parsing code. Worked aroud it by using doubles for now.
frequency parsing code. Worked around it by using doubles for now.
- 20210410 Preamp and attenuator are now queried on startup. Additionally, the
@ -1258,7 +1258,7 @@
S-meter ballistics:
Turned up the speed. Once you see fast meters, there's no going back.
Tested at 5ms without any issues, comitting at 10ms for now. Note that
Tested at 5ms without any issues, committing at 10ms for now. Note that
50ms in the first 'fixed' meter code is the same as 25ms now due to how
the command queue is structured. So 10ms is only a bit faster than
before.

8
README.md
Wyświetl plik

@ -14,7 +14,7 @@ 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.
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 possibilities. 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.
@ -29,16 +29,16 @@ wfview is copyright 2017-2020 Elliott H. Liggett. All rights reserved. wfview so
2. Double-click anywhere on the bandscope or waterfall to tune the radio.
3. Entry of frequency is permitted under the "Frequency" tab. Buttons are provided for touch-screen control
4. Bandscope parameters (span and mode) are adjustable.
5. Full [keyboard](https://gitlab.com/eliggett/wfview/-/wikis/Keystrokes) and mouse control. Operate in whichever way you like. Most radio functions can be operated from a numberic keypad! This also enables those with visual impairments to use the IC-7300.
5. Full [keyboard](https://gitlab.com/eliggett/wfview/-/wikis/Keystrokes) and mouse control. Operate in whichever way you like. Most radio functions can be operated from a numeric keypad! This also enables those with visual impairments to use the IC-7300.
6. 100 user memories stored in plain text on the computer
7. Stylable GUI using CSS
8. pseudo-terminal device, which allows for secondary program to control the radio while wfview is running
9. works for radios that support the ethernet interface with compareable waterfall speeds as on the radio itself.
9. works for radios that support the ethernet interface with comparable waterfall speeds as on the radio itself.
### Build Requirements:
1. gcc / g++ / make
2. qmake
3. qt5 (proably the package named "qt5-default")
3. qt5 (probably the package named "qt5-default")
4. libqt5serialport5-dev
5. libqcustomplot-dev

2
USERMANUAL/wfview-1.0.txt
Wyświetl plik

@ -42,7 +42,7 @@ on/off switch for the scope/waterfall
wf theme
Currently fixed selections how the scope and waterfall look like
with colors. At som epoint we may add the ability to accept the
with colors. At some point we may add the ability to accept the
RGB values like the rig does.

2
audiohandler.cpp
Wyświetl plik

@ -1,5 +1,5 @@
/*
This class handles both RX and TX audio, each is created as a seperate instance of the class
This class handles both RX and TX audio, each is created as a separate instance of the class
but as the setup/handling if output (RX) and input (TX) devices is so similar I have combined them.
*/

2
calibrationwindow.ui
Wyświetl plik

@ -173,7 +173,7 @@
<bool>false</bool>
</property>
<property name="toolTip">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Load the calibration data fromthe indicated slot in the preference file. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Load the calibration data from the indicated slot in the preference file. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
<property name="text">
<string>Load</string>

6
commhandler.cpp
Wyświetl plik

@ -3,7 +3,7 @@
#include <QDebug>
// Copytight 2017-2020 Elliott H. Liggett
// Copyright 2017-2020 Elliott H. Liggett
commHandler::commHandler()
{
@ -182,13 +182,13 @@ void commHandler::receiveDataIn()
if(rolledBack)
{
// qInfo(logSerial()) << "Rolled back and was successfull. Length: " << inPortData.length();
// qInfo(logSerial()) << "Rolled back and was successful. Length: " << inPortData.length();
//printHex(inPortData, false, true);
rolledBack = false;
}
} else {
// did not receive the entire thing so roll back:
// qInfo(logSerial()) << "Rolling back transaction. End not detected. Lenth: " << inPortData.length();
// qInfo(logSerial()) << "Rolling back transaction. End not detected. Length: " << inPortData.length();
//printHex(inPortData, false, true);
port->rollbackTransaction();
rolledBack = true;

2
freqmemory.cpp
Wyświetl plik

@ -1,7 +1,7 @@
#include "freqmemory.h"
#include "logcategories.h"
// Copytight 2017-2020 Elliott H. Liggett
// Copyright 2017-2020 Elliott H. Liggett
freqMemory::freqMemory()
{

2
main.cpp
Wyświetl plik

@ -3,7 +3,7 @@
#include "wfmain.h"
#include "logcategories.h"
// Copytight 2017-2021 Elliott H. Liggett
// Copyright 2017-2021 Elliott H. Liggett
// Smart pointer to log file
QScopedPointer<QFile> m_logFile;

4
meter.cpp
Wyświetl plik

@ -51,7 +51,7 @@ meter::meter(QWidget *parent) : QWidget(parent)
void meter::clearMeterOnPTTtoggle()
{
// When a meter changes type, such as the fixed S -- TxPo meter,
// there is automatic clearing. However, some meters do not switch on thier own,
// there is automatic clearing. However, some meters do not switch on their own,
// and thus we are providing this clearing method. We are careful
// not to clear meters that don't make sense to clear (such as Vd and Id)
@ -110,7 +110,7 @@ void meter::paintEvent(QPaintEvent *)
{
QPainter painter(this);
// This next line sets up a canvis within the
// space of the widget, and gives it corrdinates.
// space of the widget, and gives it coordinates.
// The end effect, is that the drawing functions will all
// scale to the window size.
painter.setRenderHint(QPainter::SmoothPixmapTransform);

4
pttyhandler.cpp
Wyświetl plik

@ -245,14 +245,14 @@ void pttyHandler::receiveDataIn(int fd) {
if (rolledBack)
{
// qInfo(logSerial()) << "Rolled back and was successfull. Length: " << inPortData.length();
// qInfo(logSerial()) << "Rolled back and was successful. Length: " << inPortData.length();
//printHex(inPortData, false, true);
rolledBack = false;
}
}
else {
// did not receive the entire thing so roll back:
// qInfo(logSerial()) << "Rolling back transaction. End not detected. Lenth: " << inPortData.length();
// qInfo(logSerial()) << "Rolling back transaction. End not detected. Length: " << inPortData.length();
//printHex(inPortData, false, true);
rolledBack = true;
#ifdef Q_OS_WIN

2
pttyhandler.h
Wyświetl plik

@ -62,7 +62,7 @@ private:
bool rolledBack;
int ptfd; // pseudo-terminal file desc.
int ptKeepAlive=0; // Used to keep the pty alive after client disconects.
int ptKeepAlive=0; // Used to keep the pty alive after client disconnects.
bool havePt;
QString ptDevSlave;

2
repeatersetup.cpp
Wyświetl plik

@ -25,7 +25,7 @@ repeaterSetup::repeaterSetup(QWidget *parent) :
repeaterSetup::~repeaterSetup()
{
// Trying this for more consistant destruction
// Trying this for more consistent destruction
rig.inputs.clear();
rig.preamps.clear();
rig.attenuators.clear();

2
resampler/resample.c
Wyświetl plik

@ -104,7 +104,7 @@ static void speex_free(void* ptr) { free(ptr); }
#include "resample_neon.h"
#endif
/* Numer of elements to allocate on the stack */
/* Number of elements to allocate on the stack */
#ifdef VAR_ARRAYS
#define FIXED_STACK_ALLOC 8192
#else

6
rigcommander.cpp
Wyświetl plik

@ -4,7 +4,7 @@
#include "rigidentities.h"
#include "logcategories.h"
// Copytight 2017-2020 Elliott H. Liggett
// Copyright 2017-2020 Elliott H. Liggett
// This file parses data from the radio and also forms commands to the radio.
// The radio physical interface is handled by the commHandler() instance "comm"
@ -3730,7 +3730,7 @@ void rigCommander::parseSpectrum()
spectrumEndFreq = fEnd.MHzDouble;
if(scopeMode == spectModeCenter)
{
// "center" mode, start is actuall center, end is bandwidth.
// "center" mode, start is actual center, end is bandwidth.
spectrumStartFreq -= spectrumEndFreq;
spectrumEndFreq = spectrumStartFreq + 2*(spectrumEndFreq);
// emit haveSpectrumCenterSpan(span);
@ -4029,7 +4029,7 @@ void rigCommander::getPreamp()
void rigCommander::getAntenna()
{
// This one might neet some thought
// This one might need some thought
// as it seems each antenna has to be checked.
// Maybe 0x12 alone will do it.
QByteArray payload("\x12");

2
rigidentities.cpp
Wyświetl plik

@ -1,7 +1,7 @@
#include "rigidentities.h"
#include "logcategories.h"
// Copytight 2017-2021 Elliott H. Liggett
// Copyright 2017-2021 Elliott H. Liggett
model_kind determineRadioModel(unsigned char rigID)
{

6
ring/ring.h
Wyświetl plik

@ -52,11 +52,11 @@ namespace wilt
// The class works by allocating the array and storing two pointers (for the
// beginning and end of the allocated space). Two atomic pointers are used to
// track the beginning and end of the currently used storage space. To
// facilitate concurrent reads and writes, theres a read buffer pointer before
// facilitate concurrent reads and writes, there's a read buffer pointer before
// the read pointer for data currently being read, and a corresponding write
// buffer pointer beyond the write pointer for data currently being written.
// These buffer pointers cannot overlap. Just using these pointers suffer from
// some minute inefficiencies and a few ABA problems. Therfore, atomic
// some minute inefficiencies and a few ABA problems. Therefore, atomic
// integers are used to store the currently used and currently free sizes.
//
// It allows multiple readers and multiple writers by implementing a reserve-
@ -71,7 +71,7 @@ namespace wilt
// done yet, the reader must wait until the read buffer pointer points to
// where the read started. Only, then is the read buffer pointer updated, and
// the free size increased. So while this implementation is lock-free, it is
// not wait-free. This same principle works the same when writing (ammended
// not wait-free. This same principle works the same when writing (amended
// for the appropriate pointers).
//
// If two readers try to read at the same time and there is only enough data

2
udphandler.cpp
Wyświetl plik

@ -550,7 +550,7 @@ udpCivData::udpCivData(QHostAddress local, QHostAddress ip, quint16 civPort)
// Start sending are you there packets - will be stopped once "I am here" received
// send ping packets every 100 ms (maybe change to less frequent?)
pingTimer->start(PING_PERIOD);
// Send idle packets every 100ms, this timer will be reset everytime a non-idle packet is sent.
// Send idle packets every 100ms, this timer will be reset every time a non-idle packet is sent.
idleTimer->start(IDLE_PERIOD);
areYouThereTimer->start(AREYOUTHERE_PERIOD);
}

2
udpserversetup.ui
Wyświetl plik

@ -139,7 +139,7 @@
</size>
</property>
<property name="text">
<string>Contol Port</string>
<string>Control Port</string>
</property>
</widget>
</item>

12
wfmain.cpp
Wyświetl plik

@ -2449,7 +2449,7 @@ void wfmain:: getInitialRigState()
// These are made when the program starts up
// and are used to adjust the UI to match the radio settings
// the polling interval is set at 200ms. Faster is possible but slower
// computers will glitch occassionally.
// computers will glitch occasionally.
issueDelayedCommand(cmdGetFreq);
issueDelayedCommand(cmdGetMode);
@ -3316,7 +3316,7 @@ void wfmain::receiveRigID(rigCapabilities rigCaps)
ui->antennaSelCombo->setDisabled(false);
for(unsigned int i=0; i < rigCaps.antennas.size(); i++)
{
inName = QString("%1").arg(rigCaps.antennas.at(i)+1, 0, 16); // adding 1 to have the combobox start with ant 1 insted of 0
inName = QString("%1").arg(rigCaps.antennas.at(i)+1, 0, 16); // adding 1 to have the combobox start with ant 1 instead of 0
ui->antennaSelCombo->addItem(inName, rigCaps.antennas.at(i));
}
} else {
@ -3447,7 +3447,7 @@ void wfmain::insertSlowPeriodicCommand(cmds cmd, unsigned char priority)
{
// TODO: meaningful priority
// These commands are run every 20 "ticks" of the primary radio command loop
// Basically 20 times less often than the standard peridic command
// Basically 20 times less often than the standard periodic command
if(priority < 10)
{
slowPollCmdQueue.push_front(cmd);
@ -4007,7 +4007,7 @@ void wfmain::changeMode(mode_kind mode, bool dataOn)
void wfmain::on_modeSelectCombo_activated(int index)
{
// The "acticvated" signal means the user initiated a mode change.
// This function is not called if code initated the change.
// This function is not called if code initiated the change.
mode_info mode;
unsigned char newMode = static_cast<unsigned char>(ui->modeSelectCombo->itemData(index).toUInt());
@ -4110,7 +4110,7 @@ void wfmain::on_freqDial_valueChanged(int value)
}
// With the number of steps and direction of steps established,
// we can now adjust the frequeny:
// we can now adjust the frequency:
f.Hz = roundFrequencyWithStep(freq.Hz, delta, tsKnobHz);
f.MHzDouble = f.Hz / (double)1E6;
@ -4809,7 +4809,7 @@ void wfmain::setRadioTimeDatePrep()
int msecdelay = QTime::currentTime().msecsTo( QTime::currentTime().addSecs(60-second) );
// 3: Compute time and date at one minute later
QDateTime setpoint = now.addMSecs(msecdelay); // at HMS or posibly HMS + some ms. Never under though.
QDateTime setpoint = now.addMSecs(msecdelay); // at HMS or possibly HMS + some ms. Never under though.
// 4: Prepare data structs for the time at one minute later
timesetpoint.hours = (unsigned char)setpoint.time().hour();

8
wfmain.ui
Wyświetl plik

@ -108,7 +108,7 @@
<item>
<widget class="QPushButton" name="toFixedBtn">
<property name="toolTip">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Press button to convert center mode spectrum to fixed mode, preserving the range. This allows you to tune without the spectrum moving, in the same currently-visible range that you see now. &lt;/p&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;p&gt;The currently-selected edge slot will be overriden.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Press button to convert center mode spectrum to fixed mode, preserving the range. This allows you to tune without the spectrum moving, in the same currently-visible range that you see now. &lt;/p&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;p&gt;The currently-selected edge slot will be overridden.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
<property name="text">
<string>ToFixed</string>
@ -148,7 +148,7 @@
<string>Waterfall display color theme</string>
</property>
<property name="accessibleDescription">
<string>Selects the theme for the color waterfall dispaly</string>
<string>Selects the theme for the color waterfall display</string>
</property>
</widget>
</item>
@ -2163,7 +2163,7 @@
</size>
</property>
<property name="toolTip">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Enter the address in as hexidecimal, without any prefix, just as the radio presents the address in the menu. &lt;/p&gt;&lt;p&gt;Here are some common examples:&lt;/p&gt;
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Enter the address in as hexadecimal, without any prefix, just as the radio presents the address in the menu. &lt;/p&gt;&lt;p&gt;Here are some common examples:&lt;/p&gt;
&lt;p&gt;IC-706: 58
&lt;br/&gt;IC-756: 50
&lt;br/&gt;IC-756 Pro: 5C
@ -3099,7 +3099,7 @@
</size>
</property>
<property name="text">
<string>Contol Port</string>
<string>Control Port</string>
</property>
</widget>
</item>