Skip to content

Fixes #55 #56

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

Open
craigblaster wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fixes #55 #56

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
19 changes: 17 additions & 2 deletions mDrawGui/EggBot.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -270,21 +270,25 @@ def moveOverList(self):
y=(p[1]-self.origin[1]-self.height)
try:
if self.printing == False:
if self.laserMode:
self.M4(0) # turn off the laser when the user aborts the printing process
return
elif self.pausing == True:
while self.pausing==True:
time.sleep(0.5)
self.waitWhilePaused(self.laserMode and i>0)
auxDelay = 0
if self.laserMode:
if i>0:
auxDelay = self.laserBurnDelay*1000
elif i==0:
self.M4(self.laserPower,0.0) # turn laser power down when perform transition
self.M4(0) # turn laser power down when perform transition
self.q.get()
self.G1(x,-y,auxdelay = auxDelay)
self.x = x
self.y = y
self.q.get()
while self.robotState==BUSYING:
self.q.get()
if self.laserMode and i==0:
self.M4(self.laserPower) # turn laser power back to set value
self.q.get()
Expand All @@ -310,6 +314,9 @@ def printPic(self):
self.penUpPos = int(mStr)
mStr = str(self.ui.penDownSpin.value())
self.penDownPos = int(mStr)
value = int(self.ui.slideLaserPower.value())
laserpwm = value*255/100
self.laserPower = laserpwm

while not self.q.empty():
self.q.get()
Expand All @@ -325,6 +332,14 @@ def stopPrinting(self):

def pausePrinting(self,v):
self.pausing = v
def waitWhilePaused(self, isLaserOn):
if self.pausing:
if isLaserOn:
self.M4(0) # turn off the laser while the printing is paused
while self.pausing:
time.sleep(0.5)
if isLaserOn:
self.M4(self.laserPower) # turn on laser when the printing is continued, and it was on before pausing

def showSetup(self):
self.robotSetup = RobotSetupUI(EggSetup.Ui_Form, self)