diff options
author | Scott Murray <scott.murray@konsulko.com> | 2021-12-16 15:07:44 -0500 |
---|---|---|
committer | Scott Murray <scott.murray@konsulko.com> | 2021-12-16 16:03:51 -0500 |
commit | fad93b42c285ffb463e9494070f40d3b339d732f (patch) | |
tree | 6ae60914c578bd34b8ebbde9b271859e8b87ab65 /bluetooth/bluetooth.h | |
parent | fe20f1b029f67dee1f790ade7a9114086f2abd38 (diff) |
Initial rework to replace app framework usage
Changes:
- Remove "core" code related to WebSocket messaging for the app
framework.
- Stub out hvac, navigation, network, and weather interfaces. This
allows building several of the demo applications without modification
for now. The network interface will definitely be reused to plumb
in a new connman-glib library derived from the previous network
binding. The others may potentially be reused to plumb in other
new backend implementations.
- Update the Network interface object constructor arguments to add a
agent registration flag. This prepares for the connman-glib
switch and means users will not need to be updated twice.
- Update the Bluetooth interface to use a new bluez-glib library that
is derived from the previous Bluetooth binding. This has been
successfully tested with a the Settings application.
- Remove signal-composer and voice API interface code as there are no
direct replacements planned. The signal-composer interface was
effectively exposing the binding events, so has little reuse
potential with a new backend. For the voice interface, if some form
of Alexa support becomes desirable, it can potentially be brought
back for adaptation if required.
- Disable compilation of the remaining interfaces for now. Some like
map, pbap, and mediaplayer are very likely to be used as the basis
for updating their associated applications, so keeping the code for
the planned iterative development seems easier.
- Updated copyright lines in all touched files.
Bug-AGL: SPEC-4182
Signed-off-by: Scott Murray <scott.murray@konsulko.com>
Change-Id: Ib717ac8ac68ec457eaee74755dcf9d4f36b79d12
Diffstat (limited to 'bluetooth/bluetooth.h')
-rw-r--r-- | bluetooth/bluetooth.h | 42 |
1 files changed, 17 insertions, 25 deletions
diff --git a/bluetooth/bluetooth.h b/bluetooth/bluetooth.h index b79e8f9..c7ef55c 100644 --- a/bluetooth/bluetooth.h +++ b/bluetooth/bluetooth.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2020 Konsulko Group + * Copyright (C) 2018-2021 Konsulko Group * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -19,13 +19,10 @@ #include <memory> #include <QObject> -#include <QJsonObject> -#include <QJsonArray> #include <QtQml/QQmlContext> class BluetoothModel; -class MessageEngine; -class Message; +class BluetoothEventHandler; class Bluetooth : public QObject { @@ -34,18 +31,20 @@ class Bluetooth : public QObject Q_PROPERTY(bool discoverable READ discoverable WRITE setDiscoverable NOTIFY discoverableChanged) public: - explicit Bluetooth(QUrl &url, QQmlContext *context, QObject * parent = Q_NULLPTR); + explicit Bluetooth(bool register_agent, QQmlContext *context, QObject * parent = Q_NULLPTR); virtual ~Bluetooth(); void setPower(bool); void setDiscoverable(bool); + Q_INVOKABLE void start(void); + Q_INVOKABLE void start_discovery(void); Q_INVOKABLE void stop_discovery(void); Q_INVOKABLE void remove_device(QString device); Q_INVOKABLE void pair(QString device); - Q_INVOKABLE void cancel_pair(QString device); + Q_INVOKABLE void cancel_pair(void); Q_INVOKABLE void connect(QString device, QString uuid); Q_INVOKABLE void connect(QString device); @@ -62,24 +61,21 @@ class Bluetooth : public QObject void powerChanged(bool state); void discoverableChanged(); - void connectionEvent(QJsonObject data); - void requestConfirmationEvent(QJsonObject data); + //void connectionEvent(QJsonObject data); + void requestConfirmationEvent(QString pincode); private: - std::shared_ptr<MessageEngine> m_mloop; QQmlContext *m_context; BluetoothModel *m_bluetooth; - void send_command(QString, QJsonObject); - void set_discovery_filter(); - void discovery_command(bool); - void populateDeviceList(QJsonObject data); - void processDeviceChangesEvent(QJsonObject data); - void processAdapterChangesEvent(QJsonObject data); + BluetoothEventHandler *m_event_handler; + bool m_agent; - // slots - void onConnected(); - void onDisconnected(); - void onMessageReceived(std::shared_ptr<Message>); + void init_adapter_state(QString); + void refresh_device_list(void); + void set_discovery_filter(void); + void discovery_command(bool); + void update_adapter_power(bool); + void request_confirmation(int); QString process_uuid(QString uuid) { if (uuid.length() == 36) return uuid; return uuids.value(uuid); }; @@ -89,11 +85,7 @@ class Bluetooth : public QObject QMap<QString, QString> uuids; - const QStringList events { - "adapter_changes", - "device_changes", - "agent", - }; + friend class BluetoothEventHandler; }; #endif // BLUETOOTH_H |