kopia lustrzana https://gitlab.com/eliggett/wfview
Merge branch 'ui-enhance' into lan-alpha
Phil Taylor
commit
f2491064fd
27
CHANGELOG
27
CHANGELOG
|
|
@ -1,11 +1,36 @@
|
|||
# CHANGELOG
|
||||
|
||||
- 20210520
|
||||
|
||||
Add more features to rigstate
|
||||
|
||||
- 20210519
|
||||
|
||||
Model ID text format fixed. Shows IC-0x followed by the raw rig ID
|
||||
received.
|
||||
|
||||
Fixed issue where unknown rigs were identified as 0xff. All rigs are now
|
||||
identified using rigCaps.modelID, populated with the raw response from
|
||||
the Rig ID query. Enumerations of known rig types continue to fall into
|
||||
rigCaps.model, and unknwn rigs will match to rigCaps.model=modelUnknown,
|
||||
as before.
|
||||
|
||||
Serial baud rate is in the UI now. Added some enable/disable code to
|
||||
prevent confusion about which options can be used with which types of
|
||||
connections.
|
||||
|
||||
Better about box.
|
||||
|
||||
fixed filename in instructions
|
||||
|
||||
Add MacOS serial port entitlement
|
||||
|
||||
|
||||
- 20210518
|
||||
|
||||
Remove unused variables
|
||||
|
||||
Make windows build include git version
|
||||
|
||||
Command line version of git must be available in the path.
|
||||
|
||||
Various file tidying for Windows/Mac builds
|
||||
|
|
|
|||
|
|
@ -2855,6 +2855,38 @@ void rigCommander::determineRigCaps()
|
|||
rigCaps.bands.insert(rigCaps.bands.end(), standardVU.begin(), standardVU.end());
|
||||
rigCaps.bands.push_back(bandGen);
|
||||
break;
|
||||
case model756pro:
|
||||
rigCaps.modelName = QString("IC-756 Pro");
|
||||
rigCaps.hasSpectrum = false;
|
||||
rigCaps.inputs.clear();
|
||||
rigCaps.hasLan = false;
|
||||
rigCaps.hasEthernet = false;
|
||||
rigCaps.hasWiFi = false;
|
||||
rigCaps.hasATU = true;
|
||||
rigCaps.preamps.push_back('\x01');
|
||||
rigCaps.preamps.push_back('\x02');
|
||||
rigCaps.attenuators.insert(rigCaps.attenuators.end(),{ '\x06' , '\x12', '\x18'});
|
||||
rigCaps.antennas = {0x00, 0x01};
|
||||
rigCaps.bands = standardHF;
|
||||
rigCaps.bands.push_back(bandGen);
|
||||
rigCaps.bsr[bandGen] = 0x11;
|
||||
break;
|
||||
case model756proiii:
|
||||
rigCaps.modelName = QString("IC-756 Pro III");
|
||||
rigCaps.hasSpectrum = false;
|
||||
rigCaps.inputs.clear();
|
||||
rigCaps.hasLan = false;
|
||||
rigCaps.hasEthernet = false;
|
||||
rigCaps.hasWiFi = false;
|
||||
rigCaps.hasATU = true;
|
||||
rigCaps.preamps.push_back('\x01');
|
||||
rigCaps.preamps.push_back('\x02');
|
||||
rigCaps.attenuators.insert(rigCaps.attenuators.end(),{ '\x06' , '\x12', '\x18'});
|
||||
rigCaps.antennas = {0x00, 0x01};
|
||||
rigCaps.bands = standardHF;
|
||||
rigCaps.bands.push_back(bandGen);
|
||||
rigCaps.bsr[bandGen] = 0x11;
|
||||
break;
|
||||
default:
|
||||
rigCaps.modelName = QString("IC-0x%1").arg(rigCaps.modelID, 2, 16);
|
||||
rigCaps.hasSpectrum = false;
|
||||
|
|
|
|||
|
|
@ -52,6 +52,12 @@ model_kind determineRadioModel(unsigned char rigID)
|
|||
case model705:
|
||||
rig = model705;
|
||||
break;
|
||||
case model756proiii:
|
||||
rig = model756proiii;
|
||||
break;
|
||||
case model756pro:
|
||||
rig = model756pro;
|
||||
break;
|
||||
default:
|
||||
rig = modelUnknown;
|
||||
break;
|
||||
|
|
|
|||
|
|
@ -26,6 +26,8 @@ enum model_kind {
|
|||
model9700 = 0xA2,
|
||||
model705 = 0xA4,
|
||||
model706 = 0x58,
|
||||
model756pro = 0x5C,
|
||||
model756proiii = 0x6E,
|
||||
model910h = 0x60,
|
||||
modelUnknown = 0xFF
|
||||
};
|
||||
|
|
|
|||
|
|
@ -4331,7 +4331,7 @@ void wfmain::on_rigCIVaddrHexLine_editingFinished()
|
|||
}
|
||||
|
||||
}
|
||||
void wfmain::on_baudRateCombo_activated()
|
||||
void wfmain::on_baudRateCombo_activated(int index)
|
||||
{
|
||||
bool ok = false;
|
||||
quint32 baud = ui->baudRateCombo->currentData().toUInt(&ok);
|
||||
|
|
@ -4340,6 +4340,7 @@ void wfmain::on_baudRateCombo_activated()
|
|||
prefs.serialPortBaud = baud;
|
||||
showStatusBarText(QString("Changed baud rate to %1 bps. Press Save Settings to retain.").arg(baud));
|
||||
}
|
||||
(void)index;
|
||||
}
|
||||
|
||||
// --- DEBUG FUNCTION ---
|
||||
|
|
|
|||
2
wfmain.h
2
wfmain.h
|
|
@ -440,7 +440,7 @@ private slots:
|
|||
|
||||
void on_rigCIVaddrHexLine_editingFinished();
|
||||
|
||||
void on_baudRateCombo_activated();
|
||||
void on_baudRateCombo_activated(int);
|
||||
|
||||
private:
|
||||
Ui::wfmain *ui;
|
||||
|
|
|
|||
21
wfmain.ui
21
wfmain.ui
|
|
@ -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">
|
||||
|
|
@ -2168,7 +2168,7 @@
|
|||
<item>
|
||||
<widget class="QComboBox" name="serialDeviceListCombo">
|
||||
<property name="toolTip">
|
||||
<string><html><head/><body><p>Select a serial port here. </p><p><br/></p><p>Once selected, check &quot;Enable USB(serial), press &quot;Save Settings&quot;, exit, and re-start wfview. </p></body></html></string>
|
||||
<string><html><head/><body><p>Select a serial port here. </p><p>Once selected, check &quot;Enable USB(serial), press &quot;Save Settings&quot;, exit, and re-start wfview. </p></body></html></string>
|
||||
</property>
|
||||
<property name="accessibleName">
|
||||
<string>Serial Device Selector</string>
|
||||
|
|
@ -2185,7 +2185,7 @@
|
|||
<item>
|
||||
<widget class="QComboBox" name="baudRateCombo">
|
||||
<property name="toolTip">
|
||||
<string><html><head/><body><p>Baud rate selection menu. </p><p>For the IC-7300 select 115200. </p><p>Older rigs may require other settings. </p><p>Be sure to match what baud rate the rig is set to. Using the highese supported baud rate for the radio is recommended. </p></body></html></string>
|
||||
<string><html><head/><body><p>Baud rate selection menu. </p><p>For the IC-7300 select 115200. </p><p>Older rigs may require other settings. </p><p>Be sure to match what baud rate the rig is set to. Using the highese supported baud rate for the radio is recommended. </p><p>Please press &quot;Save Settings&quot; and re-launc wfview for this to take effect.</p></body></html></string>
|
||||
</property>
|
||||
<property name="accessibleName">
|
||||
<string>baud rate</string>
|
||||
|
|
@ -2208,7 +2208,7 @@
|
|||
<item>
|
||||
<widget class="QCheckBox" name="rigCIVManualAddrChk">
|
||||
<property name="toolTip">
|
||||
<string><html><head/><body><p>If you are using an older (year 2010) radio, you may need to enable this option to manually specify the CI-V address. This option is also useful for radios that do not have CI-V Transceive enabled and thus will not answer our broadcast query for connected rigs on the CI-V bus.</p><p>If you have a modern radio with CI-V Transceive enabled, you should not need to check this box. </p></body></html></string>
|
||||
<string><html><head/><body><p>If you are using an older (year 2010) radio, you may need to enable this option to manually specify the CI-V address. This option is also useful for radios that do not have CI-V Transceive enabled and thus will not answer our broadcast query for connected rigs on the CI-V bus.</p><p>If you have a modern radio with CI-V Transceive enabled, you should not need to check this box. </p><p>You will need to Save Settings and re-launch wfview for this to take effect. </p></body></html></string>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>Manual Radio CI-V Address:</string>
|
||||
|
|
@ -2234,12 +2234,17 @@
|
|||
</property>
|
||||
<property name="toolTip">
|
||||
<string><html><head/><body><p>Enter the address in as hexidecimal, without any prefix, just as the radio presents the address in the menu. </p><p>Here are some common examples:</p>
|
||||
IC-706: 58
|
||||
<br/>IC-756: 6E
|
||||
<p>IC-706: 58
|
||||
<br/>IC-756: 50
|
||||
<br/>IC-756 Pro: 5C
|
||||
<br/>IC-756 Pro II: 64
|
||||
<br/>IC-756 Pro III: 6E
|
||||
<br/>IC-7000: 70
|
||||
<br/>IC-7100: 88
|
||||
<br/>IC-7200: 76
|
||||
<p>This setting is typically needed for older radios and for radios that do not have CI-V Transceive enabled. </p></body></html></string>
|
||||
<br/>IC-7200: 76
|
||||
<br/>IC-7300: 94
|
||||
</p><p>This setting is typically needed for older radios and for radios that do not have CI-V Transceive enabled. </p>
|
||||
<p>After changing, press Save Settings and re-launch wfview.</p></body></html></string>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>auto</string>
|
||||
|
|
|
|||
Ładowanie…
Reference in New Issue