Mirror
/
klipper-dgus
mirror of https://github.com/Desuuuu/klipper.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

avrsim: Minor changes so avrsim can run on both Python2 and Python3 

Signed-off-by: Kevin O'Connor <kevin@koconnor.net>
This commit is contained in:
Kevin O'Connor 2020-09-16 12:05:26 -04:00
parent 3ac636b33e
commit 1208ec1f52
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
scripts/avrsim.py
View File

@ -33,7 +33,7 @@ class SerialRxPin(pysimulavr.PySimulationMember, pysimulavr.Pin):
if self.pos == 1: if self.pos == 1:
return int(self.delay * 1.5) return int(self.delay * 1.5)
if self.pos >= SERIALBITS: if self.pos >= SERIALBITS:
data = bytearray(((self.current >> 1) & 0xff,)) data = bytearray([(self.current >> 1) & 0xff])
self.terminal.write(data) self.terminal.write(data)
self.pos = -1 self.pos = -1
self.current = 0 self.current = 0
@ -51,7 +51,7 @@ class SerialTxPin(pysimulavr.PySimulationMember, pysimulavr.Pin):
self.delay = SIMULAVR_FREQ // baud self.delay = SIMULAVR_FREQ // baud
self.current = 0 self.current = 0
self.pos = 0 self.pos = 0
self.queue = b"" self.queue = bytearray()
self.sc.Add(self) self.sc.Add(self)
def DoStep(self, trueHwStep): def DoStep(self, trueHwStep):
if not self.pos: if not self.pos:
@ -59,9 +59,8 @@ class SerialTxPin(pysimulavr.PySimulationMember, pysimulavr.Pin):
data = self.terminal.read() data = self.terminal.read()
if not data: if not data:
return self.delay * 100 return self.delay * 100
self.queue += data self.queue.extend(data)
self.current = (self.queue[0] << 1) | 0x200 self.current = (self.queue.pop(0) << 1) | 0x200
self.queue = self.queue[1:]
newstate = 'L' newstate = 'L'
if self.current & (1 << self.pos): if self.current & (1 << self.pos):
newstate = 'H' newstate = 'H'