merge-requests/1/merge
Elliott Liggett 2018-11-29 14:32:59 -08:00
rodzic b5715d6024
commit 0918727058
6 zmienionych plików z 37 dodań i 58 usunięć

Wyświetl plik

@ -12,7 +12,7 @@ freqMemory::freqMemory()
void freqMemory::initializePresets()
{
qDebug() << "Initializing " << numPresets << " memory channels";
// qDebug() << "Initializing " << numPresets << " memory channels";
for(unsigned int p=0; p < numPresets; p++)
{

Wyświetl plik

@ -370,7 +370,7 @@ void rigCommander::parseData(QByteArray dataInput)
{
// Finally this almost never happens
// qDebug() << "Data length too short: " << data.length() << " bytes. Data:";
printHex(data, false, true);
//printHex(data, false, true);
}
// no
//return;

Wyświetl plik

@ -604,7 +604,7 @@ void wfmain::runDelayedCommand()
switch(qdCmd)
{
case cmdNone:
qDebug() << "NOOP";
//qDebug() << "NOOP";
break;
case cmdGetRigID:
emit getRigID();
@ -616,7 +616,7 @@ void wfmain::runDelayedCommand()
emit getMode();
break;
case cmdGetDataMode:
qDebug() << "Sending query for data mode";
// qDebug() << "Sending query for data mode";
emit getDataMode();
break;
case cmdSetDataModeOff:
@ -820,37 +820,37 @@ void wfmain::on_startBtn_clicked()
emit spectOutputEnable();
}
void wfmain::on_getFreqBtn_clicked()
{
emit getFrequency();
}
//void wfmain::on_getFreqBtn_clicked()
//{
// emit getFrequency();
//}
void wfmain::on_getModeBtn_clicked()
{
emit getMode();
}
//void wfmain::on_getModeBtn_clicked()
//{
// emit getMode();
//}
void wfmain::on_debugBtn_clicked()
{
// Temporary place to try code
// emit getDebug();
// emit getBandStackReg(0x11,1); // 20M, latest
// emit getRfGain();
//void wfmain::on_debugBtn_clicked()
//{
// // Temporary place to try code
// // emit getDebug();
// // emit getBandStackReg(0x11,1); // 20M, latest
// // emit getRfGain();
// for(int a=0; a<100; a++)
// {
// cmdOutQue.append(cmdGetRxGain);
// cmdOutQue.append(cmdGetSql);
// }
// delayedCommand->start();
//// for(int a=0; a<100; a++)
//// {
//// cmdOutQue.append(cmdGetRxGain);
//// cmdOutQue.append(cmdGetSql);
//// }
//// delayedCommand->start();
// emit getRigID();
// // emit getRigID();
//mem.dumpMemory();
// //mem.dumpMemory();
saveSettings();
// saveSettings();
}
//}
void wfmain::on_stopBtn_clicked()
{
@ -883,7 +883,7 @@ void wfmain::receiveMode(QString mode)
void wfmain::receiveDataModeStatus(bool dataEnabled)
{
qDebug() << "Received data mode " << dataEnabled << "\n";
// qDebug() << "Received data mode " << dataEnabled << "\n";
if(dataEnabled)
{
if(currentModeIndex == 0)
@ -1414,7 +1414,7 @@ void wfmain::receiveAfGain(unsigned char level)
void wfmain::receiveSql(unsigned char level)
{
qDebug() << "Receive SQL level of " << (int)level << " = " << 100*level/255.0 << "%";
// qDebug() << "Receive SQL level of " << (int)level << " = " << 100*level/255.0 << "%";
// ui->sqlSlider->setValue(level); // No SQL control so far
}

Wyświetl plik

@ -83,11 +83,11 @@ private slots:
void runDelayedCommand();
void showStatusBarText(QString text);
void on_getFreqBtn_clicked();
// void on_getFreqBtn_clicked();
void on_getModeBtn_clicked();
// void on_getModeBtn_clicked();
void on_debugBtn_clicked();
// void on_debugBtn_clicked();
void on_stopBtn_clicked();

Wyświetl plik

@ -18,7 +18,7 @@
<item>
<widget class="QTabWidget" name="tabWidget">
<property name="currentIndex">
<number>3</number>
<number>0</number>
</property>
<widget class="QWidget" name="mainTab">
<attribute name="title">
@ -275,30 +275,6 @@
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="getFreqBtn">
<property name="text">
<string>Get Frequency</string>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="getModeBtn">
<property name="text">
<string>GetMode</string>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="debugBtn">
<property name="toolTip">
<string>Don't press this button!</string>
</property>
<property name="text">
<string>Debug</string>
</property>
</widget>
</item>
<item>
<spacer name="horizontalSpacer_6">
<property name="orientation">

Wyświetl plik

@ -27,6 +27,9 @@ DEFINES += GITSHORT="\\\"$(shell git -C $$PWD rev-parse --short HEAD)\\\""
RESOURCES += qdarkstyle/style.qrc
# Do not do this, it will hang on start:
# CONFIG(release, debug|release):DEFINES += QT_NO_DEBUG_OUTPUT
CONFIG(debug, release|debug) {
win32:QCPLIB = qcustomplotd1