mirror/tinyusb
1
0
Fork 0
mirror of https://github.com/hathach/tinyusb.git synced 2025-02-20 18:40:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

refractor device mouse app to use board_buttons

Browse Source
This commit is contained in:
hathach 2014-03-06 23:48:44 +07:00
parent 4b8c0d97c6
commit 26b1b879dd
3 changed files with 19 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
demos/device/src/keyboardd_app.c
View File

@ -54,14 +54,12 @@ OSAL_TASK_DEF(keyboardd_app_task, 128, KEYBOARDD_APP_TASK_PRIO);
ATTR_USB_MIN_ALIGNMENT hid_keyboard_report_t keyboard_report TUSB_CFG_ATTR_USBRAM; ATTR_USB_MIN_ALIGNMENT hid_keyboard_report_t keyboard_report TUSB_CFG_ATTR_USBRAM;
static uint8_t keyboardd_report_count; // number of reports sent each mounted
//--------------------------------------------------------------------+ //--------------------------------------------------------------------+
// tinyusb Callbacks // tinyusb Callbacks
//--------------------------------------------------------------------+ //--------------------------------------------------------------------+
void tusbd_hid_keyboard_mounted_cb(uint8_t coreid) void tusbd_hid_keyboard_mounted_cb(uint8_t coreid)
{ {
keyboardd_report_count = 0;
} }
void tusbd_hid_keyboard_unmounted_cb(uint8_t coreid) void tusbd_hid_keyboard_unmounted_cb(uint8_t coreid)
@ -135,7 +133,7 @@ OSAL_TASK_FUNCTION( keyboardd_app_task ) (void* p_task_para)
uint32_t new_button_mask = board_buttons(); uint32_t new_button_mask = board_buttons();
//------------- Key pressed -------------// //------------- button pressed -------------//
if ( (button_mask != new_button_mask) && !tusbd_hid_keyboard_is_busy(0) ) if ( (button_mask != new_button_mask) && !tusbd_hid_keyboard_is_busy(0) )
{ {
button_mask = new_button_mask; button_mask = new_button_mask;

26
demos/device/src/moused_app.c
View File

@ -54,14 +54,12 @@ OSAL_TASK_DEF(moused_app_task, 128, MOUSED_APP_TASK_PRIO);
ATTR_USB_MIN_ALIGNMENT hid_mouse_report_t mouse_report TUSB_CFG_ATTR_USBRAM; ATTR_USB_MIN_ALIGNMENT hid_mouse_report_t mouse_report TUSB_CFG_ATTR_USBRAM;
static uint8_t moused_report_count; // number of reports sent each mounted
//--------------------------------------------------------------------+ //--------------------------------------------------------------------+
// tinyusb Callbacks // tinyusb Callbacks
//--------------------------------------------------------------------+ //--------------------------------------------------------------------+
void tusbd_hid_mouse_mounted_cb(uint8_t coreid) void tusbd_hid_mouse_mounted_cb(uint8_t coreid)
{ {
moused_report_count = 0;
} }
void tusbd_hid_mouse_unmounted_cb(uint8_t coreid) void tusbd_hid_mouse_unmounted_cb(uint8_t coreid)
@ -90,8 +88,7 @@ uint16_t tusbd_hid_mouse_get_report_cb(uint8_t coreid, hid_request_report_type_t
void tusbd_hid_mouse_set_report_cb(uint8_t coreid, hid_request_report_type_t report_type, uint8_t report_data[], uint16_t length) void tusbd_hid_mouse_set_report_cb(uint8_t coreid, hid_request_report_type_t report_type, uint8_t report_data[], uint16_t length)
{ {
// mouse demo does not support set report --> return 0 will result in rejecting (STALL) this request // mouse demo does not support set report --> do nothing
return 0;
} }
//--------------------------------------------------------------------+ //--------------------------------------------------------------------+
// APPLICATION CODE // APPLICATION CODE
@ -105,18 +102,25 @@ OSAL_TASK_FUNCTION( moused_app_task ) (void* p_task_para)
{ {
OSAL_TASK_LOOP_BEGIN OSAL_TASK_LOOP_BEGIN
// only send 5 reports osal_task_delay(100);
if (tusbd_is_configured(0) && (moused_report_count++ < 5) )
if ( tusbd_is_configured(0) )
{ {
if ( !tusbd_hid_mouse_is_busy(0) ) static uint32_t button_mask = 0;
uint32_t new_button_mask = board_buttons();
//------------- button pressed -------------//
if ( (button_mask != new_button_mask) && !tusbd_hid_mouse_is_busy(0) )
{ {
mouse_report.x = mouse_report.y = 20; button_mask = new_button_mask;
mouse_report.x = mouse_report.y = BIT_TEST_(button_mask, 0) ? 10 : 0;
tusbd_hid_mouse_send(0, &mouse_report ); tusbd_hid_mouse_send(0, &mouse_report );
} }
} }
osal_task_delay(1000);
OSAL_TASK_LOOP_END OSAL_TASK_LOOP_END
} }

4
demos/device/src/tusb_config.h
View File

@ -82,8 +82,8 @@
#define TUSB_CFG_DEVICE_FULLSPEED 1 // TODO refractor, remove #define TUSB_CFG_DEVICE_FULLSPEED 1 // TODO refractor, remove
//------------- CLASS -------------// //------------- CLASS -------------//
#define TUSB_CFG_DEVICE_HID_KEYBOARD 1 #define TUSB_CFG_DEVICE_HID_KEYBOARD 0
#define TUSB_CFG_DEVICE_HID_MOUSE 0 #define TUSB_CFG_DEVICE_HID_MOUSE 1
#define TUSB_CFG_DEVICE_HID_GENERIC 0 #define TUSB_CFG_DEVICE_HID_GENERIC 0
#define TUSB_CFG_DEVICE_MSC 0 #define TUSB_CFG_DEVICE_MSC 0
#define TUSB_CFG_DEVICE_CDC 0 #define TUSB_CFG_DEVICE_CDC 0