Prepare to release 2.8.0.131

v2.8.0.131
Alex Paraskeva 2019-09-02 23:03:25 +03:00
parent f67ac4ebe8
commit ed5a667a8c
5 changed files with 38 additions and 79910 deletions

View File

@ -199,7 +199,7 @@ namespace PowerSDR
// return StrVFOFreq("A");
// else
// return parser.Error1;
return ZZFA(s);
return ZZ01(s);
}
// Sets or reads the frequency of VFO B
@ -357,7 +357,7 @@ namespace PowerSDR
// if(temp == parser.Error1)
// temp = " ";
string f = ZZFA("");
string f = ZZ01("");
if(f.Length > 11)
{
f = f.Substring(f.Length-11,11);
@ -2050,7 +2050,7 @@ namespace PowerSDR
status += ZZCU() + sep;
parser.nAns = 11;
status += ZZFA("") + sep;
status += ZZ01("") + sep;
status += ZZFB("");
parser.nAns = old;
return status;
@ -2259,7 +2259,7 @@ namespace PowerSDR
//Sets or reads VFO A frequency
public string ZZFA(string s)
public string ZZ01(string s)
{
if(s.Length == parser.nSet)
{
@ -2935,7 +2935,7 @@ namespace PowerSDR
if(retval)
split = "1";
string f = ZZFA("");
string f = ZZ01("");
if(f.Length > 11)
{
f = f.Substring(f.Length-11,11);

View File

@ -201,7 +201,7 @@ using Flex.Control;
//using CefSharp.WinForms;
using Syncfusion.Windows.Forms.Tools; // ke9ns add
using Syncfusion.Windows.Forms.HTMLUI; // ke9ns add
//using Syncfusion.Windows.Forms.HTMLUI; // ke9ns add
@ -2131,7 +2131,7 @@ namespace PowerSDR
if (r.Present) list_det_present++;
break;
case Model.SDR1000:
// case Model.SOFTROCK40:
case Model.SOFTROCK40:
list_undet_num++; break;
}
}
@ -2632,7 +2632,7 @@ namespace PowerSDR
case Model.FLEX3000: s = "FLEX-3000"; break;
case Model.FLEX1500: s = "FLEX-1500"; break;
case Model.SDR1000: s = "SDR-1000"; break;
// case Model.SOFTROCK40: s = "SoftRock"; break;
case Model.SOFTROCK40: s = "SoftRock"; break;
case Model.DEMO: s = "Demo"; break;
}
@ -9390,7 +9390,7 @@ namespace PowerSDR
// if(current_model == Model.SDR1000) hw = new HW(0x378); // create hardware object
if(current_model == Model.SDR1000) hw = new HW(0x378); // create hardware object
//BT 5/3/10 moved siolistener to last init item to prevent default data
//being sent via CAT
@ -21795,7 +21795,7 @@ namespace PowerSDR
{
return;
/* if (current_model != Model.SDR1000) return;
if (current_model != Model.SDR1000) return;
switch(TXBand)
{
@ -21872,7 +21872,6 @@ namespace PowerSDR
Hdw.X2 = (byte)((Hdw.X2 & 0xC0) | x2_2_tx);
break;
}
*/
} // UpdateExtCtrl()
// Added 06/24/05 BT for CAT commands
@ -25095,7 +25094,7 @@ namespace PowerSDR
{
case Model.SDR1000:
case Model.DEMO:
// case Model.SOFTROCK40:
case Model.SOFTROCK40:
//bool rx_only = SetupForm.RXOnly; // Save RX Only Setting
//SetupForm.RXOnly = true;
@ -49940,7 +49939,7 @@ namespace PowerSDR
else
{
byte b = 0;
// if(current_model == Model.SDR1000) b = Hdw.StatusPort();
if(current_model == Model.SDR1000) b = Hdw.StatusPort();
mic_ptt = (b & (byte)StatusPin.Dot) != 0;
@ -54024,7 +54023,7 @@ namespace PowerSDR
case Model.FLEX3000:
case Model.SDR1000:
case Model.DEMO:
// case Model.SOFTROCK40:
case Model.SOFTROCK40:
if (!Audio.Start())
{
chkPower.Checked = false;
@ -54230,7 +54229,7 @@ namespace PowerSDR
timer_peak_text.Enabled = true;
/* if (current_model == Model.SDR1000 && atu_present)
if (current_model == Model.SDR1000 && atu_present)
{
int counter = 0;
while (((Hdw.StatusPort() & (byte)StatusPin.PA_DATA)) == 0)
@ -54249,7 +54248,7 @@ namespace PowerSDR
}
Hdw.PA_ATUTune(ATUTuneMode.BYPASS);
}
*/
CWKeyer.Reset();
CWPTT.Start();
@ -54343,7 +54342,7 @@ namespace PowerSDR
if (!(fwc_init && (current_model == Model.FLEX5000 || current_model == Model.FLEX3000)))
{
// if(current_model == Model.SDR1000) Hdw.StandBy();
if(current_model == Model.SDR1000) Hdw.StandBy();
}
else
{
@ -54374,7 +54373,7 @@ namespace PowerSDR
case Model.SDR1000:
case Model.FLEX5000:
case Model.FLEX3000:
// case Model.SOFTROCK40:
case Model.SOFTROCK40:
case Model.DEMO:
Audio.callback_return = 2;
Audio.StopAudio();
@ -55160,10 +55159,10 @@ namespace PowerSDR
chkMUT.BackColor = SystemColors.Control;
}
// if(num_channels == 2)
// {
//if(current_model == Model.SDR1000) Hdw.MuteRelay = chkMUT.Checked;
// }
if(num_channels == 2)
{
if(current_model == Model.SDR1000) Hdw.MuteRelay = chkMUT.Checked;
}
@ -55903,11 +55902,11 @@ namespace PowerSDR
int index2 = 0;
while (powers[index2] < pwr) index2++;
/* if (current_model == Model.SDR1000 && pwr < 10)
if (current_model == Model.SDR1000 && pwr < 10)
{
new_volume = Math.Sqrt(pwr / 10.0 * Math.Pow(power_table[(int)b][3], 2.0)) / audio_volts1;
}
*/
if (index1 == index2)
{
new_volume = power_table[(int)b][index1] / audio_volts1;
@ -56512,10 +56511,10 @@ namespace PowerSDR
}
else
{
// if (chkPower.Checked && mox && current_model == Model.SDR1000)
// {
// Hdw.MuteRelay = !chkMON.Checked;
// }
if (chkPower.Checked && mox && current_model == Model.SDR1000)
{
Hdw.MuteRelay = !chkMON.Checked;
}
}
@ -56563,7 +56562,7 @@ namespace PowerSDR
private void HdwMOXChanged(bool tx, double freq)
{
// if(current_model == Model.SDR1000) Hdw.UpdateHardware = false;
if(current_model == Model.SDR1000) Hdw.UpdateHardware = false;
if (tx)
{
@ -56693,8 +56692,8 @@ namespace PowerSDR
txtVFOAFreq_LostFocus(this, EventArgs.Empty);
}
/* else if(current_model == Model.SDR1000)
{
else if(current_model == Model.SDR1000)
{
if(xvtr_present && Hdw.XVTR_RF)
{
Hdw.XVTR_RF = false;
@ -56744,7 +56743,6 @@ namespace PowerSDR
rx1_dsp_mode != DSPMode.SPEC)
if_shift = true;
}
*/
}
if (!fwc_init && !hid_init && current_model != Model.FLEX5000 && current_model != Model.FLEX3000 && current_model != Model.FLEX1500)
@ -56828,7 +56826,7 @@ namespace PowerSDR
chkPower.BackColor = Color.Red;
}
// if(current_model == Model.SDR1000) comboPreamp.Enabled = !chkMOX.Checked;
if(current_model == Model.SDR1000) comboPreamp.Enabled = !chkMOX.Checked;
setupForm.MOX = chkMOX.Checked;
ResetMultiMeterPeak();
//chkMOX.BackColor = button_selected_color;
@ -56887,8 +56885,8 @@ namespace PowerSDR
for (int i = 0; i < meter_text_history.Length; i++)
meter_text_history[i] = 0.0f;
if (!fwc_init) // || current_model == Model.SDR1000)
comboPreamp.Enabled = !chkMOX.Checked;
if (!fwc_init || current_model == Model.SDR1000)
comboPreamp.Enabled = !chkMOX.Checked;
setupForm.MOX = chkMOX.Checked;
ResetMultiMeterPeak();
chkMOX.BackColor = SystemColors.Control;
@ -58006,7 +58004,7 @@ namespace PowerSDR
{
if (comboTuneMode.SelectedIndex == (int)ATUTuneMode.BYPASS)
{
// if(current_model == Model.SDR1000) Hdw.PA_ATUTune(ATUTuneMode.BYPASS);
if(current_model == Model.SDR1000) Hdw.PA_ATUTune(ATUTuneMode.BYPASS);
tuned_band = Band.FIRST;
if (chkTUN.BackColor == button_selected_color)
chkTUN.BackColor = SystemColors.Control;
@ -58620,7 +58618,7 @@ namespace PowerSDR
else
chkBCI.BackColor = SystemColors.Control;
// if(current_model == Model.SDR1000) SetHWFilters(dds_freq);
if(current_model == Model.SDR1000) SetHWFilters(dds_freq);
}
public bool CheckForTXCW()

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

View File

@ -21513,7 +21513,7 @@ namespace PowerSDR
chkTXLimitSlew.Visible = false;
chkTXLimitSlew.Checked = false;
// grpGeneralHardwareSDR1000.Visible = true;
grpGeneralHardwareSDR1000.Visible = true;
grpGeneralHardwareFLEX5000.Visible = false;
grpGeneralHardwareFLEX1500.Visible = false;
}
@ -21541,7 +21541,7 @@ namespace PowerSDR
chkTXLimitSlew.Visible = false;
chkTXLimitSlew.Checked = false;
// grpGeneralHardwareSDR1000.Visible = true;
grpGeneralHardwareSDR1000.Visible = true;
grpGeneralHardwareFLEX5000.Visible = false;
grpGeneralHardwareFLEX1500.Visible = false;
}
@ -21576,7 +21576,7 @@ namespace PowerSDR
chkGeneralRXOnly.Enabled = true;
DSP.SetThreadNumber(1);
// grpGeneralHardwareSDR1000.Visible = true;
grpGeneralHardwareSDR1000.Visible = true;
grpGeneralHardwareFLEX5000.Visible = false;
grpGeneralHardwareFLEX1500.Visible = false;
}