main
PianetaRadio 2024-11-21 18:35:32 +01:00 zatwierdzone przez GitHub
rodzic c4d20f3bfa
commit 31b4430f3c
Nie znaleziono w bazie danych klucza dla tego podpisu
ID klucza GPG: B5690EEEBB952194
3 zmienionych plików z 35 dodań i 30 usunięć

Wyświetl plik

@ -1,5 +1,7 @@
QT += core gui
QT += serialport
QT += multimedia
greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
@ -12,8 +14,10 @@ CONFIG += c++11
SOURCES += \
dialogcommand.cpp \
dialogconfig.cpp \
dialognetrigctl.cpp \
dialogradioinfo.cpp \
dialogsetup.cpp \
dialogvoicekeyer.cpp \
guidata.cpp \
main.cpp \
mainwindow.cpp \
@ -27,8 +31,10 @@ SOURCES += \
HEADERS += \
dialogcommand.h \
dialogconfig.h \
dialognetrigctl.h \
dialogradioinfo.h \
dialogsetup.h \
dialogvoicekeyer.h \
guidata.h \
mainwindow.h \
rigcommand.h \
@ -41,8 +47,10 @@ HEADERS += \
FORMS += \
dialogcommand.ui \
dialogconfig.ui \
dialognetrigctl.ui \
dialogradioinfo.ui \
dialogsetup.ui \
dialogvoicekeyer.ui \
mainwindow.ui
# Default rules for deployment.
@ -53,11 +61,9 @@ else: unix:!android: target.path = /opt/$${TARGET}/bin
LIBS += -L$$PWD/hamlib/ -lhamlib
INCLUDEPATH += $$PWD/hamlib
# RESOURCES += theme/breeze.qrc
RESOURCES += qdarkstyle/dark/darkstyle.qrc
# RESOURCES += qdarkstyle/light/lightstyle.qrc
VERSION = 1.4.1
VERSION = 1.5.0
RC_ICONS = catradio.ico

Wyświetl plik

@ -1,9 +1,11 @@
CatRadio
Change log
(+ New, * Updated, - Removed)
1.4.1 - 2024-xx-xx
+ CW memory keyer
1.5.0 - 2024-xx-xx
+ Voice memory keyer (CatRadio)
+ CW memory keyer (radio)
+ Check hamlib version on startup
* Display software version in the window title
* Bug fix: IF shift

Wyświetl plik

@ -22,13 +22,17 @@
#include <QMainWindow>
#include <QTimer>
#include <QMediaPlayer>
#include <QAudioOutput>
#include <QMediaDevices>
#include <QSettings>
#include "rig.h"
#define RELEASE_DATE __DATE__
#define VERSION_MAJ 1
#define VERSION_MIN 4
#define VERSION_MIC 1
#define VERSION_MIN 5
#define VERSION_MIC 0
QT_BEGIN_NAMESPACE
@ -42,7 +46,7 @@ class MainWindow : public QMainWindow
public:
MainWindow(QWidget *parent = nullptr);
~MainWindow();
~MainWindow();
public slots:
void guiUpdate();
@ -50,6 +54,7 @@ public slots:
void on_rigDaemonResultReady(); //Slot for rigDaemon resultReady
void on_vfoDisplayMainValueChanged(int value); //Slot for vfoDisplay Main valueChanged
void on_vfoDisplaySubValueChanged(int value); //Slot for vfoDisplay Sub valueChanged
void on_voiceKeyerStateChanged();
signals:
@ -69,33 +74,21 @@ private slots:
void on_pushButton_Fast_toggled(bool checked);
void on_pushButton_Band160_clicked();
void on_pushButton_Band80_clicked();
void on_pushButton_Band60_clicked();
void on_pushButton_Band40_clicked();
void on_pushButton_Band30_clicked();
void on_pushButton_Band20_clicked();
void on_pushButton_Band17_clicked();
void on_pushButton_Band15_clicked();
void on_pushButton_Band12_clicked();
void on_pushButton_Band10_clicked();
void on_pushButton_Band6_clicked();
void on_pushButton_Tune_clicked();
void on_radioButton_Tuner_toggled(bool checked);
void on_pushButton_BandDown_clicked();
void on_pushButton_BandUp_clicked();
void on_pushButton_QSplit_clicked();
@ -163,17 +156,12 @@ private slots:
void on_spinBox_RPToffset_valueChanged(int arg1);
void on_pushButton_left_clicked();
void on_pushButton_right_clicked();
void on_checkBox_clar_toggled(bool checked);
void on_pushButton_clarClear_clicked();
void on_horizontalSlider_clar_valueChanged(int value);
void on_radioButton_clarRIT_toggled(bool checked);
void on_radioButton_clarXIT_toggled(bool checked);
void on_verticalSlider_RFpower_sliderReleased();
@ -213,24 +201,33 @@ private slots:
void on_action_AboutDarkTheme_triggered();
void on_pushButton_CW1_clicked();
void on_pushButton_CW2_clicked();
void on_pushButton_CW3_clicked();
void on_pushButton_CW4_clicked();
void on_pushButton_CW5_clicked();
void on_actionNET_rigctl_triggered();
void on_action_Voice_Keyer_triggered();
void on_pushButton_VoiceK1_clicked();
void on_pushButton_VoiceK2_clicked();
void on_pushButton_VoiceK3_clicked();
void on_pushButton_VoiceK4_clicked();
void on_pushButton_VoiceK5_clicked();
private:
Ui::MainWindow *ui;
QTimer *timer;
QMediaPlayer *audioPlayer;
QAudioOutput *audioOutput;
QMediaDevices *audioDevices;
RIG *my_rig;
void guiInit();
void audioOutputInit(QString configFileName);
void setSubMeter();
bool checkHamlibVersion(int major, int minor, int revision);
};