clean up hid_composite example

Author: hathach

.travis.yml

@@ -26,7 +26,7 @@ before_install:
     - source install.sh
 
 install:
-    - arduino --install-library "Adafruit SPIFlash","MIDI Library"
+    - arduino --install-library "Adafruit SPIFlash","MIDI Library","Adafruit seesaw Library"
     - git clone --quiet https://github.com/adafruit/SdFat.git $HOME/Arduino/libraries/SdFat
     - pip3 install --user adafruit-nrfutil
 

examples/Composite/mouse_external_flash/mouse_external_flash.ino

@@ -87,7 +87,7 @@ void loop()
   uint32_t const btn = 1 - digitalRead(pin);
 
   // Remote wakeup
-  if ( tud_suspended() && btn )
+  if ( USBDevice.suspended() && btn )
   {
     // Wake up host if we are in suspend mode
     // and REMOTE_WAKEUP feature is enabled by host

examples/Composite/mouse_ramdisk/mouse_ramdisk.ino

@@ -71,7 +71,7 @@ void loop()
   uint32_t const btn = 1 - digitalRead(pin);
 
   // Remote wakeup
-  if ( tud_suspended() && btn )
+  if ( USBDevice.suspended() && btn )
   {
     // Wake up host if we are in suspend mode
     // and REMOTE_WAKEUP feature is enabled by host

examples/HID/hid_composite/hid_composite.ino

@@ -15,7 +15,21 @@
  * Press button pin will move
  * - mouse toward bottom right of monitor
  * - send 'a' key
+ *
+ * Depending on the board, the button pin
+ * and its active state (when pressed) are different
  */
+#if defined ARDUINO_SAMD_CIRCUITPLAYGROUND_EXPRESS
+  const int pin = 4; // Left Button
+  bool activeState = true;
+#elif defined ARDUINO_NRF52840_FEATHER
+  const int pin = 7; // UserSw
+  bool activeState = false;
+#else
+  const int pin = 12;
+  bool activeState = false;
+#endif
+
 
 // Report ID
 enum
@@ -31,10 +45,9 @@ uint8_t const desc_hid_report[] =
   TUD_HID_REPORT_DESC_MOUSE   ( HID_REPORT_ID(RID_MOUSE), )
 };
 
+// USB HID object
 Adafruit_USBD_HID usb_hid;
 
-const int pin = 7;
-
 // the setup function runs once when you press reset or power the board
 void setup()
 {
@@ -43,12 +56,10 @@ void setup()
 
   usb_hid.begin();
 
-  // Set up button
-  pinMode(pin, INPUT_PULLUP);
+  // Set up button, pullup opposite to active state
+  pinMode(pin, activeState ? INPUT_PULLDOWN : INPUT_PULLUP);
 
   Serial.begin(115200);
-  while ( !Serial ) delay(10);   // wait for native usb
-
   Serial.println("Adafruit TinyUSB HID Composite example");
 }
 
@@ -57,28 +68,25 @@ void loop()
   // poll gpio once each 10 ms
   delay(10);
 
-  // button is active low
-  uint32_t const btn = 1 - digitalRead(pin);
+  // Whether button is pressed
+  bool btn_pressed = (digitalRead(pin) == activeState);
 
   // Remote wakeup
-  if ( tud_suspended() && btn )
+  if ( USBDevice.suspended() && btn_pressed )
   {
     // Wake up host if we are in suspend mode
     // and REMOTE_WAKEUP feature is enabled by host
     USBDevice.remoteWakeup();
   }
 
   /*------------- Mouse -------------*/
-  if ( usb_hid.ready() )
+  if ( usb_hid.ready() && btn_pressed )
   {
-    if ( btn )
-    {
-      int8_t const delta = 5;
-      usb_hid.mouseMove(RID_MOUSE, delta, delta); // right + down
+    int8_t const delta = 5;
+    usb_hid.mouseMove(RID_MOUSE, delta, delta); // right + down
 
-      // delay a bit before attempt to send keyboard report
-      delay(10);
-    }
+    // delay a bit before attempt to send keyboard report
+    delay(10);
   }
 
   /*------------- Keyboard -------------*/
@@ -87,7 +95,7 @@ void loop()
     // use to avoid send multiple consecutive zero report for keyboard
     static bool has_key = false;
 
-    if ( btn )
+    if ( btn_pressed )
     {
       uint8_t keycode[6] = { 0 };
       keycode[0] = HID_KEY_A;

examples/HID/hid_composite_joy_featherwing/hid_composite_joy_featherwing.ino

@@ -81,7 +81,7 @@ void loop()
   if ( (abs(dx) > 3) || (abs(dy) > 30) )
   {
     // Remote wakeup if PC is suspended
-    if ( tud_suspended() )
+    if ( USBDevice.suspended() )
     {
       // Wake up host if we are in suspend mode
       // and REMOTE_WAKEUP feature is enabled by host

examples/HID/hid_keyboard/hid_keyboard.ino

@@ -59,7 +59,7 @@ void loop()
   delay(2);
 
 //  // Remote wakeup
-//  if ( tud_suspended() && btn )
+//  if ( USBDevice.suspended() && btn )
 //  {
 //    // Wake up host if we are in suspend mode
 //    // and REMOTE_WAKEUP feature is enabled by host

examples/HID/hid_mouse/hid_mouse.ino

@@ -61,27 +61,23 @@ void loop()
   // poll gpio once each 10 ms
   delay(10);
 
-  // button is active low
-  uint32_t const btn = digitalRead(pin);
+  // Whether button is pressed
+  bool btn_pressed = (digitalRead(pin) == activeState);
+
+  // nothing to do if button is not pressed
+  if (!btn_pressed) return;
 
   // Remote wakeup
-  if ( tud_suspended() && (btn == activeState) )
+  if ( USBDevice.suspended() )
   {
     // Wake up host if we are in suspend mode
     // and REMOTE_WAKEUP feature is enabled by host
     USBDevice.remoteWakeup();
   }
 
-  /*------------- Mouse -------------*/
   if ( usb_hid.ready() )
   {
-    if ( btn == activeState )
-    {
-      int8_t const delta = 5;
-      usb_hid.mouseMove(0, delta, delta); // no ID: right + down
-
-      // delay a bit before attempt to send keyboard report
-      delay(10);
-    }
+    int8_t const delta = 5;
+    usb_hid.mouseMove(0, delta, delta); // no ID: right + down
   }
 }