Merge pull request #16 from mwinters-stuff/master

Fixes to media keys connect and disconnect.
T-vK · Feb 27, 2020 · e43fdd6 · e43fdd6
2 parents 5d6b157 + b64348d
commit e43fdd6
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 0 deletions.
diff --git a/BleConnectionStatus.cpp b/BleConnectionStatus.cpp
@@ -8,11 +8,18 @@ void BleConnectionStatus::onConnect(BLEServer* pServer)
   this->connected = true;
   BLE2902* desc = (BLE2902*)this->inputKeyboard->getDescriptorByUUID(BLEUUID((uint16_t)0x2902));
   desc->setNotifications(true);
+
+  desc = (BLE2902*)this->inputMediaKeys->getDescriptorByUUID(BLEUUID((uint16_t)0x2902));
+  desc->setNotifications(true);
 }
 
 void BleConnectionStatus::onDisconnect(BLEServer* pServer)
 {
   this->connected = false;
   BLE2902* desc = (BLE2902*)this->inputKeyboard->getDescriptorByUUID(BLEUUID((uint16_t)0x2902));
   desc->setNotifications(false);
+
+  desc = (BLE2902*)this->inputMediaKeys->getDescriptorByUUID(BLEUUID((uint16_t)0x2902));
+  desc->setNotifications(false);
+
 }
diff --git a/BleConnectionStatus.h b/BleConnectionStatus.h
@@ -16,6 +16,7 @@ class BleConnectionStatus : public BLEServerCallbacks
   void onDisconnect(BLEServer* pServer);
   BLECharacteristic* inputKeyboard;
   BLECharacteristic* outputKeyboard;
+  BLECharacteristic* inputMediaKeys;
 };
 
 #endif // CONFIG_BT_ENABLED

diff --git a/BleKeyboard.cpp b/BleKeyboard.cpp
@@ -128,6 +128,7 @@ void BleKeyboard::taskServer(void* pvParameter) {
   bleKeyboardInstance->inputMediaKeys = bleKeyboardInstance->hid->inputReport(MEDIA_KEYS_ID);
   bleKeyboardInstance->connectionStatus->inputKeyboard = bleKeyboardInstance->inputKeyboard;
   bleKeyboardInstance->connectionStatus->outputKeyboard = bleKeyboardInstance->outputKeyboard;
+	bleKeyboardInstance->connectionStatus->inputMediaKeys = bleKeyboardInstance->inputMediaKeys;
 
   bleKeyboardInstance->outputKeyboard->setCallbacks(new KeyboardOutputCallbacks());