tza/openauto
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Various tweaks

Browse Source 
* Fix bluetooth service issues when running on linux pc (experimental.)
* Service factory changes to disable bluetooth and wifi (commented out)
* Include boost logs library.
This commit is contained in:
SonOfGib 2025-02-26 20:02:23 -05:00
parent 17d4bfbcda
commit 05a4a0a7d7
No known key found for this signature in database
GPG Key ID: AAC7AE796C4F06D6
4 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -88,7 +88,7 @@ endif ()
find_package(aap_protobuf REQUIRED) find_package(aap_protobuf REQUIRED)
find_package(aasdk REQUIRED) find_package(aasdk REQUIRED)
find_package(Boost REQUIRED COMPONENTS system log OPTIONAL_COMPONENTS unit_test_framework) find_package(Boost REQUIRED COMPONENTS system log_setup log OPTIONAL_COMPONENTS unit_test_framework)
find_package(libusb-1.0 REQUIRED) find_package(libusb-1.0 REQUIRED)
find_package(Qt5 COMPONENTS DBus Multimedia MultimediaWidgets Bluetooth Network) find_package(Qt5 COMPONENTS DBus Multimedia MultimediaWidgets Bluetooth Network)
find_package(OpenSSL REQUIRED) find_package(OpenSSL REQUIRED)

8
include/f1x/openauto/autoapp/Service/AndroidAutoEntity.hpp
View File

@ -19,10 +19,10 @@
#pragma once #pragma once
#include <boost/asio.hpp> #include <boost/asio.hpp>
#include <f1x/aasdk/Transport/ITransport.hpp> #include <aasdk/Transport/ITransport.hpp>
#include <f1x/aasdk/Channel/Control/IControlServiceChannel.hpp> #include <aasdk/Channel/Control/IControlServiceChannel.hpp>
#include <f1x/aasdk/Channel/Control/IControlServiceChannelEventHandler.hpp> #include <aasdk/Channel/Control/IControlServiceChannelEventHandler.hpp>
#include <f1x/aasdk/Channel/AV/VideoServiceChannel.hpp> #include <aasdk/Channel/MediaSink/Video/Channel/VideoChannel.hpp>
#include <f1x/openauto/autoapp/Configuration/IConfiguration.hpp> #include <f1x/openauto/autoapp/Configuration/IConfiguration.hpp>
#include <f1x/openauto/autoapp/Service/IAndroidAutoEntity.hpp> #include <f1x/openauto/autoapp/Service/IAndroidAutoEntity.hpp>
#include <f1x/openauto/autoapp/Service/IService.hpp> #include <f1x/openauto/autoapp/Service/IService.hpp>

6
src/autoapp/Service/ServiceFactory.cpp
View File

@ -62,7 +62,6 @@ namespace f1x::openauto::autoapp::service {
this->createMediaSinkServices(serviceList, messenger); this->createMediaSinkServices(serviceList, messenger);
this->createMediaSourceServices(serviceList, messenger); this->createMediaSourceServices(serviceList, messenger);
serviceList.emplace_back(this->createSensorService(messenger)); serviceList.emplace_back(this->createSensorService(messenger));
serviceList.emplace_back(this->createBluetoothService(messenger));
serviceList.emplace_back(this->createInputService(messenger)); serviceList.emplace_back(this->createInputService(messenger));
if (configuration_->getWirelessProjectionEnabled()) if (configuration_->getWirelessProjectionEnabled())
{ {
@ -71,7 +70,8 @@ namespace f1x::openauto::autoapp::service {
* The btservice seems to handle connecting over bluetooth and allow AA to establish a WiFi connection for Projection * The btservice seems to handle connecting over bluetooth and allow AA to establish a WiFi connection for Projection
* If WifiProjection is a legitimate service, then it seems clear it is not what we think it actually is. * If WifiProjection is a legitimate service, then it seems clear it is not what we think it actually is.
*/ */
serviceList.emplace_back(this->createWifiProjectionService(messenger)); serviceList.emplace_back(this->createBluetoothService(messenger));
// serviceList.emplace_back(this->createWifiProjectionService(messenger));
} }
return serviceList; return serviceList;
@ -204,7 +204,7 @@ namespace f1x::openauto::autoapp::service {
IService::Pointer ServiceFactory::createWifiProjectionService(aasdk::messenger::IMessenger::Pointer messenger) { IService::Pointer ServiceFactory::createWifiProjectionService(aasdk::messenger::IMessenger::Pointer messenger) {
OPENAUTO_LOG(info) << "[ServiceFactory] createWifiProjectionService()"; OPENAUTO_LOG(info) << "[ServiceFactory] createWifiProjectionService()";
return std::make_shared<wifiprojection::WifiProjectionService>(ioService_, messenger); return std::make_shared<wifiprojection::WifiProjectionService>(ioService_, messenger, configuration_);
} }
} }

1
src/btservice/AndroidBluetoothServer.cpp
View File

@ -49,6 +49,7 @@ namespace f1x::openauto::btservice {
/// Start Server listening on Address /// Start Server listening on Address
uint16_t AndroidBluetoothServer::start(const QBluetoothAddress &address) { uint16_t AndroidBluetoothServer::start(const QBluetoothAddress &address) {
OPENAUTO_LOG(debug) << "[AndroidBluetoothServer::start]"; OPENAUTO_LOG(debug) << "[AndroidBluetoothServer::start]";
rfcommServer_->close(); // Close should always be called before listen.
if (rfcommServer_->listen(address)) { if (rfcommServer_->listen(address)) {
return rfcommServer_->serverPort(); return rfcommServer_->serverPort();