Skip to content

Commit

Permalink
Merge pull request #20 from tehmaze/gadelavega-mergepr-19
Browse files Browse the repository at this point in the history
Gadelavega mergepr 19
  • Loading branch information
jquast committed Mar 11, 2016
2 parents bf67436 + ec474b9 commit 695aa83
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 5 deletions.
8 changes: 8 additions & 0 deletions README.rst
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
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
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

0 comments on commit 695aa83

Please sign in to comment.