chris/js8call
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed defines and % in the send button

Browse Source
This commit is contained in:
Jordan Sherer 2018-12-11 23:52:01 -05:00
parent 4025edfc0f
commit b8b2cf33c3
2 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
mainwindow.cpp
View File

@ -151,8 +151,17 @@ extern "C" {
void plotsave_(float swide[], int* m_w , int* m_h1, int* irow); void plotsave_(float swide[], int* m_w , int* m_h1, int* irow);
} }
#ifndef TEST_FOX_WAVE_GEN
#define TEST_FOX_WAVE_GEN 0 #define TEST_FOX_WAVE_GEN 0
#define TEST_FOX_WAVE_GEN_SLOTS 1 #endif
#ifndef TEST_FOX_WAVE_GEN_SLOTS
#if TEST_FOX_WAVE_GEN
#define TEST_FOX_WAVE_GEN_SLOTS 2
#else
#define TEST_FOX_WAVE_GEN_SLOTS 1
#endif
#endif
const int NEAR_THRESHOLD_RX = 10; const int NEAR_THRESHOLD_RX = 10;
@ -8707,7 +8716,7 @@ void MainWindow::updateTxButtonDisplay(){
ui->startTxButton->setText(m_tune ? "Tuning" : QString("%1 (%2/%3)").arg(ui->turboButton->isChecked() ? "Turbo" : "Send").arg(sent).arg(count)); ui->startTxButton->setText(m_tune ? "Tuning" : QString("%1 (%2/%3)").arg(ui->turboButton->isChecked() ? "Turbo" : "Send").arg(sent).arg(count));
#else #else
int sent = count - m_txFrameQueue.count(); int sent = count - m_txFrameQueue.count();
ui->startTxButton->setText(m_tune ? "Tuning" : QString("%Send (%1/%2)").arg(sent).arg(count)); ui->startTxButton->setText(m_tune ? "Tuning" : QString("Send (%1/%2)").arg(sent).arg(count));
#endif #endif
ui->startTxButton->setEnabled(false); ui->startTxButton->setEnabled(false);
} else { } else {

1
plotter.cpp
View File

@ -9,7 +9,6 @@
#include "DriftingDateTime.h" #include "DriftingDateTime.h"
#define MAX_SCREENSIZE 2048 #define MAX_SCREENSIZE 2048
#define TEST_FOX_WAVE_GEN 0
extern "C" { extern "C" {
void flat4_(float swide[], int* iz, int* nflatten); void flat4_(float swide[], int* iz, int* nflatten);