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

Fixed rebase issues

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

7
mainwindow.cpp
View File

@ -5877,7 +5877,6 @@ int MainWindow::findFreeFreqOffset(int fmin, int fmax, int bw){
// schedulePing // schedulePing
void MainWindow::scheduleHeartbeat(bool first){ void MainWindow::scheduleHeartbeat(bool first){
auto timestamp = DriftingDateTime::currentDateTimeUtc(); auto timestamp = DriftingDateTime::currentDateTimeUtc();
auto orig = timestamp;
// if we have the heartbeat interval disabled, return early, unless this is a "heartbeat now" // if we have the heartbeat interval disabled, return early, unless this is a "heartbeat now"
if(!m_config.heartbeat() && !first){ if(!m_config.heartbeat() && !first){
@ -5913,7 +5912,6 @@ void MainWindow::scheduleHeartbeat(bool first){
// pausePing // pausePing
void MainWindow::pauseHeartbeat(){ void MainWindow::pauseHeartbeat(){
ui->heartbeatButton->setChecked(false);
m_nextHeartPaused = true; m_nextHeartPaused = true;
if(heartbeatTimer.isActive()){ if(heartbeatTimer.isActive()){
@ -5923,7 +5921,6 @@ void MainWindow::pauseHeartbeat(){
// unpausePing // unpausePing
void MainWindow::unpauseHeartbeat(){ void MainWindow::unpauseHeartbeat(){
ui->heartbeatButton->setChecked(true);
scheduleHeartbeat(false); scheduleHeartbeat(false);
} }
@ -6129,7 +6126,6 @@ void MainWindow::acceptQSO (QDateTime const& QSO_date_off, QString const& call,
m_logBook.init(); m_logBook.init();
if (m_config.clear_callsign ()){ if (m_config.clear_callsign ()){
clearDX ();
clearCallsignSelected(); clearCallsignSelected();
} }
@ -8708,10 +8704,11 @@ void MainWindow::updateTxButtonDisplay(){
left = (int)ceil(float(left)/TEST_FOX_WAVE_GEN_SLOTS); left = (int)ceil(float(left)/TEST_FOX_WAVE_GEN_SLOTS);
} }
int sent = qMax(1, count - left); int sent = qMax(1, count - left);
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));
#endif #endif
ui->startTxButton->setText(m_tune ? "Tuning" : QString("%1 (%2/%3)").arg(ui->turboButton->isChecked() ? "Turbo" : "Send").arg(sent).arg(count));
ui->startTxButton->setEnabled(false); ui->startTxButton->setEnabled(false);
} else { } else {
ui->startTxButton->setText(m_txFrameCountEstimate <= 0 ? QString("Send") : QString("Send (%1)").arg(m_txFrameCountEstimate)); ui->startTxButton->setText(m_txFrameCountEstimate <= 0 ? QString("Send") : QString("Send (%1)").arg(m_txFrameCountEstimate));

2
plotter.cpp
View File

@ -9,7 +9,7 @@
#include "DriftingDateTime.h" #include "DriftingDateTime.h"
#define MAX_SCREENSIZE 2048 #define MAX_SCREENSIZE 2048
#define TEST_FOX_WAVE_GEN 1 #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);