Changeset f6e94e6 in subsurface


Ignore:
Timestamp:
Jun 12, 2017, 9:49:11 AM (13 days ago)
Author:
Dirk Hohndel <dirk@…>
Branches:
master
Children:
c7a35098
Parents:
a7288cc
git-author:
Jan Mulder <jlmulder@…> (06/08/17 05:15:22)
git-committer:
Dirk Hohndel <dirk@…> (06/12/17 09:49:11)
Message:

QML UI: call correct function for BT address

After the recent refactoring of QMLManager to btdiscovery, the
manager.getBtAddress() got superseeded by
downloadThread.data().getDetectedDeviceAddress(). Corrected this
here.

Futher some debug output is modified, so that it report the proper
function names.

This corrects the download from an automatically detected OSTC 3.
Manul selection of the same device from the fake vendor "Paired
BT Devices" does not work, however. Still work to be done in
that area.

Signed-off-by: Jan Mulder <jlmulder@…>
Signed-off-by: Dirk Hohndel <dirk@…>

Files:
2 edited

Legend:

Unmodified
Added
Removed
  • core/downloadfromdcthread.cpp

    ra7288cc rf6e94e6  
    248248        QList<btVendorProduct> btDCs = BTDiscovery::instance()->getBtDcs();
    249249        if (!btDCs.isEmpty()) {
    250                 qDebug() << "getVendorIdx" << btDCs.first().vendorIdx;
     250                qDebug() << "getDetectedVendorIndex" << btDCs.first().vendorIdx;
    251251                return btDCs.first().vendorIdx;
    252252        }
     
    260260        QList<btVendorProduct> btDCs = BTDiscovery::instance()->getBtDcs();
    261261        if (!btDCs.isEmpty()) {
    262                 qDebug() << "getProductIdx" << btDCs.first().productIdx;
     262                qDebug() << "getDetectedProductIndex" << btDCs.first().productIdx;
    263263                return btDCs.first().productIdx;
    264264        }
     
    273273        if (!btDCs.isEmpty()) {
    274274                QString btAddr = btDCs.first().btdi.address().toString();
    275                 qDebug() << "getBtAddress" << btAddr;
     275                qDebug() << "getDetectedDeviceAddress" << btAddr;
    276276                return btAddr;
    277277        }
  • mobile-widgets/qml/DownloadFromDiveComputer.qml

    rb14a522 rf6e94e6  
    9090                                        text: qsTr("Retry")
    9191                                        if (downloadThread.deviceData.bluetoothMode) {
    92                                                 var addr = manager.getBtAddress()
     92                                                var addr = downloadThread.data().getDetectedDeviceAddress()
    9393                                                if (addr !== "")
    9494                                                downloadThread.deviceData.devName = addr
    9595                                        }
    96                                         manager.appendTextToLog("DCDownloadThread started from " + downloadThread.deviceData.devName)
     96                                        manager.appendTextToLog("DCDownloadThread started for " + downloadThread.deviceData.devName)
    9797                                        downloadThread.start()
    9898                                }
Note: See TracChangeset for help on using the changeset viewer.