-
Notifications
You must be signed in to change notification settings - Fork 122
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Move triangular calibration into its own object
- Loading branch information
1 parent
5e8dca6
commit 24c1868
Showing
3 changed files
with
167 additions
and
139 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,96 @@ | ||
| from kivy.uix.widget import Widget | ||
| from kivy.properties import ObjectProperty | ||
|
|
||
| class TriangularCalibration(Widget): | ||
| ''' | ||
| Provides a standard interface for running the calibration test pattern for triangular kinematics | ||
| ''' | ||
| data = ObjectProperty(None) #linked externally | ||
| numberOfTimesTestCutRun = -2 | ||
|
|
||
| def cutTestPaternTriangular(self): | ||
|
|
||
| #Credit for this test pattern to David Lang | ||
| self.data.units = "MM" | ||
| self.data.gcode_queue.put("G21 ") | ||
| self.data.gcode_queue.put("G90 ") #Switch to absolute mode | ||
| self.data.gcode_queue.put("G40 ") | ||
|
|
||
| self.data.gcode_queue.put("G0 Z5 ") | ||
| self.data.gcode_queue.put("G0 X0 Y0 ") | ||
| self.data.gcode_queue.put("G17 ") | ||
|
|
||
| #(defines the center). Moves up with each attempt | ||
| self.data.gcode_queue.put("G0 X0 Y" + str(self.testCutPosSlider.value) + " ") | ||
|
|
||
| self.testCutPosSlider.value = self.testCutPosSlider.value + 18 #increment the starting spot | ||
|
|
||
| self.data.gcode_queue.put("G91 ") #Switch to relative mode | ||
|
|
||
| self.data.gcode_queue.put("G0 X-902.5 ") | ||
| self.data.gcode_queue.put("G1 Z-7 F500 ") | ||
| self.data.gcode_queue.put("G1 Y-20 ") | ||
| self.data.gcode_queue.put("G1 Z7 ") | ||
| self.data.gcode_queue.put("G0 X1905 Y20 ") | ||
| self.data.gcode_queue.put("G1 Z-7 ") | ||
| self.data.gcode_queue.put("G1 Y-20 ") | ||
| self.data.gcode_queue.put("G1 Z5 ") | ||
| self.data.gcode_queue.put("G0 X-900 Y500 ") | ||
|
|
||
|
|
||
| self.data.gcode_queue.put("G90 ") #Switch back to absolute mode | ||
|
|
||
| self.numberOfTimesTestCutRun = self.numberOfTimesTestCutRun + 1 | ||
| self.cutBtnT.text = "Re-Cut Test\nPattern" | ||
| self.cutBtnT.disabled = True | ||
| self.triangleMeasure.disabled = False | ||
| self.unitsBtnT.disabled = False | ||
| self.enterValuesT.disabled = False | ||
|
|
||
| def enterTestPaternValuesTriangular(self): | ||
|
|
||
| dist = 0 | ||
|
|
||
| try: | ||
| dist = float(self.triangleMeasure.text) | ||
| except: | ||
| self.data.message_queue.put("Message: Couldn't make that into a number") | ||
| return | ||
|
|
||
| if self.unitsBtnT.text == 'Inches': | ||
| dist = dist*25.4 | ||
|
|
||
| dist = 1905 - dist #1905 is expected test spacing in mm. dist is greater than zero if the length is too long, less than zero if if is too short | ||
|
|
||
| print "The error is: " | ||
| print dist | ||
|
|
||
| acceptableTolerance = .5 | ||
|
|
||
| if abs(dist) < acceptableTolerance: #if we're fully calibrated | ||
| self.carousel.load_slide(self.carousel.slides[11]) | ||
| else: | ||
| amtToChange = -.9*dist | ||
|
|
||
| print "so we are going to adjust the motor spacing by: " | ||
| print amtToChange | ||
|
|
||
| newSledSpacing = float(self.data.config.get('Advanced Settings', 'rotationRadius')) + amtToChange | ||
| print "Now trying spacing: " + str(newSledSpacing) | ||
| self.data.config.set('Advanced Settings', 'rotationRadius', str(newSledSpacing)) | ||
| self.data.config.write() | ||
| self.cutBtnT.disabled = False | ||
| self.data.pushSettings() | ||
|
|
||
| def stopCut(self): | ||
| self.data.quick_queue.put("!") | ||
| with self.data.gcode_queue.mutex: | ||
| self.data.gcode_queue.queue.clear() | ||
|
|
||
| def switchUnits(self): | ||
| if self.unitsBtnT.text == 'MM': | ||
| self.unitsBtnT.text = 'Inches' | ||
| else: | ||
| self.unitsBtnT.text = 'MM' |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters