CMake generated strings that configure the USB info section

[kiibohd-controller.git] / USB / pjrc / usb_com.h

diff --git a/USB/pjrc/usb_com.h b/USB/pjrc/usb_com.h
index db47095d36212063d203d6355353dc203a30f23b..f62e90c8c517010a0c19fc4b7e25ba972130b01d 100644 (file)
--- a/USB/pjrc/usb_com.h
+++ b/USB/pjrc/usb_com.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 2011 by Jacob Alexander
+/* Copyright (C) 2013 by Jacob Alexander
  * 
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -28,6 +28,7 @@
 #include <stdint.h>
 
 // Local Includes
+#include <buildvars.h> // Defines USB Parameters, partially generated by CMake
 
 
 
@@ -37,19 +38,6 @@
 #define USB_MAX_KEY_SEND 6
 
 
-// You can change these to give your code its own name.
-#define STR_MANUFACTURER       L"MfgName"
-#define STR_PRODUCT            L"Keyboard"
-
-
-// Mac OS-X and Linux automatically load the correct drivers.  On
-// Windows, even though the driver is supplied by Microsoft, an
-// INF file is needed to load the driver.  These numbers need to
-// match the INF file.
-#define VENDOR_ID              0x16C0
-#define PRODUCT_ID             0x047D
-
-
 
 // ----- Variables -----
 
@@ -58,8 +46,14 @@ extern                       uint8_t USBKeys_Modifiers;
 extern                       uint8_t USBKeys_Array[USB_MAX_KEY_SEND];
 extern                       uint8_t USBKeys_Sent;
 extern volatile              uint8_t USBKeys_LEDs;
+
                 static const uint8_t USBKeys_MaxSize = USB_MAX_KEY_SEND;
 
+// Misc variables (XXX Some are only properly utilized using AVR)
+extern                       uint8_t USBKeys_Protocol;
+extern                       uint8_t USBKeys_Idle_Config;
+extern                       uint8_t USBKeys_Idle_Count;
+
 
 
 // ----- Functions -----