Skip to content

Adds feature reports support on Bluefruit52Lib's BLEHidGeneric service #849

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Adds feature reports support on Bluefruit52Lib's BLEHidGeneric service #849

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
30 changes: 30 additions & 0 deletions libraries/Bluefruit52Lib/src/services/BLEHidGeneric.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,6 +127,15 @@ void BLEHidGeneric::setOutputReportCallback(uint8_t reportID, BLECharacteristic:
if ( idx < _num_output ) _chr_outputs[idx].setWriteCallback(fp);
}

void BLEHidGeneric::setFeatureReportCallback(uint8_t reportID, BLECharacteristic::write_cb_t fp)
{
// index is ID-1
uint8_t const idx = ( reportID ? (reportID - 1) : 0 );

// report mode
if (idx < _num_feature) _chr_features[idx].setWriteCallback(fp);
}

/*------------------------------------------------------------------*/
/* Callbacks
*------------------------------------------------------------------*/
Expand Down Expand Up @@ -193,6 +202,21 @@ err_t BLEHidGeneric::begin(void)
_chr_outputs[i].write8(0);
}

// Feature reports
for (uint8_t i = 0; i < _num_feature; i++)
{
_chr_features[i].setUuid(UUID16_CHR_REPORT);
_chr_features[i].setProperties(CHR_PROPS_READ | CHR_PROPS_WRITE | CHR_PROPS_WRITE_WO_RESP);
_chr_features[i].setPermission(SECMODE_OPEN, SECMODE_OPEN);
_chr_features[i].setReportRefDescriptor(i+1, REPORT_TYPE_FEATURE);

// Input report len is configured, else variable len up to 255
if ( _feature_len ) _chr_features[i].setFixedLen( _feature_len[i] );

VERIFY_STATUS(_chr_features[i].begin());
_chr_features[i].write8(0); // default value
}

// Report Map (HID Report Descriptor)
BLECharacteristic report_map(UUID16_CHR_REPORT_MAP);
report_map.setTempMemory();
Expand Down Expand Up @@ -283,6 +307,12 @@ bool BLEHidGeneric::bootMouseReport(void const* data, int len)
return bootMouseReport(BLE_CONN_HANDLE_INVALID, data, len);
}

bool BLEHidGeneric::featureReport(uint8_t reportID, void const* data, int len)
{
uint8_t idx = reportID ? reportID - 1 : 0;
if (idx >= _num_feature) return false;
return _chr_features[idx].write((uint8_t const*) data, len);
}

// Conversion table from Ascii to keycode (shift, keycode)
const uint8_t hid_ascii_to_keycode[128][2] = { HID_ASCII_TO_KEYCODE };
Expand Down
3 changes: 3 additions & 0 deletions libraries/Bluefruit52Lib/src/services/BLEHidGeneric.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,12 +63,15 @@ class BLEHidGeneric : public BLEService

void setOutputReportCallback(uint8_t reportID, BLECharacteristic::write_cb_t fp);

void setFeatureReportCallback(uint8_t reportID, BLECharacteristic::write_cb_t fp);

virtual err_t begin(void);

bool isBootMode(void) { return !_report_mode; }

// Send Report to default connection
bool inputReport(uint8_t reportID, void const* data, int len);
bool featureReport(uint8_t reportID, void const* data, int len);
bool bootKeyboardReport(void const* data, int len);
bool bootMouseReport(void const* data, int len);

Expand Down