lefake/S4-P3-Projet
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Build fix

Browse Source 
Fixed test errors
This commit is contained in:
Marc-Antoine Lafreniere
2019-04-10 16:59:01 -04:00
parent e1e0ca6fa4
commit b878159a27
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
devicecommunication/CommunicationMain.py
View File

@@ -78,7 +78,7 @@ def sendWithAck(gcodeCommand, timeoutCom):
raise RuntimeError('Command error : ' + gcodeCommand) raise RuntimeError('Command error : ' + gcodeCommand)
else: else:
commandTimeout += 1 commandTimeout += 1
if commandTimeout > timeoutCom * 10: if commandTimeout > timeoutCom * 100:
raise RuntimeError('Command not executed') raise RuntimeError('Command not executed')

6
gcodeextractor/tests/gcode/test_listToGcode.py
View File

@@ -52,10 +52,10 @@ class TestListToGCode(TestCase):
def getExpected(coords, ySize, xSize): def getExpected(coords, ySize, xSize):
header = ['G28', 'G90\n'] header = ['G28', 'G90\n']
footer = ['\nG0 Z0', 'G28', 'M18'] footer = ['\nG0 Z0', 'G0 X0 Y0', 'M18']
content = ['G0 X' + str(round(xSize * coords[0].getX(), 2)) + ' Y' + str(round(ySize * coords[0].getY(), 2)), content = ['G0 X' + str(round(xSize * coords[0].getX(), 2)) + ' Y' + str(round(ySize * coords[0].getY(), 2)),
'G0 Z3', 'G0 Z10.5',
] ]
for index, coord in enumerate(coords): for index, coord in enumerate(coords):
@@ -63,7 +63,7 @@ def getExpected(coords, ySize, xSize):
if coord.getX() != -1 and coord.getY() != -1: if coord.getX() != -1 and coord.getY() != -1:
content.append('G0 X' + str(xSize * coord.getX()) + ' Y' + str(ySize * coord.getY())) content.append('G0 X' + str(xSize * coord.getX()) + ' Y' + str(ySize * coord.getY()))
if coords[index - 1].getX() == -1 and coords[index - 1].getX() == -1: if coords[index - 1].getX() == -1 and coords[index - 1].getX() == -1:
content.append('G0 Z3') content.append('G0 Z10.5')
else: else:
content.append('G0 Z0') content.append('G0 Z0')