On 23/08/2014 16:06, Michael Black wrote:
Hi Mike,
sorry for the delay in replying, I am now back on line.
I got the TCP working for the TenTec Omni VII on HRD basically just by
ignoring the pull-down menu error.
Diff is attached and in-line here too.
OK, but i have a problem with this approach since the original failure
is designed to flag that the code needs changes to talk to HRD for a new
rig that has unrecognised controls in HRD. The Omni HRD simply doesn't
meet the minimum requirements for WSJT-X as currently implemented. I had
not realised that there were HRD rig integrations that were so primitive
:( I need to address this by reducing the minimum requirements to that
level. This will mean that some WSJT-X configuration settings cannot
work such as split operation, BTW this is already the case for mode
setting although I'm not sure it is correctly implemented just yet.
HRD has a bug report from me which, hopefully, they will eventually
fix to give those parameters. HRD doesn't even show buttons for mode,
split, or PTT for the Omni VII which is their problem.
OK, it will be interesting to see how responsive they are.
I also made a small improvement to the error messages since what was
there was lacking specificity on where the failure was occurring.
This is a good improvement although, if you don't mind, I will implement
with more user friendly text since referring to internal implementation
details about drop downs and buttons may not be helpful to users.
What I did was default the mode to USB if there is no dropdown
available for mode select.
I'm not sure why you needed to do this, mode control appears to be
available for the TenTec Omni using HRD.
Hopefully that's the right thing to do here.
I need to revisit mode setting in HRD, the intent was to allow control
of rigs with no CAT mode control. I see that I have broken that by
blindly setting mode in the initialization. I will fix that in a more
generic way.
Thanks for looking at this Mike, it has revealed several issues which I
am working on now.
Mike W9MDB
73
Bill
G4WJS.
Index: HRDTransceiver.cpp
===================================================================
--- HRDTransceiver.cpp (revision 4231)
+++ HRDTransceiver.cpp (working copy)
@@ -214,7 +214,7 @@
vfo_A_button_ = find_button (QRegExp ("^(VFO~A|Main)$"));
vfo_B_button_ = find_button (QRegExp ("^(VFO~B|Sub)$"));
vfo_toggle_button_ = find_button (QRegExp ("^(A~/~B)$"));
- Q_ASSERT (vfo_toggle_button_ >= 0 || (vfo_A_button_ >= 0 &&
vfo_B_button_ >=0));
+ //Q_ASSERT (vfo_toggle_button_ >= 0 || (vfo_A_button_ >= 0 &&
vfo_B_button_ >=0));
split_mode_button_ = find_button (QRegExp ("^(Spl~On|Spl_On|Split)$"));
split_off_button_ = find_button (QRegExp ("^(Spl~Off|Spl_Off)$"));
@@ -266,11 +266,25 @@
{
// put the rig into a known state
auto f = send_command ("get frequency").toUInt ();
- auto m = lookup_mode (get_dropdown (mode_A_dropdown_),
mode_A_map_);
+ auto m = USB; // default to USB if no mode select available
+ try
+ {
+ m = lookup_mode (get_dropdown (mode_A_dropdown_), mode_A_map_);
+ }
+ catch (error const&)
+ { // defaults to m=USB
+ }
set_button (vfo_B_button_ >= 0 ? vfo_B_button_ :
vfo_toggle_button_);
auto fo = send_command ("get frequency").toUInt ();
update_other_frequency (fo);
- auto mo = lookup_mode (get_dropdown (mode_A_dropdown_),
mode_A_map_);
+ auto mo = USB;
+ try
+ {
+ mo = lookup_mode (get_dropdown (mode_A_dropdown_), mode_A_map_);
+ }
+ catch (error const&)
+ { // defaults to mo=USB
+ }
set_button (vfo_A_button_ >= 0 ? vfo_A_button_ :
vfo_toggle_button_);
if (f != fo || m != mo)
{
@@ -281,7 +295,14 @@
else
{
update_rx_frequency (send_command ("get frequency").toUInt ());
- update_mode (lookup_mode (get_dropdown (mode_A_dropdown_),
mode_A_map_));
+ try
+ {
+ update_mode (lookup_mode (get_dropdown
(mode_A_dropdown_), mode_A_map_));
+ }
+ catch (error const&)
+ {
+ // nothing to do if there is no mode select
+ }
}
}
@@ -386,7 +407,7 @@
qDebug () << "HRDTransceiver::get_dropdown bad response";
#endif
- throw error {tr ("Ham Radio Deluxe didn't respond as expected")};
+ throw error {tr ("Ham Radio Deluxe didn't respond as expected.
get_dropdown failed")};
}
Q_ASSERT (reply.left (colon_index).trimmed () == dd_name);
@@ -571,7 +592,7 @@
qDebug () << "HRDTransceiver::is_button_checked bad response";
#endif
- throw error {tr ("Ham Radio Deluxe didn't respond as expected")};
+ throw error {tr ("Ham Radio Deluxe didn't respond as expected.
is_button_checked failed")};
}
return "1" == reply;
}
@@ -627,8 +648,15 @@
{
update_rx_frequency (send_command ("get frequency",
quiet).toUInt ());
}
-
- update_mode (lookup_mode (get_dropdown (mode_A_dropdown_, quiet),
mode_A_map_));
+ try {
+ update_mode (lookup_mode (get_dropdown
(mode_A_dropdown_, quiet), mode_A_map_));
+ }
+ catch (error const&)
+ {
+#if WSJT_TRACE_CAT
+ qDebug () << "HRDTransceiver::poll failed:" <<
hrd_->errorString ();
+#endif
+ }
}
QString HRDTransceiver::send_command (QString const& cmd, bool
no_debug, bool prepend_context, bool recurse)
@@ -765,6 +793,6 @@
qDebug () << "HRDTransceiver::send_simple_command unexpected
response";
#endif
- throw error {tr ("Ham Radio Deluxe didn't respond as expected")};
+ throw error {tr ("Ham Radio Deluxe didn't respond as expected.
send_simple_command failed")};
}
}
------------------------------------------------------------------------------
Slashdot TV.
Video for Nerds. Stuff that matters.
http://tv.slashdot.org/
_______________________________________________
wsjt-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/wsjt-devel
------------------------------------------------------------------------------
Slashdot TV.
Video for Nerds. Stuff that matters.
http://tv.slashdot.org/
_______________________________________________
wsjt-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/wsjt-devel
