andy/tinyUSB
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

rename tuh_device_is_configured() to tuh_device_configured()

Browse Source 
- remove tuh_device_get_state()
- more hid mouse clean up
This commit is contained in:
hathach
2021-05-12 21:40:17 +07:00
parent 69defb5edc
commit b7a8b278c8
6 changed files with 42 additions and 97 deletions
Download Patch File Download Diff File Expand all files Collapse all files

59
examples/host/cdc_msc_hid/src/keyboard_helper.h
View File

@@ -1,59 +0,0 @@
#ifndef KEYBOARD_HELPER_H
#define KEYBAORD_HELPER_H
#include <stdbool.h>
#include <stdint.h>
#include "tusb.h"
// look up new key in previous keys
inline bool find_key_in_report(hid_keyboard_report_t const *p_report, uint8_t keycode)
{
for(uint8_t i = 0; i < 6; i++)
{
if (p_report->keycode[i] == keycode) return true;
}
return false;
}
inline uint8_t keycode_to_ascii(uint8_t modifier, uint8_t keycode)
{
return keycode > 128 ? 0 :
hid_keycode_to_ascii_tbl [keycode][modifier & (KEYBOARD_MODIFIER_LEFTSHIFT | KEYBOARD_MODIFIER_RIGHTSHIFT) ? 1 : 0];
}
void print_kbd_report(hid_keyboard_report_t *prev_report, hid_keyboard_report_t const *new_report)
{
printf("Report: ");
uint8_t c;
// I assume it's possible to have up to 6 keypress events per report?
for (uint8_t i = 0; i < 6; i++)
{
// Check for key presses
if (new_report->keycode[i])
{
// If not in prev report then it is newly pressed
if ( !find_key_in_report(prev_report, new_report->keycode[i]) )
c = keycode_to_ascii(new_report->modifier, new_report->keycode[i]);
printf("press %c ", c);
}
// Check for key depresses (i.e. was present in prev report but not here)
if (prev_report->keycode[i])
{
// If not present in the current report then depressed
if (!find_key_in_report(new_report, prev_report->keycode[i]))
{
c = keycode_to_ascii(prev_report->modifier, prev_report->keycode[i]);
printf("depress %c ", c);
}
}
}
printf("\n");
}
#endif

12
examples/host/cdc_msc_hid/src/main.c
View File

@@ -156,16 +156,18 @@ static inline void process_kbd_report(hid_keyboard_report_t const *p_new_report)
void tuh_hid_mounted_cb(uint8_t dev_addr, uint8_t instance)
{
// application set-up
printf("A Keyboard device (address %d) is mounted\r\n", dev_addr);
printf("HID device address = %d, instance = %d is mounted\r\n", dev_addr, instance);
// printf("A Keyboard device (address %d) is mounted\r\n", dev_addr);
if (instance == 0) {
tuh_hid_keyboard_get_report(dev_addr, &usb_keyboard_report);
}
}
void tuh_hid_unmounted_cb(uint8_t dev_addr, uint8_t instance)
{
// application tear-down
printf("A Keyboard device (address %d) is unmounted\r\n", dev_addr);
printf("HID device address = %d, instance = %d is unmounted\r\n", dev_addr, instance);
// printf("A Keyboard device (address %d) is unmounted\r\n", dev_addr);
}
#endif
@@ -255,7 +257,7 @@ void hid_task(void)
#endif
#if CFG_TUH_HID_MOUSE
if ( tuh_hid_mouse_mounted(addr) )
if ( tuh_n_hid_n_mouse_mounted(addr, 0) )
{
if ( !tuh_hid_mouse_is_busy(addr) )
{