Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Gadelavega mergepr 19 #20

Merged
merged 5 commits into from
Mar 11, 2016
Merged

Gadelavega mergepr 19 #20

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
e5fa53e
Concatenate packet to send single USB URB transfer
znog77 Feb 23, 2016
b13d2b1
Merge remote-tracking branch 'gadelavega/master' into gadelavega-merg…
jquast Mar 11, 2016
a73aec5
stylefix to prevent linting error
jquast Mar 11, 2016
9978b6a
prepare for version update 0.4.2 => 0.4.3
jquast Mar 11, 2016
ec474b9
document 0.4.3 release description
jquast Mar 11, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions README.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,14 @@ For more information, take a look at the documentation_.
Changes
=======

0.4.3:
* bugfix: ``putc()`` callback was called in series, 3 times for each part of
xmodem block header, data, and checksum during block transfer. Now all
three data blocks are sent by single ``putc()`` call. This resolves issues
when integrating with microcontrollers or equipment sensitive to timing
issues at stream boundaries, `PR #19
<https://github.com/tehmaze/xmodem/pull/19>`_.

0.4.2:
* bugfix: documentation files missing from the release tarball
`Issue #16 <https://github.com/tehmaze/xmodem/issues/16>`_.
Expand Down
2 changes: 1 addition & 1 deletion setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

setup(
name='xmodem',
version='0.4.2',
version='0.4.3',
author='Wijnand Modderman, Jeff Quast',
author_email='maze@pyth0n.org',
description=('XMODEM protocol implementation.'),
Expand Down
6 changes: 2 additions & 4 deletions xmodem/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@
__copyright__ = ['Copyright (c) 2010 Wijnand Modderman',
'Copyright (c) 1981 Chuck Forsberg']
__license__ = 'MIT'
__version__ = '0.4.0'
__version__ = '0.4.3'

import platform
import logging
Expand Down Expand Up @@ -302,9 +302,7 @@ def callback(total_packets, success_count, error_count)
# emit packet
while True:
self.log.debug('send: block %d', sequence)
self.putc(header)
self.putc(data)
self.putc(checksum)
self.putc(header + data + checksum)
char = self.getc(1, timeout)
if char == ACK:
success_count += 1
Expand Down