Re: [wsjt-devel] Tuning power

2018-09-14 Thread Black Michael via wsjt-devel
This patch does fix the problem correctlyand turns out the 
on_monitorButton_clicked isn't needed.

@@ -5917,6 +5920,7 @@
 }
   }
   else { // we're turning off so remember our Tune pwr setting and reset to Tx 
pwr
+    stopTx(); // ensure rig stops tx before we change power as tuning is 
likely lower power
 if (m_config.pwrBandTuneMemory() || m_config.pwrBandTxMemory()) {
   m_pwrBandTuneMemory[curBand] = ui->outAttenuation->value(); // remember 
our Tune pwr
   m_PwrBandSetOK = false;
@@ -5929,7 +5933,6 @@
   } else {
 m_sentFirst73=false;
 itone[0]=0;
-    on_monitorButton_clicked (true);
 m_tune=true;
   }
   Q_EMIT tune (checked);
___
wsjt-devel mailing list
wsjt-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/wsjt-devel


Re: [wsjt-devel] Tuning power

2018-09-14 Thread Black Michael via wsjt-devel
Scratch that patchit messes up the memory for tuningtI'll fix it.

Mike
 

On Thursday, September 13, 2018, 2:30:14 PM CDT, Black Michael 
 wrote:  
 
 The order of operation for adjusting the tuning power back to operational 
power needs to change.It was causing a potential power spike for about 10-20ms 
before tuning was actually turned off.So simply move it ahead of the power 
adjustment.Tuning should most always be less than operationalso don't think 
we need to have this on both sides of the tune power adjustment.


@@ -5905,6 +5908,17 @@
   static bool lastChecked = false;
   if (lastChecked == checked) return;
   lastChecked = checked;
+
+  if (m_tune) {
+    tuneButtonTimer.start(250);
+  } else {
+    m_sentFirst73=false;
+    itone[0]=0;
+    on_monitorButton_clicked (true);
+    m_tune=true;
+  }
+  Q_EMIT tune (checked);
+
   QString curBand = ui->bandComboBox->currentText();
   if (checked && m_tune==false) { // we're starting tuning so remember Tx and 
change pwr to Tune value
 if (m_config.pwrBandTuneMemory ()) {
@@ -5924,15 +5938,6 @@
   m_PwrBandSetOK = true;
 }
   }
-  if (m_tune) {
-    tuneButtonTimer.start(250);
-  } else {
-    m_sentFirst73=false;
-    itone[0]=0;
-    on_monitorButton_clicked (true);
-    m_tune=true;
-  }
-  Q_EMIT tune (checked);
 }

 void MainWindow::stop_tuning ()

de Mike W9MDB
  ___
wsjt-devel mailing list
wsjt-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/wsjt-devel


[wsjt-devel] Tuning power

2018-09-13 Thread Black Michael via wsjt-devel
The order of operation for adjusting the tuning power back to operational power 
needs to change.It was causing a potential power spike for about 10-20ms before 
tuning was actually turned off.So simply move it ahead of the power 
adjustment.Tuning should most always be less than operationalso don't think 
we need to have this on both sides of the tune power adjustment.


@@ -5905,6 +5908,17 @@
   static bool lastChecked = false;
   if (lastChecked == checked) return;
   lastChecked = checked;
+
+  if (m_tune) {
+    tuneButtonTimer.start(250);
+  } else {
+    m_sentFirst73=false;
+    itone[0]=0;
+    on_monitorButton_clicked (true);
+    m_tune=true;
+  }
+  Q_EMIT tune (checked);
+
   QString curBand = ui->bandComboBox->currentText();
   if (checked && m_tune==false) { // we're starting tuning so remember Tx and 
change pwr to Tune value
 if (m_config.pwrBandTuneMemory ()) {
@@ -5924,15 +5938,6 @@
   m_PwrBandSetOK = true;
 }
   }
-  if (m_tune) {
-    tuneButtonTimer.start(250);
-  } else {
-    m_sentFirst73=false;
-    itone[0]=0;
-    on_monitorButton_clicked (true);
-    m_tune=true;
-  }
-  Q_EMIT tune (checked);
 }

 void MainWindow::stop_tuning ()

de Mike W9MDB
___
wsjt-devel mailing list
wsjt-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/wsjt-devel