fix hid re-definition with blehid

Author: hathach

libraries/Bluefruit52Lib/src/services/BLEHidAdafruit.cpp

@@ -267,8 +267,8 @@ bool BLEHidAdafruit::keyPress(uint16_t conn_hdl, char ch)
   hid_keyboard_report_t report;
   varclr(&report);
 
-  report.modifier = ( HID_ASCII_TO_KEYCODE[(uint8_t)ch].shift ) ? KEYBOARD_MODIFIER_LEFTSHIFT : 0;
-  report.keycode[0] = HID_ASCII_TO_KEYCODE[(uint8_t)ch].keycode;
+  report.modifier = ( hid_ascii_to_keycode[(uint8_t)ch].shift ) ? KEYBOARD_MODIFIER_LEFTSHIFT : 0;
+  report.keycode[0] = hid_ascii_to_keycode[(uint8_t)ch].keycode;
 
   return keyboardReport(conn_hdl, &report);
 }
@@ -345,7 +345,7 @@ bool BLEHidAdafruit::mouseReport(uint16_t conn_hdl, uint8_t buttons, int8_t x, i
       .x       = x,
       .y       = y,
       .wheel   = wheel,
-      .pan     = pan
+//      .pan     = pan
   };
 
   _mse_buttons = buttons;

libraries/Bluefruit52Lib/src/services/BLEHidGeneric.cpp

@@ -286,7 +286,7 @@ bool BLEHidGeneric::bootMouseReport(void const* data, int len)
 /*------------------------------------------------------------------*/
 /* Ascii to Keycode
  *------------------------------------------------------------------*/
-const hid_ascii_to_keycode_entry_t HID_ASCII_TO_KEYCODE[128] =
+const hid_ascii_to_keycode_entry_t hid_ascii_to_keycode[128] =
 {
     {0, 0                     }, // 0x00 Null
     {0, 0                     }, // 0x01
@@ -424,7 +424,7 @@ const hid_ascii_to_keycode_entry_t HID_ASCII_TO_KEYCODE[128] =
 /*------------------------------------------------------------------*/
 /* Keycode to Ascii
  *------------------------------------------------------------------*/
-const hid_keycode_to_ascii_t HID_KEYCODE_TO_ASCII[128] =
+const hid_keycode_to_ascii_t hid_keycode_to_ascii[128] =
 {
     {0     , 0      }, // 0x00
     {0     , 0      }, // 0x01