From 864b2f491a8f8f8398dce5a542d19f8317438cfb Mon Sep 17 00:00:00 2001 From: Elliott Liggett Date: Tue, 30 Mar 2021 23:37:35 -0700 Subject: [PATCH] Adding code to support a separate repeater setup window. --- repeaterattributes.h | 15 +++ repeatersetup.cpp | 14 +++ repeatersetup.h | 24 +++++ repeatersetup.ui | 230 +++++++++++++++++++++++++++++++++++++++++++ rigcommander.h | 12 +-- wfmain.cpp | 6 ++ wfmain.h | 5 + wfmain.ui | 9 +- wfview.pro | 10 +- 9 files changed, 310 insertions(+), 15 deletions(-) create mode 100644 repeaterattributes.h create mode 100644 repeatersetup.cpp create mode 100644 repeatersetup.h create mode 100644 repeatersetup.ui diff --git a/repeaterattributes.h b/repeaterattributes.h new file mode 100644 index 0000000..61c0c32 --- /dev/null +++ b/repeaterattributes.h @@ -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 diff --git a/repeatersetup.cpp b/repeatersetup.cpp new file mode 100644 index 0000000..562c44d --- /dev/null +++ b/repeatersetup.cpp @@ -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; +} diff --git a/repeatersetup.h b/repeatersetup.h new file mode 100644 index 0000000..440cab0 --- /dev/null +++ b/repeatersetup.h @@ -0,0 +1,24 @@ +#ifndef REPEATERSETUP_H +#define REPEATERSETUP_H + +#include + +#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 diff --git a/repeatersetup.ui b/repeatersetup.ui new file mode 100644 index 0000000..eaef7eb --- /dev/null +++ b/repeatersetup.ui @@ -0,0 +1,230 @@ + + + repeaterSetup + + + + 0 + 0 + 800 + 217 + + + + Repeater Setup + + + + + + + Qt::Vertical + + + + 20 + 40 + + + + + + + + 0 + + + + + Read Current Settings + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + + + 0 + + + 0 + + + + + Repeater Duplex + + + + + + Simplex + + + rptDuplexBtns + + + + + + + Dup+ + + + rptDuplexBtns + + + + + + + Dup- + + + rptDuplexBtns + + + + + + + Auto + + + rptDuplexBtns + + + + + + + + + + Repeater Tone Type + + + + + + None + + + rptToneBtns + + + + + + + Transmit Tone only + + + rptToneBtns + + + + + + + Tone Squelch + + + rptToneBtns + + + + + + + DTCS + + + rptToneBtns + + + + + + + + + + Tone Selection + + + + + + + + Tone + + + + + + + + + + + + + + DTCS + + + + + + + + + + + + + + Invert Tx + + + + + + + Invert Rx + + + + + + + + + + + + + + + + + + + + diff --git a/rigcommander.h b/rigcommander.h index 006d881..70786c7 100644 --- a/rigcommander.h +++ b/rigcommander.h @@ -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, diff --git a/wfmain.cpp b/wfmain.cpp index 765a695..b11f26c 100644 --- a/wfmain.cpp +++ b/wfmain.cpp @@ -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() { diff --git a/wfmain.h b/wfmain.h index 02474b8..cc5b00c 100644 --- a/wfmain.h +++ b/wfmain.h @@ -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; diff --git a/wfmain.ui b/wfmain.ui index 850c3af..60925bc 100644 --- a/wfmain.ui +++ b/wfmain.ui @@ -663,6 +663,13 @@ + + + + Repeater + + + @@ -2004,7 +2011,7 @@ - + diff --git a/wfview.pro b/wfview.pro index 1f45481..1c39103 100644 --- a/wfview.pro +++ b/wfview.pro @@ -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