Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in
Toggle navigation
P
Printrun
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
machinery
Printrun
Commits
c1c0fb4d
Commit
c1c0fb4d
authored
Jun 01, 2016
by
Franco (nextime) Lanza
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Upgrade to use M142 for coolers according to last marlinkimbra
parent
ef861fc4
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
5 deletions
+5
-5
pronsole.py
printrun/pronsole.py
+3
-3
pronterface.py
printrun/pronterface.py
+2
-2
No files found.
printrun/pronsole.py
View file @
c1c0fb4d
...
@@ -392,7 +392,7 @@ class pronsole(cmd.Cmd):
...
@@ -392,7 +392,7 @@ class pronsole(cmd.Cmd):
if
self
.
status
.
cooler_enabled
:
if
self
.
status
.
cooler_enabled
:
if
self
.
status
.
cooler_temp_target
!=
0
:
if
self
.
status
.
cooler_temp_target
!=
0
:
self
.
log
(
"Setting cooler temp to 0"
)
self
.
log
(
"Setting cooler temp to 0"
)
self
.
p
.
send_now
(
"M14
0 C
S0.0"
)
self
.
p
.
send_now
(
"M14
2
S0.0"
)
self
.
log
(
"Disconnecting from printer..."
)
self
.
log
(
"Disconnecting from printer..."
)
if
self
.
p
.
printing
:
if
self
.
p
.
printing
:
self
.
log
(
_
(
"Are you sure you want to exit while printing?
\n\
self
.
log
(
_
(
"Are you sure you want to exit while printing?
\n\
...
@@ -1421,7 +1421,7 @@ class pronsole(cmd.Cmd):
...
@@ -1421,7 +1421,7 @@ class pronsole(cmd.Cmd):
self
.
logError
(
_
(
"You must enter a temperature."
))
self
.
logError
(
_
(
"You must enter a temperature."
))
if
f
is
not
None
and
f
>=
0
:
if
f
is
not
None
and
f
>=
0
:
if
self
.
p
.
online
:
if
self
.
p
.
online
:
self
.
p
.
send_now
(
"M14
0 C
S"
+
l
)
self
.
p
.
send_now
(
"M14
2
S"
+
l
)
self
.
log
(
_
(
"Setting cooler temperature to
%
s degrees Celsius."
)
%
f
)
self
.
log
(
_
(
"Setting cooler temperature to
%
s degrees Celsius."
)
%
f
)
else
:
else
:
self
.
logError
(
_
(
"Printer is not online."
))
self
.
logError
(
_
(
"Printer is not online."
))
...
@@ -1684,7 +1684,7 @@ class pronsole(cmd.Cmd):
...
@@ -1684,7 +1684,7 @@ class pronsole(cmd.Cmd):
self
.
log
(
_
(
"; Heatbed off"
))
self
.
log
(
_
(
"; Heatbed off"
))
self
.
onecmd
(
"M140 S0"
)
self
.
onecmd
(
"M140 S0"
)
self
.
log
(
_
(
"; Cooler off"
))
self
.
log
(
_
(
"; Cooler off"
))
self
.
onecmd
(
"M14
0 C
S0"
)
self
.
onecmd
(
"M14
2
S0"
)
self
.
log
(
_
(
"; Fan off"
))
self
.
log
(
_
(
"; Fan off"
))
self
.
onecmd
(
"M107"
)
self
.
onecmd
(
"M107"
)
self
.
log
(
_
(
"; Power supply off"
))
self
.
log
(
_
(
"; Power supply off"
))
...
...
printrun/pronterface.py
View file @
c1c0fb4d
...
@@ -433,7 +433,7 @@ class PronterWindow(MainWindow, pronsole.pronsole):
...
@@ -433,7 +433,7 @@ class PronterWindow(MainWindow, pronsole.pronsole):
f
=
float
(
l
)
f
=
float
(
l
)
if
f
>=
0
:
if
f
>=
0
:
if
self
.
p
.
online
:
if
self
.
p
.
online
:
self
.
p
.
send_now
(
"M14
0 C
S"
+
l
)
self
.
p
.
send_now
(
"M14
2
S"
+
l
)
self
.
log
(
_
(
"Setting Cooler temperature to
%
f degrees Celsius."
)
%
f
)
self
.
log
(
_
(
"Setting Cooler temperature to
%
f degrees Celsius."
)
%
f
)
self
.
setcoolergui
(
f
)
self
.
setcoolergui
(
f
)
else
:
else
:
...
@@ -1623,7 +1623,7 @@ Printrun. If not, see <http://www.gnu.org/licenses/>."""
...
@@ -1623,7 +1623,7 @@ Printrun. If not, see <http://www.gnu.org/licenses/>."""
temp
=
gline_s
temp
=
gline_s
if
self
.
display_gauges
:
wx
.
CallAfter
(
self
.
bedtgauge
.
SetTarget
,
temp
)
if
self
.
display_gauges
:
wx
.
CallAfter
(
self
.
bedtgauge
.
SetTarget
,
temp
)
if
self
.
display_graph
:
wx
.
CallAfter
(
self
.
graph
.
SetBedTargetTemperature
,
temp
)
if
self
.
display_graph
:
wx
.
CallAfter
(
self
.
graph
.
SetBedTargetTemperature
,
temp
)
elif
gline
.
command
in
[
"M14
0"
,
"M190
"
]
and
gcoder
.
C
(
gline
):
elif
gline
.
command
in
[
"M14
2"
,
"M192
"
]
and
gcoder
.
C
(
gline
):
gline_s
=
gcoder
.
S
(
gline
)
gline_s
=
gcoder
.
S
(
gline
)
if
gline_s
is
not
None
:
if
gline_s
is
not
None
:
temp
=
gline_s
temp
=
gline_s
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment