Monitoring for xy state

diff --git a/FuckTomato.py b/FuckTomato.py
index 4a44ce2d1569a07cd5459fa6886268ce19a4f784..0d500382bfafda9c2214b42a7d736a70243cc3b9 100644 (file)
--- a/FuckTomato.py
+++ b/FuckTomato.py
@@ -7,17 +7,16 @@ cv2.namedWindow('image')
 printer = Printer.Printer('COM4', (200, 200))
 mouse = MouseManager.MouseManager(printer)
 
-while(True):
+while 1:
        ret, frame = cap.read()
        Draw.drawImage(frame, printer)
        cv2.imshow('image', frame)
 
-       # ...Detection and package send... #
-       #After g-code package send, check for XY reset and update printer execution status
-       
-       if not printer.packageIsExecuting():
-               #Run image evaluation and printer position check
-               pass
+       print(printer.packageIsExecuting())
+       #if not printer.packageIsExecuting():
+               # ...Detection and package send... #
+               #After g-code package send, check for XY reset and update printer execution status
+               #pass
 
        if Buttons.checkButtons(printer): break
 

diff --git a/Printer.py b/Printer.py
index ad68151d591ff9c4602df04d61c6df388187282a..bd311c254c60f94c96eecaf724580aff93116094 100644 (file)
--- a/Printer.py
+++ b/Printer.py
@@ -7,6 +7,7 @@ class Printer():
                self.COM = PrinterCOM
                self.max_X, self.max_Y = bedSize
                self.position = (0,0)
+               self.sendSerial = False
                self.settings = frameSettings.frameSettings()
                self.coeffs = MatrixConversion.find_coeffs(self.settings.image_frame.corners, self.settings.laser_frame.corners) 
                try: self.printerSerial = serial.Serial(PrinterCOM, 115200, timeout = 25)

diff --git a/Printer.pyc b/Printer.pyc
index ace1e1faa706abd5707a5580751de577bfcc8569..c8fb482ceb2a04de4014b1627c5c088b6bb65b46 100644 (file)
Binary files a/Printer.pyc and b/Printer.pyc differ

diff --git a/Tests.py b/Tests.py
index 8e670e47e8c5daf93a7467bcebd16da2334015b6..d85e5f5c5d62df10b90b693235aa881fab5f376d 100644 (file)
--- a/Tests.py
+++ b/Tests.py
@@ -12,10 +12,7 @@ testPoints = [
 
 p = Printer.Printer('COM4', (200,200))
 time.sleep(8)
-p.writePoint((75, 75))
+
 while 1:
     res = p.packageIsExecuting()
-    if 'Count' in res:
-        xy = res.split('Count')[1].split('Z')[0].strip().replace('Y:', '').split(' ')[1:]
-        x, y = (xy[0], xy[1])
-        print(str(x) + '  ' + str(y))
\ No newline at end of file
+    
\ No newline at end of file

diff --git a/User_Interface/Buttons.pyc b/User_Interface/Buttons.pyc
new file mode 100644 (file)
index 0000000..9bc8c39
Binary files /dev/null and b/User_Interface/Buttons.pyc differ

diff --git a/User_Interface/Draw.pyc b/User_Interface/Draw.pyc
index cf81a2551c56e4d3fa98ed4fd1f3c9e62f2c708c..481b6843342fbe5ebde0209c5b0e0005ebd2812d 100644 (file)
Binary files a/User_Interface/Draw.pyc and b/User_Interface/Draw.pyc differ

diff --git a/User_Interface/MouseManager.pyc b/User_Interface/MouseManager.pyc
index 5d74a899de5b9f0ce3f7e7cce65369d8eb402323..079c7377467fb36f846b994208db9a828af213fc 100644 (file)
Binary files a/User_Interface/MouseManager.pyc and b/User_Interface/MouseManager.pyc differ

diff --git a/settings/__init__.pyc b/settings/__init__.pyc
new file mode 100644 (file)
index 0000000..2ec0074
Binary files /dev/null and b/settings/__init__.pyc differ

diff --git a/settings/frameSettings.pyc b/settings/frameSettings.pyc
new file mode 100644 (file)
index 0000000..fccd8dd
Binary files /dev/null and b/settings/frameSettings.pyc differ

diff --git a/utils/Gcode.pyc b/utils/Gcode.pyc
new file mode 100644 (file)
index 0000000..c7838fb
Binary files /dev/null and b/utils/Gcode.pyc differ

diff --git a/utils/Geometry.pyc b/utils/Geometry.pyc
index 66cf4c5e79e51fe8bafce33daf455d592338e2fa..91d56105a04730721091035f00d6cd7a90b9b983 100644 (file)
Binary files a/utils/Geometry.pyc and b/utils/Geometry.pyc differ

diff --git a/utils/PrinterUtils.pyc b/utils/PrinterUtils.pyc
new file mode 100644 (file)
index 0000000..9a6610e
Binary files /dev/null and b/utils/PrinterUtils.pyc differ