From e47fc9b25e30f339018080e984995b30fd2f052c Mon Sep 17 00:00:00 2001 From: Dean Blackketter Date: Sat, 4 Jun 2016 13:48:45 -0700 Subject: [PATCH 1/2] Rearrange to a a more typical Arduino library layout. --- library/WebUSB/WebUSB.cpp => WebUSB.cpp | 0 library/WebUSB/WebUSB.h => WebUSB.h | 0 {demos => examples}/console/console.js | 0 {demos => examples}/console/hterm_all.js | 0 {demos => examples}/console/index.html | 0 {demos => examples}/console/sketch/sketch.ino | 0 {demos => examples}/index.html | 0 {demos => examples}/rgb/index.html | 0 {demos => examples}/rgb/rgb.js | 0 {demos => examples}/rgb/sketch/sketch.ino | 0 {demos => examples}/serial.js | 0 library/WebUSB/keywords.txt => keywords.txt | 0 library/WebUSB/library.properties => library.properties | 0 13 files changed, 0 insertions(+), 0 deletions(-) rename library/WebUSB/WebUSB.cpp => WebUSB.cpp (100%) rename library/WebUSB/WebUSB.h => WebUSB.h (100%) rename {demos => examples}/console/console.js (100%) rename {demos => examples}/console/hterm_all.js (100%) rename {demos => examples}/console/index.html (100%) rename {demos => examples}/console/sketch/sketch.ino (100%) rename {demos => examples}/index.html (100%) rename {demos => examples}/rgb/index.html (100%) rename {demos => examples}/rgb/rgb.js (100%) rename {demos => examples}/rgb/sketch/sketch.ino (100%) rename {demos => examples}/serial.js (100%) rename library/WebUSB/keywords.txt => keywords.txt (100%) rename library/WebUSB/library.properties => library.properties (100%) diff --git a/library/WebUSB/WebUSB.cpp b/WebUSB.cpp similarity index 100% rename from library/WebUSB/WebUSB.cpp rename to WebUSB.cpp diff --git a/library/WebUSB/WebUSB.h b/WebUSB.h similarity index 100% rename from library/WebUSB/WebUSB.h rename to WebUSB.h diff --git a/demos/console/console.js b/examples/console/console.js similarity index 100% rename from demos/console/console.js rename to examples/console/console.js diff --git a/demos/console/hterm_all.js b/examples/console/hterm_all.js similarity index 100% rename from demos/console/hterm_all.js rename to examples/console/hterm_all.js diff --git a/demos/console/index.html b/examples/console/index.html similarity index 100% rename from demos/console/index.html rename to examples/console/index.html diff --git a/demos/console/sketch/sketch.ino b/examples/console/sketch/sketch.ino similarity index 100% rename from demos/console/sketch/sketch.ino rename to examples/console/sketch/sketch.ino diff --git a/demos/index.html b/examples/index.html similarity index 100% rename from demos/index.html rename to examples/index.html diff --git a/demos/rgb/index.html b/examples/rgb/index.html similarity index 100% rename from demos/rgb/index.html rename to examples/rgb/index.html diff --git a/demos/rgb/rgb.js b/examples/rgb/rgb.js similarity index 100% rename from demos/rgb/rgb.js rename to examples/rgb/rgb.js diff --git a/demos/rgb/sketch/sketch.ino b/examples/rgb/sketch/sketch.ino similarity index 100% rename from demos/rgb/sketch/sketch.ino rename to examples/rgb/sketch/sketch.ino diff --git a/demos/serial.js b/examples/serial.js similarity index 100% rename from demos/serial.js rename to examples/serial.js diff --git a/library/WebUSB/keywords.txt b/keywords.txt similarity index 100% rename from library/WebUSB/keywords.txt rename to keywords.txt diff --git a/library/WebUSB/library.properties b/library.properties similarity index 100% rename from library/WebUSB/library.properties rename to library.properties From 80454bb0479f143160b6f119896adbace8ab1eb5 Mon Sep 17 00:00:00 2001 From: Dean Blackketter Date: Sat, 4 Jun 2016 14:13:55 -0700 Subject: [PATCH 2/2] Update README.md for new file layout --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 90ae0dc..dc031df 100644 --- a/README.md +++ b/README.md @@ -24,10 +24,10 @@ Getting Started 4. The WebUSB library provides all the extra low-level USB code necessary for WebUSB support except for one thing: Your device must be upgraded from USB 2.0 to USB 2.1. To do this go into the SDK installation directory and open `hardware/arduino/avr/cores/arduino/USBCore.h`. Then find the definition of the `D_DEVICE` macro and change `0x200` to `0x210`. That's it! -5. Copy (or symlink) the `library/WebUSB` directory from this repository into the `libraries` folder in your sketchbooks directory. +5. Clone or unzip this repository into the `libraries` folder in your sketchbooks directory. 6. Launch the Arduino SDK. You should see "WebUSB" as an option under "Sketch > Include Library". -7. Load up `demos/rgb/sketch/sketch.ino` and program it to your device. +7. Load up "Files > Examples > WebUSB > rgb > sketch" and program it to your device. 8. When the sketch is finished uploading you should see a notification from Chrome: "Go to webusb.github.io/arduino/demos/ to connect." Try it out!