v17.02 ready for beta testing, usb branch merged

Author: Stefan Hechenberger

TODO.md

@@ -1,13 +1,8 @@
 
-
+- image raster cuts off some 5mm at the end
 - when serial port ato changes, fails to do so in flash module
 
 
-DriveboardUSB TODO
-------------------
-- new freq control
-
-
 bugs
 ----
 - stall between certain x-axis jogs

backend/config.py

@@ -26,7 +26,7 @@
 
 conf = {
     'appname': 'driveboardapp',
-    'version': '17.01-beta',
+    'version': '17.02-beta',
     'company_name': 'com.nortd.labs',
     'network_host': '',                    # '' for all nics
     'network_port': 4444,

backend/driveboard.py

@@ -12,6 +12,11 @@
 import serial.tools.list_ports
 from config import conf, write_config_fields
 
+try:
+    from PIL import Image
+except ImportError:
+    print "Pillow module missing, raster mode will fail."
+
 
 __author__  = 'Stefan Hechenberger <stefan@nortd.com>'
 
@@ -44,8 +49,8 @@
 
 CMD_AIR_ENABLE = "L"
 CMD_AIR_DISABLE = "M"
-# CMD_AUX1_ENABLE = "N"
-# CMD_AUX1_DISABLE = "O"
+CMD_AUX_ENABLE = "N"
+CMD_AUX_DISABLE = "O"
 # CMD_AUX2_ENABLE = "P"
 # CMD_AUX2_DISABLE = "Q"
 
@@ -144,8 +149,8 @@
 
     "L": "CMD_AIR_ENABLE",
     "M": "CMD_AIR_DISABLE",
-    # "N": "CMD_AUX1_ENABLE",
-    # "O": "CMD_AUX1_DISABLE",
+    "N": "CMD_AUX_ENABLE",
+    "O": "CMD_AUX_DISABLE",
     # "P": "CMD_AUX2_ENABLE",
     # "Q": "CMD_AUX2_DISABLE",
 
@@ -931,7 +936,7 @@ def job(jobdict):
 
     # reset vavles
     air_off()
-    # aux1_off()
+    # aux_off()
 
     # loop passes
     for pass_ in jobdict['passes']:
@@ -949,8 +954,8 @@ def job(jobdict):
                 air_on()
         else:
             air_on()    # also default this behavior
-        # if 'aux1_assist' in pass_ and pass_['aux1_assist'] == 'pass':
-        #     aux1_on()
+        # if 'aux_assist' in pass_ and pass_['aux_assist'] == 'pass':
+        #     aux_on()
         # seekrate
         if 'seekrate' in pass_:
             seekrate = pass_['seekrate']
@@ -984,7 +989,6 @@ def job(jobdict):
                 px_h = int(size[1]/pxsize)
                 # create image obj, convert to grayscale, scale, loop through lines
                 print "--- start of image processing ---"
-                import Image
                 imgobj = Image.open(io.BytesIO(base64.b64decode(data[22:].encode('utf-8'))))
                 imgobj = imgobj.resize((px_w,px_h), resample=Image.BICUBIC)
                 if imgobj.mode == 'RGBA':
@@ -1009,8 +1013,8 @@ def job(jobdict):
                 # assists on, beginning of feed if set to 'feed'
                 if 'air_assist' in pass_ and pass_['air_assist'] == 'feed':
                     air_on()
-                # if 'aux1_assist' in pass_ and pass_['aux1_assist'] == 'feed':
-                #     aux1_on()
+                # if 'aux_assist' in pass_ and pass_['aux_assist'] == 'feed':
+                #     aux_on()
                 ### go through image lines ####
                 pxarray = imgobj.getdata()
                 # if len(pxarray) % size[0] != 0:
@@ -1028,6 +1032,7 @@ def job(jobdict):
                     end += px_w
                     # move to start of line
                     feedrate(seekrate)
+                    # intensity(0.0)
                     move(leadinpos, line_y)
                     # lead-in
                     feedrate(feedrate_)
@@ -1048,8 +1053,8 @@ def job(jobdict):
                 # assists off, end of feed if set to 'feed'
                 if 'air_assist' in pass_ and pass_['air_assist'] == 'feed':
                     air_off()
-                # if 'aux1_assist' in pass_ and pass_['aux1_assist'] == 'feed':
-                #     aux1_off()
+                # if 'aux_assist' in pass_ and pass_['aux_assist'] == 'feed':
+                #     aux_off()
 
             elif kind == "fill" or kind == "path":
                 path = def_['data']
@@ -1071,8 +1076,8 @@ def job(jobdict):
                             # also air_assist defaults to 'feed'
                             if 'air_assist' in pass_ and pass_['air_assist'] == 'feed':
                                 air_on()
-                            # if 'aux1_assist' in pass_ and pass_['aux1_assist'] == 'feed':
-                            #     aux1_on()
+                            # if 'aux_assist' in pass_ and pass_['aux_assist'] == 'feed':
+                            #     aux_on()
                             # TODO dwell according to pierce time
                             if is_2d:
                                 for i in xrange(1, len(polyline)):
@@ -1083,17 +1088,17 @@ def job(jobdict):
                             # turn off assists if set to 'feed'
                             if 'air_assist' in pass_ and pass_['air_assist'] == 'feed':
                                 air_off()
-                            # if 'aux1_assist' in pass_ and pass_['aux1_assist'] == 'feed':
-                            #     aux1_off()
+                            # if 'aux_assist' in pass_ and pass_['aux_assist'] == 'feed':
+                            #     aux_off()
 
         # assists off, end of pass if set to 'pass'
         if 'air_assist' in pass_:
             if pass_['air_assist'] == 'pass':
                 air_off()
         else:
             air_off()  # also default this behavior
-        # if 'aux1_assist' in pass_ and pass_['aux1_assist'] == 'pass':
-        #     aux1_off()
+        # if 'aux_assist' in pass_ and pass_['aux_assist'] == 'pass':
+        #     aux_off()
 
     # return to origin
     feedrate(conf['seekrate'])
@@ -1150,28 +1155,15 @@ def air_off():
     with SerialLoop.lock:
         SerialLoop.send_command(CMD_AIR_DISABLE)
 
+def aux_on():
+    global SerialLoop
+    with SerialLoop.lock:
+        SerialLoop.send_command(CMD_AUX_ENABLE)
 
-# def aux1_on():
-#     global SerialLoop
-#     with SerialLoop.lock:
-#         SerialLoop.send_command(CMD_AUX1_ENABLE)
-#
-# def aux1_off():
-#     global SerialLoop
-#     with SerialLoop.lock:
-#         SerialLoop.send_command(CMD_AUX1_DISABLE)
-#
-#
-# def aux2_on():
-#     global SerialLoop
-#     with SerialLoop.lock:
-#         SerialLoop.send_command(CMD_AUX2_ENABLE)
-#
-# def aux2_off():
-#     global SerialLoop
-#     with SerialLoop.lock:
-#         SerialLoop.send_command(CMD_AUX2_DISABLE)
-
+def aux_off():
+    global SerialLoop
+    with SerialLoop.lock:
+        SerialLoop.send_command(CMD_AUX_DISABLE)
 
 def set_offset_table():
     global SerialLoop

backend/lasersaur.py

@@ -130,11 +130,11 @@ def air_on(self):
     def air_off(self):
         self._request('/air_off')
 
-    def aux1_on(self):
-        self._request('/aux1_on')
+    def aux_on(self):
+        self._request('/aux_on')
 
-    def aux1_off(self):
-        self._request('/aux1_off')
+    def aux_off(self):
+        self._request('/aux_off')
 
     def offset(self, x, y, z=0.0):
         self._request('/offset/%.4f/%.4f/%.4f' % (x,y,z))
@@ -449,8 +449,8 @@ def reset(self):
 move = lasersaur.move
 air_on = lasersaur.air_on
 air_off = lasersaur.air_off
-aux1_on = lasersaur.aux1_on
-aux1_off = lasersaur.aux1_off
+aux_on = lasersaur.aux_on
+aux_off = lasersaur.aux_off
 offset = lasersaur.offset
 clear_offset = lasersaur.clear_offset
 ### JOBS QUEUE

backend/web.py

@@ -203,19 +203,19 @@ def air_off():
     driveboard.air_off()
     return '{}'
 
-# @bottle.route('/aux1_on')
-# @bottle.auth_basic(checkuser)
-# @checkserial
-# def aux1_on():
-#     driveboard.aux1_on()
-#     return '{}'
-#
-# @bottle.route('/aux1_off')
-# @bottle.auth_basic(checkuser)
-# @checkserial
-# def aux1_off():
-#     driveboard.aux1_off()
-#     return '{}'
+@bottle.route('/aux_on')
+@bottle.auth_basic(checkuser)
+@checkserial
+def aux_on():
+    driveboard.aux_on()
+    return '{}'
+
+@bottle.route('/aux_off')
+@bottle.auth_basic(checkuser)
+@checkserial
+def aux_off():
+    driveboard.aux_off()
+    return '{}'
 
 @bottle.route('/offset/<x:float>/<y:float>/<z:float>')
 @bottle.auth_basic(checkuser)

docs/driveboardusb.md

@@ -63,7 +63,7 @@ These are the imputs for the limit, door, and chiller switches. Switches are exp
 
 ### Laser Control
 
-The control wire connects to the control port of the laser PSU. The typical pins are `| 5V | TH | TL | WP | IN |` and all but TH need to connected as follows.
+The control wire connects to the control port of the laser PSU. The typical pins are `| 5V | TH | TL | WP | GND | IN |` and all but TH need to connected as follows.
 
  - LASER, RJ45