More WebUSB sanitiy checks

Author: harbaum

ftduino/libraries/Ftduino/Ftduino.h

@@ -10,9 +10,14 @@
 #include "Arduino.h"
 
 #ifdef IN_FTDUINO_LIB
-#if !defined(OUTPUT_DRIVER_MC33879A) && !defined(OUTPUT_DRIVER_AUTO)
-#error "Only the MC33879A or AUTO output drivers are currently supported!"
-#endif
+  #if !defined(OUTPUT_DRIVER_MC33879A) && !defined(OUTPUT_DRIVER_AUTO)
+    #error "Only the MC33879A or AUTO output drivers are currently supported!"
+  #endif
+#else
+  // make sure WebUSB is being used with correct settings
+  #if USB_VERSION == 0x210 && !defined(WebUSB_h)
+    #error "Please include WebUSB.h if WebUSB is being used!"
+  #endif
 #endif
 
 #define STRINGIFY(name) #name

ftduino/libraries/FtduinoSimple/FtduinoSimple.h

@@ -10,21 +10,26 @@
 #include "Arduino.h"
 
 #ifndef IN_FTDUINO_SIMPLE_LIB
-#if defined(OUTPUT_DRIVER_MC33879A)
-#warning "Building for MC33879A boards only"
-#ifndef MC33879A_ONLY  // user has to define this
-#error "Please select 'Automatic' output driver or define MC33879A_ONLY when using MC33879A output driver."
-#endif
-#elif defined(OUTPUT_DRIVER_TLE94108EL)
-#warning "Building for TLE94108EL boards only"
-#ifndef TLE94108EL_ONLY  // user has to define this
-#error "Please select 'Automatic' output driver or define TLE94108EL_ONLY when using TLE94108EL output driver."
-#endif
-#elif defined(OUTPUT_DRIVER_AUTO)
-// #warning "Building for output auto detection"
+  #if defined(OUTPUT_DRIVER_MC33879A)
+    #warning "Building for MC33879A boards only"
+    #ifndef MC33879A_ONLY  // user has to define this
+      #error "Please select 'Automatic' output driver or define MC33879A_ONLY when using MC33879A output driver."
+    #endif
+  #elif defined(OUTPUT_DRIVER_TLE94108EL)
+    #warning "Building for TLE94108EL boards only"
+    #ifndef TLE94108EL_ONLY  // user has to define this
+      #error "Please select 'Automatic' output driver or define TLE94108EL_ONLY when using TLE94108EL output driver."
+    #endif
+  #elif defined(OUTPUT_DRIVER_AUTO)
+    // #warning "Building for output auto detection"
+  #else
+    #warning "Error, no output driver configured"
+  #endif
 #else
-#warning "Error, no output driver configured"
-#endif
+  // make sure WebUSB is being used with correct settings
+  #if USB_VERSION == 0x210 && !defined(WebUSB_h)
+    #error "Please include WebUSB.h if WebUSB is being used!"
+  #endif
 #endif
 
 class Ftduino {

ftduino/libraries/WebUSB/examples/IoServer/JsonParser.cpp

@@ -4,6 +4,12 @@
 
 // https://www.json.org/json-de.html
 
+#if USB_VERSION == 0x210
+#include <WebUSB.h>
+extern WebUSB WebUSBSerial;
+#define Serial WebUSBSerial
+#endif
+
 #ifdef ARDUINO
 #include <Ftduino.h>
 #else
@@ -14,12 +20,6 @@
 #include <string.h>
 #include "JsonParser.h"
 
-#if USB_VERSION == 0x210
-#include <WebUSB.h>
-extern WebUSB WebUSBSerial;
-#define Serial WebUSBSerial
-#endif
-
 // generic JSON error codes
 #define ERR_UNEXP_STATE  1  // unexpected state
 #define ERR_EXP_OBJ      2  // expecting object