From b8224d25deb92f93e256c4c6212fd3f4da256e17 Mon Sep 17 00:00:00 2001
From: Ben Blazak <benblazak.dev@gmail.com>
Date: Sun, 15 Jul 2012 17:16:15 -0700
Subject: [PATCH] updated USB vendor and product IDs

---
 src/TODO                                       | 11 +++++++++++
 src/lib-other/pjrc/usb_keyboard/usb_keyboard.c |  8 ++++----
 src/lib/usb/TODO.c                             |  2 ++
 3 files changed, 17 insertions(+), 4 deletions(-)
 create mode 100644 src/TODO

diff --git a/src/TODO b/src/TODO
new file mode 100644
index 0000000..c9528a6
--- /dev/null
+++ b/src/TODO
@@ -0,0 +1,11 @@
+-+ set USB vendor ID  = 0x1d50  // Openmoko, Inc.
+-+ set USB product ID = 0x6028  // ErgoDox ergonomic keyboard
+
+- link to the [ErgoDox website] (http://ergodox.org/) in toplevel readme.md
+
+- update licence.md with "except when otherwise noted" or something similar, to
+  reflect the fact that i have code (in src/lib, and contrib) under different
+  licences, with different authors
+
+- make new branch and update for fredrick's new PCB (pre-prototype)
+
diff --git a/src/lib-other/pjrc/usb_keyboard/usb_keyboard.c b/src/lib-other/pjrc/usb_keyboard/usb_keyboard.c
index 46e1b20..6bbd298 100644
--- a/src/lib-other/pjrc/usb_keyboard/usb_keyboard.c
+++ b/src/lib-other/pjrc/usb_keyboard/usb_keyboard.c
@@ -34,16 +34,16 @@
  **************************************************************************/
 
 // You can change these to give your code its own name.
-#define STR_MANUFACTURER	L"MfgName"
-#define STR_PRODUCT		L"Keyboard"
+#define STR_MANUFACTURER	L"unspecified"  // TODO
+#define STR_PRODUCT		L"ErgoDox ergonomic 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		0x047C
+#define VENDOR_ID		0x1d50  // Openmoko, Inc.
+#define PRODUCT_ID		0x6028  // ErgoDox ergonomic keyboard
 
 
 // USB devices are supposed to implment a halt feature, which is
diff --git a/src/lib/usb/TODO.c b/src/lib/usb/TODO.c
index c0759df..3d7e0d5 100644
--- a/src/lib/usb/TODO.c
+++ b/src/lib/usb/TODO.c
@@ -39,6 +39,8 @@
 
 // TODO
 // - read the hid device class definition .pdf
+// - set USB vendor  ID = 0x1d50  // Openmoko, Inc.
+//       USB product ID = 0x6028  // ErgoDox ergonomic keyboard
 
 // DONE
 // - read the hid usage tables .pdf