Clean up the BT HID libraries a bit (#1236)

Author: earlephilhower

libraries/JoystickBT/src/JoystickBT.cpp

@@ -79,11 +79,11 @@ int JoystickBT_::map8or10bit(int const value) {
 #define REPORT_ID 0x01
 static const uint8_t desc_joystick[] = {TUD_HID_REPORT_DESC_GAMEPAD(HID_REPORT_ID(REPORT_ID))};
 void JoystickBT_::begin(void) {
-    _PicoBluetoothHID.startHID("PicoW Joystick 00:00:00:00:00:00", "PicoW HID Joystick", 0x2508, 33, desc_joystick, sizeof(desc_joystick));
+    PicoBluetoothHID.startHID("PicoW Joystick 00:00:00:00:00:00", "PicoW HID Joystick", 0x2508, 33, desc_joystick, sizeof(desc_joystick));
 }
 
 void JoystickBT_::end(void) {
-    _PicoBluetoothHID.end();
+    PicoBluetoothHID.end();
 }
 
 void JoystickBT_::button(uint8_t button, bool val) {
@@ -178,7 +178,7 @@ void JoystickBT_::hat(int angle) {
 
 //immediately send an HID report
 void JoystickBT_::send_now(void) {
-    _PicoBluetoothHID.send(REPORT_ID, &data, sizeof(data));
+    PicoBluetoothHID.send(REPORT_ID, &data, sizeof(data));
 }
 
 JoystickBT_ JoystickBT;

libraries/KeyboardBT/src/KeyboardBT.cpp

@@ -38,19 +38,19 @@ KeyboardBT_::KeyboardBT_(void) {
 static const uint8_t desc_keyboard[] = {TUD_HID_REPORT_DESC_KEYBOARD(HID_REPORT_ID(REPORT_ID))};
 void KeyboardBT_::begin(const uint8_t *layout) {
     _asciimap = layout;
-    _PicoBluetoothHID.startHID("PicoW Keyboard 00:00:00:00:00:00", "PicoW HID Keyboard", 0x2540, 33, desc_keyboard, sizeof(desc_keyboard));
+    PicoBluetoothHID.startHID("PicoW Keyboard 00:00:00:00:00:00", "PicoW HID Keyboard", 0x2540, 33, desc_keyboard, sizeof(desc_keyboard));
 }
 
 void KeyboardBT_::end(void) {
-    _PicoBluetoothHID.end();
+    PicoBluetoothHID.end();
 }
 
 void KeyboardBT_::sendReport(KeyReport* keys) {
     hid_keyboard_report_t data;
     data.modifier = keys->modifiers;
     data.reserved = 0;
     memcpy(data.keycode, keys->keys, sizeof(data.keycode));
-    _PicoBluetoothHID.send(REPORT_ID, &data, sizeof(data));
+    PicoBluetoothHID.send(REPORT_ID, &data, sizeof(data));
 }
 
 // press() adds the specified key (printing, non-printing, or modifier)

libraries/MouseBT/src/MouseBT.cpp

@@ -47,11 +47,11 @@ MouseBT_::MouseBT_(void) : _buttons(0) {
 #define REPORT_ID 0x01
 const uint8_t desc_mouse[] = {TUD_HID_REPORT_DESC_MOUSE(HID_REPORT_ID(REPORT_ID))};
 void MouseBT_::begin(void) {
-    _PicoBluetoothHID.startHID("PicoW Mouse 00:00:00:00:00:00", "PicoW HID Mouse", 0x2580, 33, desc_mouse, sizeof(desc_mouse));
+    PicoBluetoothHID.startHID("PicoW Mouse 00:00:00:00:00:00", "PicoW HID Mouse", 0x2580, 33, desc_mouse, sizeof(desc_mouse));
 }
 
 void MouseBT_::end(void) {
-    _PicoBluetoothHID.end();
+    PicoBluetoothHID.end();
 }
 
 void MouseBT_::click(uint8_t b) {
@@ -70,7 +70,7 @@ void MouseBT_::move(int x, int y, signed char wheel) {
     data.y = limit_xy(y);
     data.wheel = wheel;
     data.pan = 0;
-    _PicoBluetoothHID.send(REPORT_ID, &data, sizeof(data));
+    PicoBluetoothHID.send(REPORT_ID, &data, sizeof(data));
 }
 
 void MouseBT_::buttons(uint8_t b) {

libraries/PicoBluetoothHID/keywords.txt

@@ -12,11 +12,15 @@ PicoBluetoothHID	KEYWORD1
 # Methods and Functions (KEYWORD2)
 #######################################
 
-begin	KEYWORD2
-write	KEYWORD2
-press	KEYWORD2
-release	KEYWORD2
-releaseAll	KEYWORD2
+setOpenedCB	KEYWORD2
+setClosedCB	KEYWORD2
+seCanSendNowCB	KEYWORD2
+startHID	KEYWORD2
+connected	KEYWORD2
+send	KEYWORD2
+lockBluetooth	KEYWORD2
+unlockBluetooth	KEYWORD2
+getCID	KEYWORD2
 
 #######################################
 # Constants (LITERAL1)

libraries/PicoBluetoothHID/src/PicoBluetoothHID.cpp

@@ -20,4 +20,4 @@
 
 #include "PicoBluetoothHID.h"
 
-PicoBluetoothHID _PicoBluetoothHID;
+PicoBluetoothHID_ PicoBluetoothHID;

libraries/PicoBluetoothHID/src/PicoBluetoothHID.h

@@ -37,19 +37,19 @@
 #undef HID_REPORT_TYPE_OUTPUT
 #undef HID_REPORT_TYPE_INPUT
 
-class PicoBluetoothHID;
-extern PicoBluetoothHID _PicoBluetoothHID;
+class PicoBluetoothHID_;
+extern PicoBluetoothHID_ PicoBluetoothHID;
 
-class PicoBluetoothHID {
+class PicoBluetoothHID_ {
 public:
-    PicoBluetoothHID() {
+    PicoBluetoothHID_() {
     }
 
-    ~PicoBluetoothHID() {
+    ~PicoBluetoothHID_() {
     }
 
     // Optional callback, not used presently
-    // Usage: _PicoBluetoothHID.setCanSendNowCB(std::bind(&kbd::onCanSendNow, this, std::placeholders::_1, std::placeholders::_2, std::placeholders::_3, std::placeholders::_4));
+    // Usage: PicoBluetoothHID.setCanSendNowCB(std::bind(&kbd::onCanSendNow, this, std::placeholders::_1, std::placeholders::_2, std::placeholders::_3, std::placeholders::_4));
     typedef std::function<void(uint8_t type, uint16_t channel, uint8_t *packet, uint16_t size)> BTCallback;
 
     void setOpenedCB(BTCallback cb) {
@@ -135,7 +135,7 @@ class PicoBluetoothHID {
     }
 
     static void PacketHandlerWrapper(uint8_t packet_type, uint16_t channel, uint8_t *packet, uint16_t packet_size) {
-        _PicoBluetoothHID.packetHandler(packet_type, channel, packet, packet_size);
+        PicoBluetoothHID.packetHandler(packet_type, channel, packet, packet_size);
     }
 
     void packetHandler(uint8_t type, uint16_t channel, uint8_t *packet, uint16_t size) {
@@ -215,7 +215,7 @@ class PicoBluetoothHID {
         _sendReport = rpt;
         _sendReportLen = len;
         lockBluetooth();
-        hid_device_request_can_send_now_event(_PicoBluetoothHID.getCID());
+        hid_device_request_can_send_now_event(getCID());
         unlockBluetooth();
         while (connected() && _needToSend) {
             /* noop busy wait */