Welcome to the SeeMeCNC Community

Code: Select all

        
#=========================================================================
# EDIT THIS SECTION TO INCLUDE YOUR PROBE DATA 
# by editing the last value (0.0) in the "[]" with your probe data
# OR copy and paste the automatically generated code from the green
# cells in the accompanying spreadsheet
#=========================================================================

Code: Select all

#=========================================================================
# END OF EDIT SECTION
#=========================================================================

Code: Select all

#----------------------------------------------------------------------------------------
# Use the X and Y positions in lineParts to lookup the Z height adjustment, add that to
# layerHeight and return a formatted gcode line. Currently supports two types of mapping:
#    1) a matrix of delta Z values
#    2) Barymetric Interpolation over a set of triangles   
#
def mapZ(lineParts, layerHeight, interpolationType):
    X = 0
    Y = 0
    
    # perform Barycentric Interpolation
    if interpolationType == 1:

        # find X, Y for the move
        for part in lineParts:
            firstChar = part[0]
        
            if firstChar == 'X':   
                X = float(part[1:])   # <=== changed
            
            elif firstChar == 'Y':
                Y = float(part[1:])

        if ((X >= 0) and (Y >= 0)):
            for triangle in NEquad:
                deltaZ = deltaZfromTriangle([X,Y], triangle)
                if deltaZ != "not found":
                    break
    
        elif ((X >= 0) and (Y < 0)):
            for triangle in SEquad:
                deltaZ = deltaZfromTriangle([X,Y], triangle)
                if deltaZ != "not found":
                    break

        elif ((X < 0) and (Y < 0)):
            for triangle in SWquad:
                deltaZ = deltaZfromTriangle([X,Y], triangle)
                if deltaZ != "not found":
                   break
            
        elif ((X < 0) and (Y < 0)):
            for triangle in NWquad:
                deltaZ = deltaZfromTriangle([X,Y], triangle)
                if deltaZ != "not found":
                    break       

    # use matrix lookup
    else:
        # Here's where I'd like to do a linear interpolation to get a better Z estimate.
        #

        # find X, Y for the move and divide it by 10 for the 10mmx10mm cell size
        for part in lineParts:
            firstChar = part[0]
        
            if firstChar == 'X':
                X = part[1:]  # <===== changed
                X = int(round(float(X)/10) + columns/2)
            
            elif firstChar == 'Y':
                Y = part[1:]
                Y = int(round(float(Y)/10) + rows/2)

        deltaZ = heightMap[X][Y]
        
    newZ = float(deltaZ) + float(layerHeight)
    zLine = 'Z' + str(newZ)

    lineParts.insert(3, zLine.strip())
    newCodeLine = string.join(lineParts, " ")

    return newCodeLine

Code: Select all

class CuraPostProcessor(PostProcessor):
    def process(self, outfile=None):
        if not self.interpolation_engine:
            raise Exception("No interpolation engine specified")

        if not outfile:
            outfile, ext = os.path.splitext(self.gcode)
            outfile = outfile+"-processed"+ext

        layer_height = 0
        layer_count = 0
        with open(outfile, 'w') as out:
            with open(self.gcode, 'r') as gcode:
                for line in gcode:
                    line = line.strip()
                    if "LAYER" in line:
                        layer_count = int(line.split(":")[-1])
                    elif "G0" in line and "Z" in line:  # Your get layer_begin_height function would look for this
                        layer_height = float(line[line.rindex("Z")+1:])
                    elif "X" in line and "Y" in line and not "Z" in line: # Your getZ would look for this
                        try:
                            x, y = re.findall("(?:X|Y)(-?\d+(?:.\d+)?)", line)
                            z = self.interpolation_engine.get_z_offset(x, y, layer_height)
                            line = line + " Z{0}".format(z)
                        except Exception, e:
                            print "WARNING: Unrecognized movement line: ", line, " Error: ", e
                    out.write(line+"\n")