Skip to content

Commit 7796572

Browse files
stephenpaulgerstephenpaulger
committed
Merge branch 'master' into ds5_exporter
2 parents a27dae0 + 50d8cb0 commit 7796572

File tree

177 files changed

+5001
-8533
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

177 files changed

+5001
-8533
lines changed

‎.gitignore

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,11 @@
11
*.py[cod]
22

3+
# Distribution dir
4+
dist
5+
6+
# MANIFEST file
7+
MANIFEST
8+
39
# Private settings
410
private_settings.py
511

@@ -53,4 +59,4 @@ uVision Project/
5359
debug.log
5460

5561
# Ignore OS X Desktop Services Store files
56-
.DS_Store
62+
.DS_Store

‎MANIFEST

Lines changed: 96 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,96 @@
1+
# file GENERATED by distutils, do NOT edit
2+
LICENSE
3+
setup.py
4+
workspace_tools/__init__.py
5+
workspace_tools/__init__.pyc
6+
workspace_tools/autotest.py
7+
workspace_tools/build.py
8+
workspace_tools/build_api.py
9+
workspace_tools/build_release.py
10+
workspace_tools/client.py
11+
workspace_tools/export_test.py
12+
workspace_tools/hooks.py
13+
workspace_tools/libraries.py
14+
workspace_tools/make.py
15+
workspace_tools/options.py
16+
workspace_tools/patch.py
17+
workspace_tools/paths.py
18+
workspace_tools/project.py
19+
workspace_tools/server.py
20+
workspace_tools/settings.py
21+
workspace_tools/size.py
22+
workspace_tools/syms.py
23+
workspace_tools/synch.py
24+
workspace_tools/targets.py
25+
workspace_tools/tests.py
26+
workspace_tools/utils.py
27+
workspace_tools/data/__init__.py
28+
workspace_tools/data/example_test_spec.json
29+
workspace_tools/data/support.py
30+
workspace_tools/data/rpc/RPCClasses.h
31+
workspace_tools/data/rpc/class.cpp
32+
workspace_tools/dev/__init__.py
33+
workspace_tools/dev/dsp_fir.py
34+
workspace_tools/dev/rpc_classes.py
35+
workspace_tools/export/__init__.py
36+
workspace_tools/export/codered.py
37+
workspace_tools/export/codered_lpc1768_cproject.tmpl
38+
workspace_tools/export/codered_lpc1768_project.tmpl
39+
workspace_tools/export/codered_lpc4088_cproject.tmpl
40+
workspace_tools/export/codered_lpc4088_project.tmpl
41+
workspace_tools/export/codesourcery.py
42+
workspace_tools/export/codesourcery_lpc1768.tmpl
43+
workspace_tools/export/ds5_5.py
44+
workspace_tools/export/ds5_5_lpc11u24.cproject.tmpl
45+
workspace_tools/export/ds5_5_lpc11u24.launch.tmpl
46+
workspace_tools/export/ds5_5_lpc11u24.project.tmpl
47+
workspace_tools/export/ds5_5_lpc1768.cproject.tmpl
48+
workspace_tools/export/ds5_5_lpc1768.launch.tmpl
49+
workspace_tools/export/ds5_5_lpc1768.project.tmpl
50+
workspace_tools/export/exporters.py
51+
workspace_tools/export/gcc_arm_lpc1768.tmpl
52+
workspace_tools/export/gccarm.py
53+
workspace_tools/export/iar.ewp.tmpl
54+
workspace_tools/export/iar.eww.tmpl
55+
workspace_tools/export/iar.py
56+
workspace_tools/export/uvision4.py
57+
workspace_tools/export/uvision4_kl25z.uvopt.tmpl
58+
workspace_tools/export/uvision4_kl25z.uvproj.tmpl
59+
workspace_tools/export/uvision4_lpc1114.uvopt.tmpl
60+
workspace_tools/export/uvision4_lpc1114.uvproj.tmpl
61+
workspace_tools/export/uvision4_lpc11c24.uvopt.tmpl
62+
workspace_tools/export/uvision4_lpc11c24.uvproj.tmpl
63+
workspace_tools/export/uvision4_lpc11u24.uvopt.tmpl
64+
workspace_tools/export/uvision4_lpc11u24.uvproj.tmpl
65+
workspace_tools/export/uvision4_lpc1347.uvopt.tmpl
66+
workspace_tools/export/uvision4_lpc1347.uvproj.tmpl
67+
workspace_tools/export/uvision4_lpc1768.uvopt.tmpl
68+
workspace_tools/export/uvision4_lpc1768.uvproj.tmpl
69+
workspace_tools/export/uvision4_lpc4088.uvopt.tmpl
70+
workspace_tools/export/uvision4_lpc4088.uvproj.tmpl
71+
workspace_tools/export/uvision4_lpc812.uvopt.tmpl
72+
workspace_tools/export/uvision4_lpc812.uvproj.tmpl
73+
workspace_tools/host_tests/__init__.py
74+
workspace_tools/host_tests/echo.py
75+
workspace_tools/host_tests/host_test.py
76+
workspace_tools/host_tests/mbedrpc.py
77+
workspace_tools/host_tests/net_test.py
78+
workspace_tools/host_tests/rpc.py
79+
workspace_tools/host_tests/tcpecho_client.py
80+
workspace_tools/host_tests/tcpecho_server.py
81+
workspace_tools/host_tests/tcpecho_server_loop.py
82+
workspace_tools/host_tests/udpecho_client.py
83+
workspace_tools/host_tests/udpecho_server.py
84+
workspace_tools/host_tests/example/BroadcastReceive.py
85+
workspace_tools/host_tests/example/BroadcastSend.py
86+
workspace_tools/host_tests/example/MulticastReceive.py
87+
workspace_tools/host_tests/example/MulticastSend.py
88+
workspace_tools/host_tests/example/TCPEchoClient.py
89+
workspace_tools/host_tests/example/TCPEchoServer.py
90+
workspace_tools/host_tests/example/UDPEchoClient.py
91+
workspace_tools/host_tests/example/UDPEchoServer.py
92+
workspace_tools/host_tests/example/__init__.py
93+
workspace_tools/toolchains/__init__.py
94+
workspace_tools/toolchains/arm.py
95+
workspace_tools/toolchains/gcc.py
96+
workspace_tools/toolchains/iar.py

‎MANIFEST.in

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
graft workspace_tools
2+
include __init__.py LICENSE

‎libraries/USBHost/USBHost/USBHost.cpp

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,6 @@ USBHost * USBHost::instHost = NULL;
2828

2929
#define MIN(a, b) ((a > b) ? b : a)
3030

31-
DigitalOut l4(LED4);
32-
3331
/**
3432
* How interrupts are processed:
3533
* - new device connected:
@@ -72,7 +70,6 @@ void USBHost::usb_process() {
7270

7371
if (evt.status == osEventMail) {
7472

75-
l4 = !l4;
7673
message_t * usb_msg = (message_t*)evt.value.p;
7774

7875
switch (usb_msg->event_id) {

‎libraries/USBHost/USBHost/USBHostConf.h

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,10 +53,15 @@
5353
*/
5454
#define USBHOST_SERIAL 1
5555

56+
/*
57+
* Enable USB3Gmodule
58+
*/
59+
#define USBHOST_3GMODULE 1
60+
5661
/*
5762
* Maximum number of interfaces of a usb device
5863
*/
59-
#define MAX_INTF 3
64+
#define MAX_INTF 4
6065

6166
/*
6267
* Maximum number of endpoints on each interface

‎libraries/net/VodafoneUSBModem/USBHostWANDongle/USB3GModule/IUSBHostSerial.h renamed to ‎libraries/USBHost/USBHost3GModule/IUSBHostSerial.h

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,16 @@
2424
* Generic interface to abstract 3G dongles' impl
2525
*/
2626

27+
#include "USBHostConf.h"
28+
29+
#ifdef USBHOST_3GMODULE
30+
2731
#include "IUSBHostSerialListener.h"
2832

33+
// This is needed by some versions of GCC
34+
#undef putc
35+
#undef getc
36+
2937
class IUSBHostSerial {
3038
public:
3139

@@ -82,4 +90,6 @@ class IUSBHostSerial {
8290

8391
};
8492

93+
#endif /* USBHOST_3GMODULE */
94+
8595
#endif /* IUSBHOSTSERIAL_H_ */

‎libraries/net/VodafoneUSBModem/USBHostWANDongle/USB3GModule/IUSBHostSerialListener.h renamed to ‎libraries/USBHost/USBHost3GModule/IUSBHostSerialListener.h

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,17 @@
2121
#ifndef IUSBHOSTSERIALLISTENER_H_
2222
#define IUSBHOSTSERIALLISTENER_H_
2323

24+
#include "USBHostConf.h"
25+
26+
#ifdef USBHOST_3GMODULE
27+
2428
class IUSBHostSerialListener
2529
{
2630
public:
2731
virtual void readable() = 0; //Called when new data is available
2832
virtual void writeable() = 0; //Called when new space is available
2933
};
3034

35+
#endif /* USBHOST_3GMODULE */
3136

3237
#endif /* IUSBHOSTSERIALLISTENER_H_ */

0 commit comments

Comments
 (0)