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

Adding code to support a separate repeater setup window.

merge-requests/2/head
Elliott Liggett 2021-03-30 23:37:35 -07:00
rodzic 09b88c548f
commit 864b2f491a
9 zmienionych plików z 310 dodań i 15 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

15
repeaterattributes.h 100644
Wyświetl plik

@ -0,0 +1,15 @@
#ifndef REPEATERATTRIBUTES_H
#define REPEATERATTRIBUTES_H
enum duplexMode {
dmSplitOff=0x00,
dmSplitOn=0x01,
dmSimplex=0x10,
dmDupMinus=0x11,
dmDupPlus=0x12,
dmDupRPS=0x13,
dmDupAutoOn=0x26,
dmDupAutoOff=0x36
};
#endif // REPEATERATTRIBUTES_H

14
repeatersetup.cpp 100644
Wyświetl plik

@ -0,0 +1,14 @@
#include "repeatersetup.h"
#include "ui_repeatersetup.h"
repeaterSetup::repeaterSetup(QWidget *parent) :
QMainWindow(parent),
ui(new Ui::repeaterSetup)
{
ui->setupUi(this);
}
repeaterSetup::~repeaterSetup()
{
delete ui;
}

24
repeatersetup.h 100644
Wyświetl plik

@ -0,0 +1,24 @@
#ifndef REPEATERSETUP_H
#define REPEATERSETUP_H
#include <QMainWindow>
#include "repeaterattributes.h"
namespace Ui {
class repeaterSetup;
}
class repeaterSetup : public QMainWindow
{
Q_OBJECT
public:
explicit repeaterSetup(QWidget *parent = 0);
~repeaterSetup();
private:
Ui::repeaterSetup *ui;
};
#endif // REPEATERSETUP_H

230
repeatersetup.ui 100644
Wyświetl plik

@ -0,0 +1,230 @@
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
<class>repeaterSetup</class>
<widget class="QMainWindow" name="repeaterSetup">
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>800</width>
<height>217</height>
</rect>
</property>
<property name="windowTitle">
<string>Repeater Setup</string>
</property>
<widget class="QWidget" name="centralwidget">
<layout class="QVBoxLayout" name="verticalLayout_2">
<item>
<spacer name="verticalSpacer">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>40</height>
</size>
</property>
</spacer>
</item>
<item>
<layout class="QHBoxLayout" name="horizontalLayout_5">
<property name="topMargin">
<number>0</number>
</property>
<item>
<widget class="QPushButton" name="rptReadRigBtn">
<property name="text">
<string>Read Current Settings</string>
</property>
</widget>
</item>
<item>
<spacer name="horizontalSpacer">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
</layout>
</item>
<item>
<layout class="QHBoxLayout" name="horizontalLayout">
<property name="leftMargin">
<number>0</number>
</property>
<property name="topMargin">
<number>0</number>
</property>
<item>
<widget class="QGroupBox" name="groupBox">
<property name="title">
<string>Repeater Duplex</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout">
<item>
<widget class="QRadioButton" name="rptSimplexBtn">
<property name="text">
<string>Simplex</string>
</property>
<attribute name="buttonGroup">
<string notr="true">rptDuplexBtns</string>
</attribute>
</widget>
</item>
<item>
<widget class="QRadioButton" name="rptDupPlusBtn">
<property name="text">
<string>Dup+</string>
</property>
<attribute name="buttonGroup">
<string notr="true">rptDuplexBtns</string>
</attribute>
</widget>
</item>
<item>
<widget class="QRadioButton" name="rptDupMinusBtn">
<property name="text">
<string>Dup-</string>
</property>
<attribute name="buttonGroup">
<string notr="true">rptDuplexBtns</string>
</attribute>
</widget>
</item>
<item>
<widget class="QRadioButton" name="rptAutoBtn">
<property name="text">
<string>Auto</string>
</property>
<attribute name="buttonGroup">
<string notr="true">rptDuplexBtns</string>
</attribute>
</widget>
</item>
</layout>
</widget>
</item>
<item>
<widget class="QGroupBox" name="groupBox_2">
<property name="title">
<string>Repeater Tone Type</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout_3">
<item>
<widget class="QRadioButton" name="radioButton">
<property name="text">
<string>None</string>
</property>
<attribute name="buttonGroup">
<string notr="true">rptToneBtns</string>
</attribute>
</widget>
</item>
<item>
<widget class="QRadioButton" name="radioButton_2">
<property name="text">
<string>Transmit Tone only</string>
</property>
<attribute name="buttonGroup">
<string notr="true">rptToneBtns</string>
</attribute>
</widget>
</item>
<item>
<widget class="QRadioButton" name="radioButton_3">
<property name="text">
<string>Tone Squelch</string>
</property>
<attribute name="buttonGroup">
<string notr="true">rptToneBtns</string>
</attribute>
</widget>
</item>
<item>
<widget class="QRadioButton" name="radioButton_4">
<property name="text">
<string>DTCS</string>
</property>
<attribute name="buttonGroup">
<string notr="true">rptToneBtns</string>
</attribute>
</widget>
</item>
</layout>
</widget>
</item>
<item>
<widget class="QGroupBox" name="groupBox_3">
<property name="title">
<string>Tone Selection</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout_4">
<item>
<layout class="QHBoxLayout" name="horizontalLayout_2">
<item>
<widget class="QLabel" name="label">
<property name="text">
<string>Tone</string>
</property>
</widget>
</item>
<item>
<widget class="QComboBox" name="rptToneCombo"/>
</item>
</layout>
</item>
<item>
<layout class="QHBoxLayout" name="horizontalLayout_3">
<item>
<widget class="QLabel" name="label_2">
<property name="text">
<string>DTCS</string>
</property>
</widget>
</item>
<item>
<widget class="QComboBox" name="rptDTCSCombo"/>
</item>
</layout>
</item>
<item>
<layout class="QHBoxLayout" name="horizontalLayout_4">
<item>
<widget class="QCheckBox" name="rptDTCSInvertTx">
<property name="text">
<string>Invert Tx</string>
</property>
</widget>
</item>
<item>
<widget class="QCheckBox" name="rptDTCSInvertRx">
<property name="text">
<string>Invert Rx</string>
</property>
</widget>
</item>
</layout>
</item>
</layout>
</widget>
</item>
</layout>
</item>
</layout>
</widget>
</widget>
<resources/>
<connections/>
<buttongroups>
<buttongroup name="rptDuplexBtns"/>
<buttongroup name="rptToneBtns"/>
</buttongroups>
</ui>

12
rigcommander.h
Wyświetl plik

@ -8,6 +8,7 @@
#include "pttyhandler.h"
#include "udphandler.h"
#include "rigidentities.h"
#include "repeaterattributes.h"
// This file figures out what to send to the comm and also
// parses returns into useful things.
@ -16,17 +17,6 @@
// note: using a define because switch case doesn't even work with const unsigned char. Surprised me.
#define compCivAddr 0xE1
enum duplexMode {
dmSplitOff=0x00,
dmSplitOn=0x01,
dmSimplex=0x10,
dmDupMinus=0x11,
dmDupPlus=0x12,
dmDupRPS=0x13,
dmDupAutoOn=0x26,
dmDupAutoOff=0x36
};
enum meterKind {
meterS,
meterSWR,

6
wfmain.cpp
Wyświetl plik

@ -25,6 +25,7 @@ wfmain::wfmain(const QString serialPortCL, const QString hostCL, QWidget *parent
this->hostCL = hostCL;
cal = new calibrationWindow();
rpt = new repeaterSetup();
sat = new satelliteSetup();
srv = new udpServerSetup();
@ -3623,6 +3624,11 @@ void wfmain::on_serialDeviceListCombo_activated(const QString &arg1)
ui->serialEnableBtn->setChecked(true);
}
void wfmain::on_rptSetupBtn_clicked()
{
rpt->show();
}
// --- DEBUG FUNCTION ---
void wfmain::on_debugBtn_clicked()
{

5
wfmain.h
Wyświetl plik

@ -15,8 +15,10 @@
#include "rigcommander.h"
#include "freqmemory.h"
#include "rigidentities.h"
#include "repeaterattributes.h"
#include "calibrationwindow.h"
#include "repeatersetup.h"
#include "satellitesetup.h"
#include "udpserversetup.h"
#include "udpserver.h"
@ -379,6 +381,8 @@ private slots:
void on_serialDeviceListCombo_activated(const QString &arg1);
void on_rptSetupBtn_clicked();
private:
Ui::wfmain *ui;
QSettings settings;
@ -590,6 +594,7 @@ private:
unsigned char lanGain=0;
calibrationWindow *cal;
repeaterSetup *rpt;
satelliteSetup *sat;
udpServerSetup *srv;

9
wfmain.ui
Wyświetl plik

@ -663,6 +663,13 @@
</attribute>
</widget>
</item>
<item>
<widget class="QPushButton" name="rptSetupBtn">
<property name="text">
<string>Repeater</string>
</property>
</widget>
</item>
</layout>
</item>
<item>
@ -2004,7 +2011,7 @@
<resources/>
<connections/>
<buttongroups>
<buttongroup name="duplexBtnGrp"/>
<buttongroup name="radioConnectionSerialNetworkGrp"/>
<buttongroup name="duplexBtnGrp"/>
</buttongroups>
</ui>

10
wfview.pro
Wyświetl plik

@ -99,7 +99,8 @@ SOURCES += main.cpp\
meter.cpp \
qledlabel.cpp \
pttyhandler.cpp \
resampler/resample.c
resampler/resample.c \
repeatersetup.cpp
HEADERS += wfmain.h \
commhandler.h \
@ -119,13 +120,16 @@ HEADERS += wfmain.h \
pttyhandler.h \
resampler/speex_resampler.h \
resampler/arch.h \
resampler/resample_sse.h
resampler/resample_sse.h \
repeatersetup.h \
repeaterattributes.h
FORMS += wfmain.ui \
calibrationwindow.ui \
satellitesetup.ui \
udpserversetup.ui
udpserversetup.ui \
repeatersetup.ui