Merge pull request #180 from adafruit/fix-webusb-example

Fix webusb example

Author: hathach

docs/examples/webusb-rgb/serial.js

@@ -11,9 +11,11 @@ var serial = {};
 
   serial.requestPort = function() {
     const filters = [
-      { 'vendorId': 0x239A }, // Adafruit boards
-      { 'vendorId': 0xcafe }, // TinyUSB example
-      { 'vendorId': 0x2341 }, // Arduino Nano RP2040 Connect
+      { 'vendorId': 0xcafe }, // TinyUSB
+      { 'vendorId': 0x239a }, // Adafruit
+      { 'vendorId': 0x2e8a }, // Raspberry Pi
+      { 'vendorId': 0x303a }, // Espressif
+      { 'vendorId': 0x2341 }, // Arduino
     ];
     return navigator.usb.requestDevice({ 'filters': filters }).then(
       device => new serial.Port(device)

docs/examples/webusb-serial/application.js

@@ -17,11 +17,17 @@
 
     let currentReceiverLine;
 
-    function appendLine(linesId, text) {
+    function appendLines(linesId, text) {
+      const lines = text.split('\r');
       if (currentReceiverLine) {
-        currentReceiverLine.innerHTML =  currentReceiverLine.innerHTML + text;
+        currentReceiverLine.innerHTML =  currentReceiverLine.innerHTML + lines[0];
+        for (let i = 1; i < lines.length; i++) {
+          currentReceiverLine = addLine(linesId, lines[i]);
+        }
       } else {
-        currentReceiverLine = addLine(linesId, text);
+        for (let i = 0; i < lines.length; i++) {
+          currentReceiverLine = addLine(linesId, lines[i]);
+        }
       }
     }
 
@@ -36,7 +42,7 @@
           if (data.getInt8() === 13) {
             currentReceiverLine = null;
           } else {
-            appendLine('receiver_lines', textDecoder.decode(data));
+            appendLines('receiver_lines', textDecoder.decode(data));
           }
         };
         port.onReceiveError = error => {

docs/examples/webusb-serial/index.html

@@ -30,4 +30,4 @@ <h1>TinyUSB - WebUSB Serial Example</h1>
       </div>
     </div>
   </body>
-</html>
+</html>

docs/examples/webusb-serial/serial.js

@@ -11,9 +11,11 @@ var serial = {};
 
   serial.requestPort = function() {
     const filters = [
-      { 'vendorId': 0x239A }, // Adafruit boards
-      { 'vendorId': 0xcafe }, // TinyUSB example
-      { 'vendorId': 0x2341 }, // Arduino Nano RP2040 Connect
+      { 'vendorId': 0xcafe }, // TinyUSB
+      { 'vendorId': 0x239a }, // Adafruit
+      { 'vendorId': 0x2e8a }, // Raspberry Pi
+      { 'vendorId': 0x303a }, // Espressif
+      { 'vendorId': 0x2341 }, // Arduino
     ];
     return navigator.usb.requestDevice({ 'filters': filters }).then(
       device => new serial.Port(device)

examples/WebUSB/webusb_rgb/webusb_rgb.ino

@@ -50,7 +50,8 @@ Adafruit_NeoPixel pixels = Adafruit_NeoPixel(NEOPIXEL_NUM, PIN_NEOPIXEL, NEO_GRB
 Adafruit_USBD_WebUSB usb_web;
 
 // Landing Page: scheme (0: http, 1: https), url
-WEBUSB_URL_DEF(landingPage, 1 /*https*/, "adafruit.github.io/Adafruit_TinyUSB_Arduino/examples/webusb-rgb/index.html");
+// Page source can be found at https://github.com/hathach/tinyusb-webusb-page/tree/main/webusb-rgb
+WEBUSB_URL_DEF(landingPage, 1 /*https*/, "example.tinyusb.org/webusb-rgb/index.html");
 
 // the setup function runs once when you press reset or power the board
 void setup()

examples/WebUSB/webusb_serial/webusb_serial.ino

@@ -31,7 +31,8 @@
 Adafruit_USBD_WebUSB usb_web;
 
 // Landing Page: scheme (0: http, 1: https), url
-WEBUSB_URL_DEF(landingPage, 1 /*https*/, "adafruit.github.io/Adafruit_TinyUSB_Arduino/examples/webusb-serial/index.html");
+// Page source can be found at https://github.com/hathach/tinyusb-webusb-page/tree/main/webusb-serial
+WEBUSB_URL_DEF(landingPage, 1 /*https*/, "example.tinyusb.org/webusb-serial/index.html");
 
 int led_pin = LED_BUILTIN;
 
@@ -60,27 +61,52 @@ void setup()
 }
 
 // function to echo to both Serial and WebUSB
-void echo_all(char chr)
+void echo_all(uint8_t buf[], uint32_t count)
 {
-  Serial.write(chr);
-  // print extra newline for Serial
-  if ( chr == '\r' ) Serial.write('\n');
-  
-  usb_web.write(chr);
+  if (usb_web.connected())
+  {
+    usb_web.write(buf, count);
+    usb_web.flush();
+  }
+
+  if ( Serial )
+  {
+    for(uint32_t i=0; i<count; i++)
+    {
+      Serial.write(buf[i]);
+      if ( buf[i] == '\r' ) Serial.write('\n');
+    }
+    Serial.flush();
+  }
 }
 
 void loop()
 {
-  // from WebUSB to both Serial & webUSB
-  if (usb_web.available()) echo_all(usb_web.read());
+  uint8_t buf[64];
+  uint32_t count;
 
   // From Serial to both Serial & webUSB
-  if (Serial.available())   echo_all(Serial.read());  
+  if (Serial.available())
+  {
+    count = Serial.read(buf, 64);
+    echo_all(buf, count);
+  }
+
+  // from WebUSB to both Serial & webUSB
+  if (usb_web.available())
+  {
+    count = usb_web.read(buf, 64);
+    echo_all(buf, count);
+  }
 }
 
 void line_state_callback(bool connected)
 {
   digitalWrite(led_pin, connected);
 
-  if ( connected ) usb_web.println("TinyUSB WebUSB Serial example");
+  if ( connected )
+  {
+    usb_web.println("WebUSB interface connected !!");
+    usb_web.flush();
+  }
 }

src/arduino/webusb/Adafruit_USBD_WebUSB.cpp

@@ -239,6 +239,10 @@ int Adafruit_USBD_WebUSB::read(void) {
   return tud_vendor_read(&ch, 1) ? (int)ch : -1;
 }
 
+size_t Adafruit_USBD_WebUSB::read(uint8_t *buffer, size_t size) {
+  return tud_vendor_read(buffer, size);
+}
+
 size_t Adafruit_USBD_WebUSB::write(uint8_t b) { return this->write(&b, 1); }
 
 size_t Adafruit_USBD_WebUSB::write(const uint8_t *buffer, size_t size) {
@@ -262,7 +266,7 @@ int Adafruit_USBD_WebUSB::peek(void) {
   return tud_vendor_peek(&ch) ? (int)ch : -1;
 }
 
-void Adafruit_USBD_WebUSB::flush(void) {}
+void Adafruit_USBD_WebUSB::flush(void) { tud_vendor_flush(); }
 
 //--------------------------------------------------------------------+
 // TinyUSB stack callbacks

src/arduino/webusb/Adafruit_USBD_WebUSB.h

@@ -46,10 +46,13 @@ class Adafruit_USBD_WebUSB : public Stream, public Adafruit_USBD_Interface {
   bool setLandingPage(const void *url);
   void setLineStateCallback(linestate_callback_t fp);
 
-  // Stream interface to use with MIDI Library
-  virtual int read(void);
+  // Stream API
   virtual int available(void);
   virtual int peek(void);
+
+  virtual int read(void);
+  size_t read(uint8_t *buffer, size_t size);
+
   virtual void flush(void);
   virtual size_t write(uint8_t b);