Phone uses USB endpoints 4 to 6 instead of 1 to 3 now
diff --git a/sam3s_example/simtrace/simtrace.h b/sam3s_example/simtrace/simtrace.h
index c6a8bc1..3851123 100644
--- a/sam3s_example/simtrace/simtrace.h
+++ b/sam3s_example/simtrace/simtrace.h
@@ -8,13 +8,9 @@
#define BUFLEN 5
-//#define PHONE_DATAOUT 4
-//#define PHONE_DATAIN 5
-//#define PHONE_INT 6
-
-#define PHONE_DATAOUT 1
-#define PHONE_DATAIN 2
-#define PHONE_INT 3
+#define PHONE_DATAOUT 4
+#define PHONE_DATAIN 5
+#define PHONE_INT 6
typedef struct ring_buffer
{
diff --git a/sam3s_example/simtrace/usb.c b/sam3s_example/simtrace/usb.c
index 5d5ec06..48b2b5d 100644
--- a/sam3s_example/simtrace/usb.c
+++ b/sam3s_example/simtrace/usb.c
@@ -365,7 +365,7 @@
USBGenericDescriptor_INTERFACE,
0, /* This is interface #0 */
0, /* This is alternate setting #0 for this interface */
- 4, /* Number of endpoints */
+ 3, /* Number of endpoints */
0xff, /* Descriptor Class: Vendor specific */
0, /* No subclass */
0, /* No l */
diff --git a/usb_application/phone.py b/usb_application/phone.py
index a771747..0a0c08e 100755
--- a/usb_application/phone.py
+++ b/usb_application/phone.py
@@ -102,21 +102,16 @@
try:
state = handle_msg_funcs[WAIT_RST](dev)
except usb.USBError as e:
- print e
+ print(e)
state = handle_msg_funcs[state](dev)
return state
INS = 1
CNT = 4
-#PHONE_DATAOUT = 0x04
-#PHONE_DATAIN = 0x85
-#PHONE_INT = 0x86
-
-
-PHONE_DATAOUT = 0x01
-PHONE_DATAIN = 0x82
-PHONE_INT = 0x83
+PHONE_DATAOUT = 0x04
+PHONE_DATAIN = 0x85
+PHONE_INT = 0x86
def send_response(dev, cmd):
# FIXME: We could get data of length 5 as well! Implement another distinct criteria!