Skip to content

Commit

Permalink
Use grbl-streamer package
Browse files Browse the repository at this point in the history
  • Loading branch information
michaelfranzl committed Jan 1, 2024
1 parent 53a152e commit 20a68a3
Show file tree
Hide file tree
Showing 4 changed files with 242 additions and 6 deletions.
17 changes: 17 additions & 0 deletions Pipfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
[[source]]
url = "https://pypi.org/simple"
verify_ssl = true
name = "pypi"

[packages]
pyglpainter = "*"
gcode-machine = "*"
grbl-streamer = "*"
svgwrite = "*"
pillow = "*"
pyqt5 = "*"

[dev-packages]

[requires]
python_version = "3.12"
220 changes: 220 additions & 0 deletions Pipfile.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 3 additions & 4 deletions classes/window.py
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,8 @@
from classes.jogwidget import JogWidget
from classes.commandlineedit import CommandLineEdit
from classes.simulatordialog import SimulatorDialog
from gerbil.gerbil import Gerbil
from gcode_machine.gcode_machine import GcodeMachine
from gerbil.callbackloghandler import CallbackLogHandler
from grbl_streamer import GrblStreamer
from gcode_machine import GcodeMachine

from PyQt5 import QtCore, QtGui
from PyQt5.QtCore import pyqtSignal, QPoint, QSize, Qt, QCoreApplication, QTimer, QSettings
Expand Down Expand Up @@ -178,7 +177,7 @@ def __init__(self, path, baud):


# GRBL SETUP BEGIN -----
self.grbl = Gerbil(self.on_grbl_event)
self.grbl = GrblStreamer(self.on_grbl_event)
self.grbl.setup_logging()
self.grbl.poll_interval = 0.15
#self.grbl.cnect()
Expand Down
4 changes: 2 additions & 2 deletions grbl-gui.py
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
from classes.session import Session
from classes.svg import SVG

from gerbil.gerbil import Gerbil
from grbl_streamer import GrblStreamer

from lib import stipple
from lib import pixel2laser as p2l
Expand Down Expand Up @@ -232,7 +232,7 @@ def main():
f.close()

elif subcmd == "stream":
grbl = Gerbil("grbl1", args.dev_node)
grbl = GrblStreamer("grbl1", args.dev_node)
grbl.cnect()
time.sleep(1)
src = "out.ngc"
Expand Down

0 comments on commit 20a68a3

Please sign in to comment.