Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

DELIA-67061 report firmware not supported to UI (#6109) #6148

Merged
merged 2 commits into from
Mar 20, 2025
Merged

DELIA-67061 report firmware not supported to UI (#6109) #6148

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5d22593
DELIA-67061 report firmware not supported to UI (#6109)
ANANTHMARIMUTHU Mar 5, 2025
0fe4782
Merge branch 'main' into DELIA-67061-main
anand-ky Mar 19, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 16 additions & 0 deletions Bluetooth/Bluetooth.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,6 +106,7 @@ const string WPEFramework::Plugin::Bluetooth::STATUS_DISCOVERY_STARTED = "DISCOV
const string WPEFramework::Plugin::Bluetooth::STATUS_DISCOVERY_COMPLETED = "DISCOVERY_COMPLETED";
const string WPEFramework::Plugin::Bluetooth::STATUS_PAIRING_FAILED = "PAIRING_FAILED";
const string WPEFramework::Plugin::Bluetooth::STATUS_CONNECTION_FAILED= "CONNECTION_FAILED";
const string WPEFramework::Plugin::Bluetooth::STATUS_UNSUPPORTED_DEVICE = "UNSUPPORTED_DEVICE";

const string WPEFramework::Plugin::Bluetooth::CMD_AUDIO_CTRL_PLAY = "PLAY";
const string WPEFramework::Plugin::Bluetooth::CMD_AUDIO_CTRL_STOP = "STOP";
Expand Down Expand Up @@ -997,6 +998,21 @@ namespace WPEFramework
eventId = EVT_REQUEST_FAILED;
break;

case BTRMGR_EVENT_DEVICE_UNSUPPORTED:
LOGERR("Received %s Event from BTRMgr", C_STR(STATUS_UNSUPPORTED_DEVICE));
params["newStatus"] = STATUS_UNSUPPORTED_DEVICE;
params["deviceID"] = std::to_string(eventMsg.m_discoveredDevice.m_deviceHandle);
params["name"] = string(eventMsg.m_discoveredDevice.m_name);
params["deviceType"] = BTRMGR_GetDeviceTypeAsString(eventMsg.m_discoveredDevice.m_deviceType);
params["rawDeviceType"] = std::to_string(eventMsg.m_discoveredDevice.m_ui32DevClassBtSpec);
params["rawBleDeviceType"] = std::to_string(eventMsg.m_discoveredDevice.m_ui16DevAppearanceBleSpec);
params["lastConnectedState"] = eventMsg.m_discoveredDevice.m_isLastConnectedDevice ? true : false;
params["paired"] = eventMsg.m_discoveredDevice.m_isPairedDevice ? true : false;
params["connected"] = eventMsg.m_discoveredDevice.m_isConnected ? true : false;

eventId = EVT_REQUEST_FAILED;
break;

case BTRMGR_EVENT_DEVICE_UNPAIRING_FAILED:
LOGERR("Received %s Event from BTRMgr", C_STR(STATUS_PAIRING_FAILED));
params["newStatus"] = STATUS_PAIRING_FAILED;
Expand Down
1 change: 1 addition & 0 deletions Bluetooth/Bluetooth.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -207,6 +207,7 @@ namespace WPEFramework {
static const string STATUS_DISCOVERY_COMPLETED;
static const string STATUS_PAIRING_FAILED;
static const string STATUS_CONNECTION_FAILED;
static const string STATUS_UNSUPPORTED_DEVICE;

static const string CMD_AUDIO_CTRL_PLAY;
static const string CMD_AUDIO_CTRL_STOP;
Expand Down
4 changes: 4 additions & 0 deletions Bluetooth/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,10 @@ All notable changes to this RDK Service will be documented in this file.

* For more details, refer to [versioning](https://github.com/rdkcentral/rdkservices#versioning) section under Main README.

## [1.0.13] - 2025-03-19
### Added
- Added unsupport event for the pair/connect request

## [1.0.12] - 2024-09-26
### Added
- Make sure connect response is sent on a connect request
Expand Down
1 change: 1 addition & 0 deletions Tests/mocks/BluetoothMgr.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,6 +165,7 @@ typedef enum _BTRMGR_Events_t {
BTRMGR_EVENT_MEDIA_PLAYER_UNMUTE,
BTRMGR_EVENT_DEVICE_MEDIA_STATUS,
BTRMGR_EVENT_BATTERY_INFO,
BTRMGR_EVENT_DEVICE_UNSUPPORTED,
BTRMGR_EVENT_MAX
} BTRMGR_Events_t;
/**
Expand Down
Loading