Merge lp:~cdwilson/python-msp430-tools/fix-minor-details into lp:python-msp430-tools

Proposed by Christopher Wilson
Status: Merged
Merged at revision: 451
Proposed branch: lp:~cdwilson/python-msp430-tools/fix-minor-details
Merge into: lp:python-msp430-tools
Diff against target: 36 lines (+6/-2)
2 files modified
msp430/bsl/target.py (+5/-1)
msp430/legacy/bsl.py (+1/-1)
To merge this branch: bzr merge lp:~cdwilson/python-msp430-tools/fix-minor-details
Reviewer Review Type Date Requested Status
zsquareplusc Approve
Review via email: mp+92680@code.launchpad.net

Description of the change

Couple minor cosmetic (spelling and logger) changes

To post a comment you must log in.
Revision history for this message
zsquareplusc (zsquareplusc) wrote :

thanks

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'msp430/bsl/target.py'
2--- msp430/bsl/target.py 2011-02-02 00:48:50 +0000
3+++ msp430/bsl/target.py 2012-02-12 17:34:18 +0000
4@@ -318,7 +318,7 @@
5 group.add_option("--swap-reset-test",
6 dest="swap_reset_test",
7 action="store_true",
8- help="exchenage RST and TEST signals (DTR/RTS)",
9+ help="exchange RST and TEST signals (DTR/RTS)",
10 default=False)
11 group.add_option("--test-on-tx",
12 dest="test_on_tx",
13@@ -486,6 +486,10 @@
14
15 # override reset method: use control line
16 def reset(self):
17+ """Reset the device."""
18+
19+ self.logger.info('Reset device')
20+
21 #~ time.sleep(0.25)
22 #~ self.set_RST(True) # power supply
23 #~ self.set_TEST(True) # power supply
24
25=== modified file 'msp430/legacy/bsl.py'
26--- msp430/legacy/bsl.py 2011-01-06 02:35:40 +0000
27+++ msp430/legacy/bsl.py 2012-02-12 17:34:18 +0000
28@@ -997,7 +997,7 @@
29 raise BSLException, "verify without data not possible"
30
31 def actionReset(self):
32- """Perform a reset, start user programm"""
33+ """Perform a reset, start user program"""
34 sys.stderr.write("Reset device ...\n")
35 sys.stderr.flush()
36 self.bslReset(0) #only reset

Subscribers

People subscribed via source and target branches