mirror of https://github.com/saitohirga/WSJT-X.git
Add some debug diagnostics for the Hamlib optional settings JSON file
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@7530 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
This commit is contained in:
parent
ca796744a3
commit
94b1a00040
|
@ -252,6 +252,7 @@ HamlibTransceiver::HamlibTransceiver (int model_number, TransceiverFactory::Para
|
||||||
|
|
||||||
// rig_->state.obj = this;
|
// rig_->state.obj = this;
|
||||||
|
|
||||||
|
if (!is_dummy_)
|
||||||
{
|
{
|
||||||
//
|
//
|
||||||
// user defined Hamlib settings
|
// user defined Hamlib settings
|
||||||
|
@ -266,6 +267,7 @@ HamlibTransceiver::HamlibTransceiver (int model_number, TransceiverFactory::Para
|
||||||
if (!settings_file_name.isEmpty ())
|
if (!settings_file_name.isEmpty ())
|
||||||
{
|
{
|
||||||
QFile settings_file {settings_file_name};
|
QFile settings_file {settings_file_name};
|
||||||
|
qDebug () << "Using Hamlib settings file:" << settings_file_name;
|
||||||
if (settings_file.open (QFile::ReadOnly))
|
if (settings_file.open (QFile::ReadOnly))
|
||||||
{
|
{
|
||||||
QJsonParseError status;
|
QJsonParseError status;
|
||||||
|
@ -275,6 +277,7 @@ HamlibTransceiver::HamlibTransceiver (int model_number, TransceiverFactory::Para
|
||||||
throw error {tr ("Hamlib settings file error: %1 at character offset %2")
|
throw error {tr ("Hamlib settings file error: %1 at character offset %2")
|
||||||
.arg (status.errorString ()).arg (status.offset)};
|
.arg (status.errorString ()).arg (status.offset)};
|
||||||
}
|
}
|
||||||
|
qDebug () << "Hamlib settings JSON:" << settings_doc.toJson ();
|
||||||
if (!settings_doc.isObject ())
|
if (!settings_doc.isObject ())
|
||||||
{
|
{
|
||||||
throw error {tr ("Hamlib settings file error: top level must be a JSON object")};
|
throw error {tr ("Hamlib settings file error: top level must be a JSON object")};
|
||||||
|
@ -300,10 +303,7 @@ HamlibTransceiver::HamlibTransceiver (int model_number, TransceiverFactory::Para
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
if (!is_dummy_)
|
|
||||||
{
|
|
||||||
switch (rig_->caps->port_type)
|
switch (rig_->caps->port_type)
|
||||||
{
|
{
|
||||||
case RIG_PORT_SERIAL:
|
case RIG_PORT_SERIAL:
|
||||||
|
|
Loading…
Reference in New Issue