Merge lp:~stanhu/python-msp430-tools/msp430-fixes into lp:python-msp430-tools

Proposed by Stan Hu on 2012-06-28
Status: Merged
Merged at revision: 481
Proposed branch: lp:~stanhu/python-msp430-tools/msp430-fixes
Merge into: lp:python-msp430-tools
Diff against target: 519 lines (+205/-176)
8 files modified
MANIFEST.in (+4/-3)
doc/README-msp430-bsl.txt (+1/-1)
doc/internals.rst (+1/-1)
msp430/bsl5/RAM_BSL.00.05.04.34.txt (+0/-157)
msp430/bsl5/RAM_BSL.00.06.05.34.txt (+179/-0)
msp430/bsl5/hid.py (+11/-5)
setup.py (+3/-3)
win32/setup-combined-tools-py2exe.py (+6/-6)
To merge this branch: bzr merge lp:~stanhu/python-msp430-tools/msp430-fixes
Reviewer Review Type Date Requested Status
zsquareplusc 2012-06-28 Pending
Review via email: mp+112671@code.launchpad.net

Description of the change

While attempting to test this tool to flash a MSP430F5528 dev kit, I ran
into a few issues on Linux. Here are the changes I made to make things
work better for me:

1) Using --debug and --password options crashed due to invalid use of
encode() method on a bytearray.

2) After loading the RAM BSL, the LOAD PC call causes USB to stall and
disconnect, causing a broken pipe on the write() call. Add an
exception handler to catch it and handle it gracefully.

3) Upgraded the RAM BSL to v6.0.5.34 from the Firmware.resx file in
the MSP430 USB Developer's Package 3.11.0.

To post a comment you must log in.
463. By Stan Hu on 2012-06-29

Update for RAM BSL 06.05.34

464. By Stan Hu on 2012-07-28

Merge in Christopher Wilson's fixes to make setup.py work again

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'MANIFEST.in'
2--- MANIFEST.in 2012-01-22 18:16:22 +0000
3+++ MANIFEST.in 2012-07-28 00:50:25 +0000
4@@ -17,17 +17,18 @@
5 include msp430/asm/librarian/asm/timer_a_uart/putchar_outmod.S
6 include msp430/asm/librarian/asm/timer_a_uart/receive_interrupt.S
7
8-include scripts/*.py
9+include scripts/msp430-bsl
10+include scripts/msp430-bsl-fcdprog
11 include scripts/msp430-bsl-legacy
12-include scripts/msp430-bsl
13+include scripts/msp430-bsl-telosb
14 include scripts/msp430-compare
15 include scripts/msp430-convert
16 include scripts/msp430-downloader
17 include scripts/msp430-gdb
18 include scripts/msp430-generate
19 include scripts/msp430-hexdump
20+include scripts/msp430-jtag
21 include scripts/msp430-jtag-legacy
22-include scripts/msp430-jtag
23 include scripts/msp430-ram-usage
24 include scripts/msp430-tool
25
26
27=== modified file 'doc/README-msp430-bsl.txt'
28--- doc/README-msp430-bsl.txt 2011-02-16 00:53:32 +0000
29+++ doc/README-msp430-bsl.txt 2012-07-28 00:50:25 +0000
30@@ -37,7 +37,7 @@
31 program can be used to communicate between the PC and the MSP430 device.
32
33 The program can be started by typing "msp430-bsl" in a console.
34-To run it in the source directory, use "python msp430-bsl.py"
35+To run it in the source directory, use "python msp430-bsl"
36
37 Usage: msp430.bsl.target [OPTIONS] [FILE [FILE...]]
38
39
40=== modified file 'doc/internals.rst'
41--- doc/internals.rst 2011-11-01 21:38:22 +0000
42+++ doc/internals.rst 2012-07-28 00:50:25 +0000
43@@ -663,7 +663,7 @@
44
45 As USB devices only have a stub BSL, this also downloads a full
46 BSL to the device RAM. The BSL is kept in the package as
47- ``RAM_BSL.00.05.04.34.txt`` (loaded using :mod:`pkgdata`).
48+ ``RAM_BSL.00.06.05.34.txt`` (loaded using :mod:`pkgdata`).
49
50 .. method:: reset()
51
52
53=== removed file 'msp430/bsl5/RAM_BSL.00.05.04.34.txt'
54--- msp430/bsl5/RAM_BSL.00.05.04.34.txt 2011-01-15 20:55:20 +0000
55+++ msp430/bsl5/RAM_BSL.00.05.04.34.txt 1970-01-01 00:00:00 +0000
56@@ -1,157 +0,0 @@
57-@2500
58-00 05 04 34 31 40 90 33 B0 13 5E 2E 0C 93 00 24
59-B0 13 F4 2D FF 3F 12 01 00 02 00 00 00 08 47 20
60-00 02 04 01 00 00 00 01 06 00 FF 09 01 A1 01 85
61-3F 95 3F 75 08 25 01 15 01 09 01 81 02 85 3F 95
62-3F 75 08 25 01 15 01 09 01 91 02 C0 09 02 29 00
63-01 01 00 80 32 09 04 00 00 02 03 00 00 00 09 21
64-01 01 00 01 22 24 00 07 05 81 03 40 00 01 07 05
65-01 03 40 00 01
66-@2576
67-F2 D2 20 09 F2 D2 22 09 10 01 5E 42 02 24 7E 93
68-25 24 7E 90 09 00 04 28 7D 42 7E 82 5F 43 0C 3C
69-7E 92 02 2C 4D 4E 06 3C 7D 42 D2 93 0E 24 02 20
70-4E 43 F4 3F 7E 43 4F 43 C2 4F 10 24 C2 4E 02 24
71-4F 43 07 3C 1E 42 06 24 EF 4E 78 23 92 53 06 24
72-5F 53 4F 9D F7 2B C2 4D 21 09 10 01 C2 43 10 24
73-10 01 82 4C 06 24 5E 42 86 23 C2 9E 02 24 04 28
74-C2 4E 02 24 4E 43 01 3C 5E 43 C2 4E 0E 24 80 00
75-80 25 F2 B0 0F 00 84 23 14 20 C2 93 84 23 03 34
76-5E 42 20 09 02 3C 5E 42 22 09 7E F2 C2 4E 60 24
77-5E 42 60 24 42 19 4E 10 C2 4E 60 24 B0 13 C4 27
78-09 3C C2 93 84 23 03 34 5E 42 C8 23 EE 3F 5E 42
79-88 23 EB 3F 3C 40 60 24 80 00 D8 25 F2 43 02 24
80-C2 43 10 24 C2 43 21 09 10 01 C2 93 82 23 12 20
81-5E 42 84 23 7E F0 0F 00 02 20 80 00 42 26 5E 93
82-0B 20 C2 93 84 23 03 34 F2 D2 C8 23 F6 3F F2 D2
83-88 23 F3 3F B0 13 76 25 10 01 C2 93 80 23 04 34
84-1F 43 D2 D3 3C 09 03 3C 0F 43 D2 C3 3C 09 5E 42
85-80 23 7E B0 60 00 90 20 5D 42 81 23 4D 83 81 24
86-5D 83 6B 24 6D 83 67 24 6D 83 45 24 5D 83 09 24
87-6D 83 52 24 5D 83 46 24 5D 83 33 24 5D 83 54 24
88-7B 3C 0F 93 79 24 5E 42 83 23 5E 83 08 24 5E 83
89-0F 24 7E 80 1F 00 1C 24 5E 83 13 24 6D 3C C2 43
90-23 09 F2 40 12 00 02 24 3C 40 16 25 80 00 D8 25
91-C2 43 23 09 F2 40 29 00 02 24 3C 40 4C 25 80 00
92-D8 25 F2 40 24 00 02 24 3C 40 28 25 80 00 D8 25
93-C2 43 23 09 F2 40 09 00 02 24 3C 40 5E 25 80 00
94-D8 25 0F 93 49 24 B0 13 C4 27 C2 43 60 24 D2 42
95-01 24 61 24 3B 3C B0 13 CE 27 D2 42 82 23 3F 09
96-80 00 42 26 B0 13 CE 27 D2 42 82 23 00 24 B0 13
97-42 26 D2 43 12 24 10 01 C2 43 23 09 D2 43 02 24
98-3C 40 00 24 80 00 D8 25 B0 13 CE 27 D2 42 84 23
99-01 24 80 00 42 26 80 00 50 26 5E 42 84 23 7E F0
100-0F 00 02 20 80 00 42 26 5E 93 18 20 C2 93 84 23
101-04 34 F2 F0 D7 00 C8 23 F5 3F F2 F0 D7 00 88 23
102-F1 3F 7E 90 80 00 03 20 B0 13 C4 27 43 3F 7E 90
103-82 00 02 20 80 00 F8 25 B0 13 76 25 10 01 C2 43
104-23 09 E2 43 02 24 10 01 D5 3E 1B 15 1F 42 5A 24
105-5B 4F 03 00 5E 4F 01 00 5C 4F 02 00 8C 10 0C DE
106-0D 4B 0E 4F 2E 52 6A 4F 7A 80 10 00 29 24 5A 83
107-14 24 5A 83 2A 24 5A 83 2E 24 6A 83 23 24 5A 83
108-3A 24 5A 83 15 24 5A 83 3B 24 5A 83 3E 24 6A 83
109-41 20 5F 43 B0 13 E2 2B 41 3C 1F 53 0C 4F B0 13
110-38 2C 4C 93 02 20 4C 43 37 3C 7C 40 05 00 34 3C
111-B0 13 66 2E 03 20 B0 13 6E 2E F5 3F 6C 42 2C 3C
112-4F 43 E8 3F B0 13 D4 2D 27 3C 0E 4C 0F 4B 4C 43
113-B0 13 D4 2C 21 3C B0 13 66 2E F0 23 4C 43 1F 42
114-58 24 3F 50 40 00 1B 42 44 01 3B F0 10 00 0F 5B
115-82 4F 44 01 11 3C B0 13 3C 2E B0 13 12 2B 0E 3C
116-B0 13 3C 2E B0 13 66 29 09 3C 2E 42 3C 40 00 25
117-0D 43 F8 3F 7C 40 07 00 B0 13 12 2E 1A 17 10 01
118-E2 B2 3E 09 14 28 F2 40 80 00 23 09 03 3C F2 F0
119-FA 00 3E 09 C2 43 10 24 C2 43 60 24 C2 43 61 24
120-B0 13 80 26 D2 B3 3E 09 F2 2F E2 C2 3E 09 1F 42
121-32 09 7F 90 0A 00 0C 20 B0 13 4A 2E B0 13 86 2C
122-B0 13 08 2A B2 F0 F9 FF 08 09 A2 D3 02 09 10 01
123-7F 90 0C 00 06 20 B0 13 4A 2E B2 40 04 A5 20 01
124-10 01 7F 90 12 00 0A 20 C2 43 23 09 D2 93 10 24
125-02 20 80 00 80 25 F2 D2 20 09 10 01 7F 90 16 00
126-02 20 80 00 08 2A 7F 90 18 00 0C 20 D2 43 11 24
127-F2 C0 40 00 3E 09 B2 40 80 00 10 09 F2 40 20 00
128-3D 09 10 01 7F 90 1A 00 0A 20 B0 13 86 2C F2 F0
129-9F 00 3E 09 F2 40 C0 00 3D 09 C2 43 11 24 10 01
130-7B 15 0A 4C 0B 4D 0F 4E 3F E3 0F 5F 0F 7F 08 4C
131-09 4D 08 5E 09 6F 47 43 0B 3C 1F 42 5C 24 FF 40
132-3A 00 00 00 0C 46 1C 53 B0 13 2A 2E 0A 56 0B 63
133-0B 99 03 28 34 20 0A 98 32 2C 47 93 30 20 0E 48
134-0F 49 0E 8A 0F 7B 03 20 3E 90 3E 00 03 28 36 40
135-3D 00 02 3C 06 48 06 8A 14 42 5C 24 14 53 0E 46
136-0F 46 3F E3 0F 5F 0F 7F 0E 5A 0F 6B 09 3C 1F 15
137-0D 16 6C 4D 0D 4E 0D 8A 05 44 05 5D C5 4C 00 00
138-3E 53 3F 63 0F 9B C9 2B 02 20 0E 9A C6 2B B0 13
139-66 2E ED 27 67 42 6C 42 B0 13 12 2E C7 3F 74 17
140-10 01 F2 40 10 00 3C 09 C2 43 12 24 C2 43 11 24
141-C2 43 00 24 C2 43 01 24 C2 43 3C 09 F2 43 02 24
142-F2 43 04 24 C2 43 10 24 7E 40 80 00 C2 4E 21 09
143-C2 4E 23 09 F2 40 8C 00 20 09 F2 40 8C 00 22 09
144-F2 40 03 00 2F 09 F2 40 03 00 2E 09 C2 4E C8 23
145-F2 40 10 00 C9 23 C2 4E CA 23 C2 4E CE 23 F2 40
146-40 00 CF 23 C2 4E 88 23 C2 43 89 23 C2 43 8A 23
147-F2 40 40 00 8F 23 F2 40 40 00 3C 09 C2 43 3E 09
148-F2 40 C0 00 3D 09 10 01 7B 15 08 4C 07 4D 04 4F
149-4C 43 0A 48 0B 4D 0F 4E 3F E3 0F 5F 0F 7F 06 48
150-06 5E 07 6F 02 3C 1A 53 0B 63 0B 97 03 28 2C 20
151-0A 96 2A 2C 18 B3 08 2C 0E 46 0F 47 3E 53 3F 63
152-0A 9E 19 20 0B 9F 17 20 6E 44 B0 13 66 2E 10 20
153-4C 43 B0 13 56 2E 1B 15 0F 16 CF 4E 00 00 B0 13
154-56 2E 1B 15 0F 16 6D 4F 4E 9D 03 24 5C 43 01 3C
155-6C 42 14 53 07 3C 3E 44 0C 4A 0D 4B B0 13 64 2D
156-1A 53 0B 63 4C 93 CF 27 74 17 10 01 3B 15 0A 4E
157-B2 43 54 01 08 4C 09 4D 07 3C 19 15 0E 16 6F 4E
158-C2 4F 52 01 18 53 09 63 0E 4C 0F 4D 0E 5A 0F 63
159-09 9F 03 28 09 20 08 9E 07 2C B0 13 66 2E ED 27
160-6C 42 B0 13 12 2E 15 3C 1E 42 54 01 1F 42 5C 24
161-FF 40 3A 00 00 00 1B 42 5C 24 CB 4E 01 00 47 18
162-0E 11 1F 42 5C 24 CF 4E 02 00 3C 40 03 00 B0 13
163-2A 2E 38 17 10 01 32 C2 03 43 B2 40 02 1C 5A 24
164-B2 40 17 24 5C 24 B2 40 28 96 00 09 82 43 02 09
165-82 43 60 01 B2 40 F3 10 64 01 B2 40 40 00 62 01
166-B2 40 44 02 68 01 C2 43 0E 24 C2 43 11 24 B2 40
167-28 96 00 09 B2 40 40 1E 08 09 B2 40 80 00 04 09
168-B0 13 4A 2E C2 43 12 24 B2 B2 08 09 06 28 B0 13
169-86 2C B0 13 08 2A A2 D3 02 09 10 01 3B 15 4A 4F
170-6F 42 3B 40 58 24 B0 13 66 2E 08 20 4F 43 A2 4B
171-44 01 28 4B 38 50 40 00 82 48 40 01 4F 93 0B 20
172-B2 90 05 00 5E 24 07 38 0F 4E 1E 42 5E 24 2E 82
173-B0 13 8E 2A 4F 4C 4A 93 03 20 4C 4F B0 13 12 2E
174-A2 4B 40 01 2F 4B 3F 50 10 00 82 4F 44 01 38 17
175-10 01 1B 15 21 83 0D 43 3A 40 E0 FF 0B 43 7E 4A
176-0F 4C 0F 5B 6F 4F 0E EF 0D DE 1B 53 3B 90 20 00
177-F6 2B 0D 93 0E 20 B1 40 FF 7F 00 00 02 3C B1 53
178-00 00 91 93 00 00 FB 37 B2 40 A5 A5 56 24 4C 43
179-04 3C B0 13 D4 2D 7C 40 05 00 21 53 1A 17 10 01
180-21 82 81 43 02 00 B2 40 28 96 00 09 92 D3 02 09
181-92 42 14 24 12 09 B2 40 00 13 10 09 82 43 14 09
182-81 43 00 00 02 3C 91 53 00 00 B1 90 64 00 00 00
183-FA 2B 1F 41 02 00 0E 4F 1E 53 81 4E 02 00 3F 90
184-E9 03 03 2C 82 93 14 09 E9 23 21 52 10 01 B0 13
185-66 2E 0E 20 4C 43 B0 13 FA 2C 1D 42 58 24 2D 53
186-82 4D 40 01 1F 15 0D 16 CD 43 00 00 80 00 08 2D
187-6C 42 10 01 92 B3 44 01 FD 2F 92 42 58 24 44 01
188-10 01 92 B3 44 01 FD 2F 1F 42 58 24 3F 50 10 00
189-82 4F 44 01 10 01 82 43 5E 24 C2 43 8A 23 B0 13
190-A6 28 D2 93 12 24 0D 20 C2 93 11 24 0A 20 4F 43
191-C2 93 8A 23 04 34 5F 42 8A 23 7F F0 7F 00 82 4F
192-5E 24 82 93 5E 24 EB 27 92 93 5E 24 06 38 5F 42
193-01 1C 82 4F 5E 24 5C 43 10 01 4C 43 10 01 1B 15
194-B0 13 66 2E 15 20 4F 43 B0 13 56 2E 1D 15 0A 16
195-8A 4E 00 00 B0 13 56 2E 1D 15 0A 16 2B 4A 0E 9B
196-01 24 5F 43 92 B3 46 01 04 28 7F 40 03 00 01 3C
197-6F 42 4C 4F 1A 17 10 01 0A 12 7E 40 3F 00 C2 93
198-CA 23 11 34 C2 4E 80 1C 3D 40 81 1C 4F 43 0A 4C
199-0A 5F ED 4A 00 00 1D 53 5F 53 4F 9E F8 2B F2 40
200-40 00 CA 23 01 3C 4E 43 4C 4E 3A 41 10 01 B0 13
201-FA 2C B0 13 56 2E 1F 42 58 24 3F 50 06 00 82 4F
202-40 01 C2 43 E0 FF B0 13 08 2D 4C 43 10 01 B2 40
203-A5 A5 56 24 B2 40 00 A5 58 24 B0 13 7C 2B B0 13
204-1C 2D 5C B3 FC 2B B0 13 D0 27 F9 3F 1F 42 5C 24
205-FF 40 3B 00 00 00 1F 42 5C 24 CF 4C 01 00 2C 43
206-80 00 2A 2E C2 4C 16 24 3C 40 16 24 B0 13 9E 2D
207-4C 93 FA 27 10 01 6E 4E 5F 4F 05 00 47 18 0F 5F
208-0E DF 10 01 03 43 3F 40 DE 2E 3F 53 FE 2F 10 01
209-92 B3 44 01 FD 2F 10 01 B2 40 80 5A 5C 01 10 01
210-B2 90 A5 A5 56 24 10 01 1D 15 10 01
211-@FFFE
212-04 25
213-q
214
215=== added file 'msp430/bsl5/RAM_BSL.00.06.05.34.txt'
216--- msp430/bsl5/RAM_BSL.00.06.05.34.txt 1970-01-01 00:00:00 +0000
217+++ msp430/bsl5/RAM_BSL.00.06.05.34.txt 2012-07-28 00:50:25 +0000
218@@ -0,0 +1,179 @@
219+@2500
220+00 06 05 34 31 40 90 33 B0 13 CC 2F 0C 93 00 24
221+B0 13 2A 2F FF 3F 12 01 00 02 00 00 00 08 47 20
222+00 02 04 01 00 00 00 01 06 00 FF 09 01 A1 01 85
223+3F 95 3F 75 08 25 01 15 01 09 01 81 02 85 3F 95
224+3F 75 08 25 01 15 01 09 01 91 02 C0 09 02 29 00
225+01 01 00 80 32 09 04 00 00 02 03 00 00 00 09 21
226+01 01 00 01 22 24 00 07 05 81 03 40 00 01 07 05
227+01 03 40 00 01
228+@2576
229+F2 B0 0F 00 84 23 14 20 C2 93 84 23 03 34 5E 42
230+20 09 02 3C 5E 42 22 09 7E F2 C2 4E EA 24 5E 42
231+EA 24 42 19 4E 10 C2 4E EA 24 B0 13 C2 2F 0A 3C
232+C2 93 84 23 03 34 5E 42 C8 23 EE 3F 5E 42 88 23
233+EB 3F 03 43 3C 40 EA 24 80 00 5E 2F F2 43 02 24
234+C2 43 10 24 C2 43 21 09 10 01 C2 93 82 23 12 20
235+5E 42 84 23 7E F0 0F 00 02 20 80 00 C2 25 5E 93
236+0D 20 C2 93 84 23 03 34 F2 D2 C8 23 F6 3F F2 D2
237+88 23 F3 3F F2 D2 20 09 F2 D2 22 09 10 01 C2 93
238+80 23 04 34 1F 43 D2 D3 3C 09 03 3C 0F 43 D2 C3
239+3C 09 5E 42 80 23 7E B0 60 00 8F 20 5D 42 81 23
240+4D 83 80 24 5D 83 6B 24 6D 83 67 24 6D 83 45 24
241+5D 83 09 24 6D 83 52 24 5D 83 46 24 5D 83 33 24
242+5D 83 54 24 7A 3C 0F 93 78 24 5E 42 83 23 5E 83
243+08 24 5E 83 0F 24 7E 80 1F 00 1C 24 5E 83 13 24
244+6C 3C C2 43 23 09 F2 40 12 00 02 24 3C 40 16 25
245+80 00 5E 2F C2 43 23 09 F2 40 29 00 02 24 3C 40
246+4C 25 80 00 5E 2F F2 40 24 00 02 24 3C 40 28 25
247+80 00 5E 2F C2 43 23 09 F2 40 09 00 02 24 3C 40
248+5E 25 80 00 5E 2F 0F 93 48 24 B0 13 C2 2F C2 43
249+EA 24 D2 42 01 24 EB 24 3A 3C F2 D2 22 09 D2 42
250+82 23 3F 09 80 00 C2 25 F2 D2 22 09 D2 42 82 23
251+00 24 B0 13 C2 25 D2 43 12 24 10 01 C2 43 23 09
252+D2 43 02 24 3C 40 00 24 80 00 5E 2F F2 D2 22 09
253+D2 42 84 23 01 24 80 00 C2 25 80 00 D0 25 5E 42
254+84 23 7E F0 0F 00 0C 24 5E 93 1B 20 C2 93 84 23
255+04 34 F2 F0 D7 00 C8 23 03 3C F2 F0 D7 00 88 23
256+80 00 C2 25 7E 90 80 00 03 20 B0 13 C2 2F 42 3F
257+7E 90 82 00 02 20 80 00 76 25 F2 D2 20 09 F2 D2
258+22 09 10 01 3B 15 4C 43 38 40 5A 24 B0 13 D6 2F
259+8D 20 1E 42 DA 24 1F 42 DC 24 7E B0 7F 00 41 20
260+B2 90 80 00 E2 24 3D 20 B0 13 DE 2F B2 40 00 A5
261+44 01 B2 40 C0 A5 40 01 0A 4E 0B 4F 3E 50 80 00
262+0F 63 0B 9F 03 28 1B 20 0A 9E 19 2C 3E 48 3F 48
263+1B 15 0D 16 8D 4E 00 00 8D 4F 02 00 B2 B2 44 01
264+FD 2B 2A 52 0B 63 1E 42 DA 24 1F 42 DC 24 3E 50
265+80 00 0F 63 0B 9F EA 2B 02 20 0A 9E E7 2B 92 42
266+58 24 40 01 B0 13 DE 2F B0 13 B8 2A 82 43 DA 24
267+82 43 DC 24 82 43 DE 24 82 43 E0 24 82 43 E2 24
268+43 3C 92 42 58 24 44 01 1B 42 58 24 3B 50 40 00
269+82 4B 40 01 0A 4E 0B 4F 02 3C 1A 53 0B 63 1E 42
270+E2 24 0F 43 1E 52 DA 24 1F 62 DC 24 0B 9F 03 28
271+DD 23 0A 9E DB 2F 92 B3 DA 24 06 2C 3E 53 3F 63
272+0A 9E 19 20 0B 9F 17 20 6E 48 B0 13 D6 2F 02 24
273+6C 42 0F 3C 4C 43 B0 13 DE 2F 1B 15 0F 16 CF 4E
274+00 00 B0 13 DE 2F 1B 15 0F 16 6D 4F 4E 9D 01 24
275+5C 43 18 53 07 3C 3E 48 0C 4A 0D 4B B0 13 F0 2E
276+1A 53 0B 63 4C 93 C9 27 38 17 10 01 6C 42 FC 3F
277+03 43 1B 15 1E 42 E4 24 5B 4E 03 00 0A 43 5F 4E
278+01 00 5C 4E 02 00 8C 10 0C DF 0D 4B 6F 4E 7F 80
279+10 00 2A 24 5F 83 15 24 5F 83 2B 24 5F 83 2F 24
280+6F 83 24 24 5F 83 3B 24 5F 83 16 24 5F 83 3C 24
281+5F 83 3F 24 6F 83 42 20 5F 43 2E 52 B0 13 38 2E
282+41 3C 1E 53 0C 4E B0 13 3E 2A 4C 93 03 24 7C 40
283+05 00 36 3C 4C 43 34 3C B0 13 D6 2F 02 24 6C 42
284+2F 3C B0 13 E6 2F F6 3F 4F 43 E7 3F B0 13 90 2A
285+F1 3F 0E 4C 0F 4B 4C 43 B0 13 0E 2A 21 3C B0 13
286+D6 2F ED 23 4C 43 1F 42 58 24 3F 50 40 00 1B 42
287+44 01 3B F0 10 00 0F 5B 82 4F 44 01 11 3C B0 13
288+9C 2F B0 13 4E 2C 0E 3C B0 13 9C 2F B0 13 D0 2B
289+09 3C 2E 42 3C 40 00 25 0D 43 F8 3F 7C 40 07 00
290+B0 13 7E 2F 1A 17 10 01 E2 B2 3E 09 14 28 F2 40
291+80 00 23 09 03 3C F2 F0 FA 00 3E 09 C2 43 10 24
292+C2 43 EA 24 C2 43 EB 24 B0 13 04 26 D2 B3 3E 09
293+F2 2F E2 C2 3E 09 1F 42 32 09 7F 90 0A 00 0C 20
294+B0 13 B6 2F B0 13 EA 2D B0 13 C6 2A B2 F0 F9 FF
295+08 09 A2 D3 02 09 10 01 7F 90 0C 00 06 20 B0 13
296+B6 2F B2 40 04 A5 20 01 10 01 7F 90 12 00 0A 20
297+C2 43 23 09 D2 93 10 24 03 24 F2 D2 20 09 10 01
298+80 00 8C 2D 7F 90 16 00 02 20 80 00 C6 2A 7F 90
299+18 00 0C 20 D2 43 11 24 F2 C0 40 00 3E 09 B2 40
300+80 00 10 09 F2 40 20 00 3D 09 10 01 7F 90 1A 00
301+0A 20 B0 13 EA 2D F2 F0 9F 00 3E 09 F2 40 C0 00
302+3D 09 C2 43 11 24 10 01 B0 13 D6 2F 13 20 4C 43
303+B0 13 DE 2F 92 42 58 24 44 01 1D 42 58 24 2D 53
304+82 4D 40 01 1F 15 0D 16 CD 43 00 00 B0 13 DE 2F
305+80 00 B8 2A 6C 42 10 01 1B 15 21 83 0D 43 3A 40
306+E0 FF 0B 4C 3B 50 20 00 7E 4A 7F 4C 0E EF 0D DE
307+7E 4A 7F 4C 0E EF 0D DE 0C 9B F6 23 0D 93 0E 20
308+B1 40 FF 7F 00 00 02 3C B1 53 00 00 91 93 00 00
309+FB 37 B2 40 A5 A5 56 24 4C 43 04 3C B0 13 90 2A
310+7C 40 05 00 21 53 1A 17 10 01 92 B3 44 01 FD 2F
311+92 42 58 24 44 01 92 B3 44 01 FD 2F 1F 42 58 24
312+3F 50 06 00 82 4F 40 01 C2 43 E0 FF 92 B3 44 01
313+FD 2F 1F 42 58 24 3F 50 10 00 82 4F 44 01 10 01
314+F2 40 10 00 3C 09 C2 43 12 24 C2 43 11 24 C2 43
315+00 24 C2 43 01 24 C2 43 3C 09 F2 43 02 24 F2 43
316+04 24 C2 43 10 24 7E 40 80 00 C2 4E 21 09 C2 4E
317+23 09 F2 40 8C 00 20 09 F2 40 8C 00 22 09 F2 40
318+03 00 2F 09 F2 40 03 00 2E 09 C2 4E C8 23 F2 40
319+10 00 C9 23 C2 4E CA 23 C2 4E CE 23 F2 40 40 00
320+CF 23 C2 4E 88 23 C2 43 89 23 C2 43 8A 23 F2 40
321+40 00 8F 23 F2 40 40 00 3C 09 C2 43 3E 09 F2 40
322+C0 00 3D 09 10 01 5B 15 0A 4C 0B 4D 06 4E 08 4F
323+49 43 25 3C 82 4A DA 24 82 4B DC 24 0F 46 3F E3
324+0F 5F 0F 7F 0C 4A 0D 4B 0C 56 0D 6F 82 4C DE 24
325+82 4D E0 24 07 43 3F 40 5A 24 1F 52 E2 24 07 96
326+21 2C FF 48 00 00 92 53 E2 24 1A 53 0B 63 17 53
327+1F 53 7A B0 7F 00 F3 23 B0 13 4A 27 06 87 B0 13
328+D6 2F 0F 20 1F 42 DA 24 1F D2 DC 24 0F 93 D2 27
329+82 9A DE 24 03 20 82 9B E0 24 D0 27 B0 13 4A 27
330+EE 3F 69 42 4C 49 56 17 10 01 5B 15 0A 4C 0B 4D
331+0F 4E 3F E3 0F 5F 0F 7F 08 4C 09 4D 08 5E 09 6F
332+47 43 04 3C B0 13 7E 2F 0A 56 0B 63 0B 99 03 28
333+29 20 0A 98 27 2C 47 93 25 20 0E 48 0F 49 0E 8A
334+0F 7B 03 20 3E 90 3E 00 03 28 36 40 3D 00 02 3C
335+06 48 06 8A 1F 42 E6 24 1F 53 0E 46 0C 4A 0D 4B
336+B0 13 2E 2D 47 4C 4C 93 DD 23 1F 42 E6 24 FF 40
337+3A 00 00 00 4E 46 5E 53 C2 4E 16 24 B0 13 AA 2F
338+D3 23 FC 3F 56 17 10 01 3B 15 0A 4C 0B 4D 08 4E
339+B0 13 4A 27 B2 43 54 01 0C 4A 0D 4B 0C 58 0D 63
340+0B 9D 27 28 02 20 0A 9C 24 28 1E 42 54 01 1F 42
341+E6 24 FF 40 3A 00 00 00 1F 42 E6 24 CF 4E 01 00
342+8E 10 1F 42 E6 24 CF 4E 02 00 F2 40 03 00 16 24
343+B0 13 AA 2F FD 27 38 17 10 01 1B 15 0E 16 6F 4E
344+C2 4F 52 01 1A 53 0B 63 0B 9D 03 28 DE 23 0A 9C
345+DC 2F B0 13 D6 2F F1 27 6C 42 B0 13 7E 2F EB 3F
346+03 43 32 C2 03 43 B2 40 02 1C E4 24 B2 40 17 24
347+E6 24 B2 40 28 96 00 09 82 43 02 09 82 43 60 01
348+B2 40 F3 10 64 01 B2 40 40 00 62 01 B2 40 44 02
349+68 01 C2 43 0E 24 C2 43 11 24 B2 40 28 96 00 09
350+B2 40 40 1E 08 09 B2 40 80 00 04 09 B0 13 B6 2F
351+C2 43 12 24 B2 B2 08 09 06 28 B0 13 EA 2D B0 13
352+C6 2A A2 D3 02 09 10 01 3B 15 0A 4C 0B 4D 09 4E
353+08 4F B0 13 4A 27 0D 49 3D E3 0D 5D 0D 7D 0E 4A
354+0F 4B 0E 59 0F 6D 3E 53 3F 63 0F 9B 16 28 02 20
355+0E 9A 13 28 B0 13 D6 2F 13 20 1F 15 0D 16 69 4D
356+0C 4E 0C 8A 0D 48 0D 5C CD 49 00 00 3E 53 3F 63
357+0F 9B 03 28 EF 23 0E 9A ED 2F 4C 43 38 17 10 01
358+6C 42 FC 3F 03 43 5E 42 02 24 7E 93 28 24 7E 90
359+09 00 04 28 7F 42 7E 82 5D 43 0C 3C 7E 92 02 2C
360+4F 4E 06 3C 7F 42 D2 93 0E 24 02 20 4E 43 F4 3F
361+7E 43 4D 43 C2 4D 10 24 C2 4E 02 24 4F 93 0C 24
362+3E 40 78 23 4D 4F 1C 42 06 24 EE 4C 00 00 92 53
363+06 24 1E 53 7D 53 F7 23 C2 4F 21 09 10 01 C2 43
364+10 24 10 01 21 82 81 43 02 00 B2 40 28 96 00 09
365+92 D3 02 09 92 42 14 24 12 09 B2 40 00 13 10 09
366+82 43 14 09 81 43 00 00 02 3C 91 53 00 00 B1 90
367+64 00 00 00 FA 2B 1F 41 02 00 0E 4F 1E 53 81 4E
368+02 00 3F 90 E9 03 03 2C 82 93 14 09 E9 23 21 52
369+10 01 0A 12 4A 4F 6F 42 B0 13 D6 2F 01 20 4F 43
370+4F 93 0B 20 B2 90 05 00 E8 24 07 28 0F 4E 1E 42
371+E8 24 2E 82 B0 13 4C 2B 4F 4C 4A 93 03 20 4C 4F
372+B0 13 7E 2F 92 42 58 24 40 01 B0 13 B8 2A 3A 41
373+10 01 82 43 E8 24 C2 43 8A 23 B0 13 4E 29 D2 93
374+12 24 0D 20 C2 93 11 24 0A 20 4F 43 C2 93 8A 23
375+04 34 5F 42 8A 23 7F F0 7F 00 82 4F E8 24 82 93
376+E8 24 EB 27 5F 42 01 1C 82 4F E8 24 5C 43 10 01
377+7E 40 3F 00 C2 93 CA 23 15 34 C2 4E 80 1C 3F 40
378+81 1C 0D 4C 0D 5E FF 4C 00 00 1F 53 FF 4C 00 00
379+1F 53 FF 4C 00 00 1F 53 0C 9D F5 23 F2 40 40 00
380+CA 23 01 3C 4E 43 4C 4E 10 01 1B 15 B0 13 D6 2F
381+15 20 4F 43 B0 13 DE 2F 1D 15 0A 16 8A 4E 00 00
382+B0 13 DE 2F 1D 15 0A 16 2B 4A 0E 9B 01 24 5F 43
383+92 B3 46 01 04 28 7F 40 03 00 01 3C 6F 42 4C 4F
384+1A 17 10 01 B2 40 A5 A5 56 24 B2 40 00 A5 58 24
385+82 43 DE 24 82 43 E0 24 82 43 DA 24 82 43 DC 24
386+82 43 E2 24 B0 13 C8 2C B0 13 78 2E 5C B3 FC 2B
387+B0 13 78 28 F9 3F 03 43 82 4C 06 24 5E 42 86 23
388+C2 9E 02 24 04 28 C2 4E 02 24 4E 43 01 3C 5E 43
389+C2 4E 0E 24 80 00 8C 2D 1F 42 E6 24 FF 40 3B 00
390+00 00 1F 42 E6 24 CF 4C 01 00 E2 43 16 24 B0 13
391+AA 2F FD 27 10 01 5F 4E 04 00 5E 4E 05 00 8E 10
392+0E DF 10 01 3C 40 16 24 B0 13 B6 2E 4C 93 10 01
393+03 43 3F 40 DE 2E 3F 53 FE 2F 10 01 C2 43 23 09
394+E2 43 02 24 10 01 B2 40 80 5A 5C 01 0C 43 10 01
395+B2 90 A5 A5 56 24 10 01 92 B3 44 01 FD 2F 10 01
396+1D 15 10 01
397+q
398
399=== modified file 'msp430/bsl5/hid.py'
400--- msp430/bsl5/hid.py 2011-09-14 21:20:29 +0000
401+++ msp430/bsl5/hid.py 2012-07-28 00:50:25 +0000
402@@ -231,23 +231,29 @@
403 else:
404 if self.options.password is not None:
405 password = msp430.memory.load(self.options.password).get_range(0xffe0, 0xffff)
406- self.logger.info("Transmitting password: %s" % (password.encode('hex'),))
407+ self.logger.info("Transmitting password: %s" % (str(password).encode('hex'),))
408 self.BSL_RX_PASSWORD(password)
409
410 # download full BSL
411 if self.verbose:
412 sys.stderr.write('Download full BSL...\n')
413- bsl_version_expected = (0x00, 0x05, 0x04, 0x34)
414- full_bsl_txt = pkgutil.get_data('msp430.bsl5', 'RAM_BSL.00.05.04.34.txt')
415+ bsl_version_expected = (0x00, 0x06, 0x05, 0x34)
416+ full_bsl_txt = pkgutil.get_data('msp430.bsl5', 'RAM_BSL.00.06.05.34.txt')
417 full_bsl = msp430.memory.load('BSL', StringIO(full_bsl_txt), format='titext')
418 self.program_file(full_bsl, quiet=True)
419- self.BSL_LOAD_PC(0x2504)
420+
421+ # Loading the PC can cause USB to stall and disconnect, causing a broken pipe.
422+ # Handle the error gracefully and try to resume.
423+ try:
424+ self.BSL_LOAD_PC(0x2504)
425+ except OSError as e:
426+ self.logger.info("Caught " + str(e))
427+ self.close()
428
429 # must re-initialize communication, BSL or USB system needs some time
430 # to be ready
431 self.logger.info("Waiting for BSL...")
432 time.sleep(3)
433- self.close()
434 self.open(self.options.device)
435 # checking version, this is also a connection check
436 bsl_version = self.BSL_VERSION()
437
438=== renamed file 'scripts/msp430-bsl.py' => 'scripts/msp430-bsl'
439=== renamed file 'scripts/msp430-bsl-fcdprog.py' => 'scripts/msp430-bsl-fcdprog' (properties changed: -x to +x)
440=== renamed file 'scripts/msp430-bsl-legacy.py' => 'scripts/msp430-bsl-legacy'
441=== renamed file 'scripts/msp430-bsl-telosb.py' => 'scripts/msp430-bsl-telosb' (properties changed: -x to +x)
442=== renamed file 'scripts/msp430-compare.py' => 'scripts/msp430-compare'
443=== renamed file 'scripts/msp430-convert.py' => 'scripts/msp430-convert'
444=== renamed file 'scripts/msp430-downloader.py' => 'scripts/msp430-downloader'
445=== renamed file 'scripts/msp430-gdb.py' => 'scripts/msp430-gdb'
446=== renamed file 'scripts/msp430-generate.py' => 'scripts/msp430-generate'
447=== renamed file 'scripts/msp430-hexdump.py' => 'scripts/msp430-hexdump'
448=== renamed file 'scripts/msp430-jtag.py' => 'scripts/msp430-jtag'
449=== renamed file 'scripts/msp430-jtag-legacy.py' => 'scripts/msp430-jtag-legacy'
450=== renamed file 'scripts/msp430-ram-usage.py' => 'scripts/msp430-ram-usage'
451=== renamed file 'scripts/msp430-tool.py' => 'scripts/msp430-tool'
452=== modified file 'setup.py'
453--- setup.py 2012-02-18 00:44:25 +0000
454+++ setup.py 2012-07-28 00:50:25 +0000
455@@ -38,12 +38,12 @@
456 'bsl/BL_150S_44x.txt',
457 'bsl/BS_150S_14x.txt',
458 'bsl/patch.txt',
459- 'bsl5/RAM_BSL.00.05.04.34.txt',
460+ 'bsl5/RAM_BSL.00.06.05.34.txt',
461 ]},
462 scripts=[
463 'scripts/msp430-bsl',
464+ 'scripts/msp430-bsl-fcdprog',
465 'scripts/msp430-bsl-legacy',
466- 'scripts/msp430-bsl-fcdprog',
467 'scripts/msp430-bsl-telosb',
468 'scripts/msp430-compare',
469 'scripts/msp430-convert',
470@@ -51,8 +51,8 @@
471 'scripts/msp430-gdb',
472 'scripts/msp430-generate',
473 'scripts/msp430-hexdump',
474+ 'scripts/msp430-jtag',
475 'scripts/msp430-jtag-legacy',
476- 'scripts/msp430-jtag',
477 'scripts/msp430-ram-usage',
478 'scripts/msp430-tool',
479 ],
480
481=== modified file 'win32/setup-combined-tools-py2exe.py'
482--- win32/setup-combined-tools-py2exe.py 2012-07-05 09:31:44 +0000
483+++ win32/setup-combined-tools-py2exe.py 2012-07-28 00:50:25 +0000
484@@ -27,7 +27,7 @@
485 'IronPythonConsole', 'System', 'System.IO.Ports', 'System.Windows.Forms.Clipboard', 'clr',
486 'modes.editingmodes', 'startup', 'Carbon', 'Carbon.Files', 'wx'],
487 'packages': ['msp430', 'msp430.asm', 'msp430.memory', 'msp430.shell',
488- 'msp430.gdb', 'msp430.jtag', 'msp430.bsl', 'msp430.bsl5'],
489+ 'msp430.gdb', 'msp430.jtag', 'msp430.bsl', 'msp430.bsl.target', 'msp430.bsl5'],
490 'includes': ['pywinusb', 'EasyDialogs'],
491 'dll_excludes': [
492 'HIL.dll', 'MSP430.dll', 'MSP430mspgcc.dll',
493@@ -40,13 +40,13 @@
494 }
495 },
496 console = [
497- "scripts/msp430-bsl.py",
498- "scripts/msp430-jtag.py",
499- "scripts/msp430-tool.py",
500+ "scripts/msp430-bsl",
501+ "scripts/msp430-jtag",
502+ "scripts/msp430-tool",
503 ],
504 windows = [
505 {
506- 'script': "scripts/msp430-downloader.py",
507+ 'script': "scripts/msp430-downloader",
508 'icon_resources': [(0x0001, 'win32/downloader.ico')]
509 },
510 ],
511@@ -60,7 +60,7 @@
512 'msp430/bsl/BL_150S_44x.txt',
513 'msp430/bsl/BS_150S_14x.txt',
514 'msp430/bsl/patch.txt',
515- 'msp430/bsl5/RAM_BSL.00.05.04.34.txt',
516+ 'msp430/bsl5/RAM_BSL.00.06.05.34.txt',
517 ]
518
519 print "appending package data..."

Subscribers

People subscribed via source and target branches

to all changes: