diff options
| author | hathach <[email protected]> | 2013-09-23 01:12:59 +0700 |
|---|---|---|
| committer | hathach <[email protected]> | 2013-09-23 01:12:59 +0700 |
| commit | c4fef827b1f6cb33b9cc336687bd4ff791f8eec9 (patch) | |
| tree | a58599d82e2a03b593db76bc5fc8dad83f4c407e | |
| parent | 85f3ad9d3becf277400ec6c865281ada43ae19a4 (diff) | |
refractor, add wheel for mouse demo
| -rw-r--r-- | demos/host/src/mouse_app.c | 11 | ||||
| -rw-r--r-- | demos/host/src/msc_app.c | 7 | ||||
| -rw-r--r-- | tinyusb/class/hid.h | 6 |
3 files changed, 14 insertions, 10 deletions
diff --git a/demos/host/src/mouse_app.c b/demos/host/src/mouse_app.c index 32596e9e2..af0dfc834 100644 --- a/demos/host/src/mouse_app.c +++ b/demos/host/src/mouse_app.c @@ -143,12 +143,17 @@ static inline void process_mouse_report(tusb_mouse_report_t const * p_report) { // example only display button pressed, ignore hold & dragging etc printf(" %c%c%c ", - p_report->buttons & HID_MOUSEBUTTON_LEFT ? 'L' : '-', - p_report->buttons & HID_MOUSEBUTTON_MIDDLE ? 'M' : '-', - p_report->buttons & HID_MOUSEBUTTON_RIGHT ? 'R' : '-'); + p_report->buttons & MOUSE_BUTTON_LEFT ? 'L' : '-', + p_report->buttons & MOUSE_BUTTON_MIDDLE ? 'M' : '-', + p_report->buttons & MOUSE_BUTTON_RIGHT ? 'R' : '-'); } //------------- movement (disabled for clearer demo) -------------// + if ( p_report->wheel != 0 ) + { + printf(" %c ", p_report->wheel > 0 ? 'U' : 'D'); + } + // if ( p_report->x != 0 || p_report->y != 0 ) // { // printf(" (%d, %d) ", p_report->x, p_report->y); diff --git a/demos/host/src/msc_app.c b/demos/host/src/msc_app.c index abd53a1d9..76b53147f 100644 --- a/demos/host/src/msc_app.c +++ b/demos/host/src/msc_app.c @@ -66,18 +66,17 @@ void tusbh_msc_mounted_cb(uint8_t dev_addr) uint8_t const* p_vendor = tusbh_msc_get_vendor_name(dev_addr); uint8_t const* p_product = tusbh_msc_get_product_name(dev_addr); - printf("Vendor Name: "); + printf("Name: "); for(uint8_t i=0; i<8; i++) putchar(p_vendor[i]); - putchar('\n'); - printf("Product Name: "); + printf(" "); for(uint8_t i=0; i<16; i++) putchar(p_product[i]); putchar('\n'); uint32_t last_lba, block_size; tusbh_msc_get_capacity(dev_addr, &last_lba, &block_size); printf("Disk Size: %d MB\n", (last_lba+1)/ ((1024*1024)/block_size) ); - printf("LBA 0-0x%X, Block Size: %d\n", last_lba, block_size); + printf("LBA 0-0x%X Block Size: %d\n", last_lba, block_size); } //--------------------------------------------------------------------+ diff --git a/tinyusb/class/hid.h b/tinyusb/class/hid.h index e68d1596f..3c550cd3e 100644 --- a/tinyusb/class/hid.h +++ b/tinyusb/class/hid.h @@ -125,9 +125,9 @@ typedef ATTR_PACKED_STRUCT(struct) * \brief buttons codes for HID mouse */ enum { - HID_MOUSEBUTTON_LEFT = BIT_(0), - HID_MOUSEBUTTON_RIGHT = BIT_(1), - HID_MOUSEBUTTON_MIDDLE = BIT_(2) + MOUSE_BUTTON_LEFT = BIT_(0), + MOUSE_BUTTON_RIGHT = BIT_(1), + MOUSE_BUTTON_MIDDLE = BIT_(2) }; /** |