Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Arduino Mega spindle pwm control advanced settings #179

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion DataStructures/data.py
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,13 @@ class Data:
customFirmwareVersion = None
holeyFirmwareVersion = None
controllerFirmwareVersion = 0

'''
interpreter version
if using a compiler newer than 3.5, use the newer string format methods without %'s
'''
pythonVersion35 = False

'''l
Version Updater
'''
lastChecked = -1
Expand Down
26 changes: 24 additions & 2 deletions defaultwebcontrol.json
Original file line number Diff line number Diff line change
Expand Up @@ -121,20 +121,42 @@
},
{
"default": "None",
"desc": "How should the spindle start and stop automatically based on gcode? Leave off for none, or set external servo control, or external relay control, active high or low.\ndefault setting: None",
"desc": "How should the spindle start and stop automatically based on gcode? Leave off for none, or set external servo control, or external relay control, active high or low. Speed control uses pin 45 in 51.29 firmware\ndefault setting: None",
"firmwareKey": 17,
"key": "spindleAutomate",
"options": [
"None",
"Servo",
"Relay_High",
"Relay_Low"
"Relay_Low",
"SPEED_CTRL_RELAY_HIGH",
"SPEED_CTRL_RELAY_LOW"
],
"section": "Advanced Settings",
"title": "Spindle Automation",
"type": "options",
"value": "None"
},
{
"default": "None",
"desc": "Spindle start speed absolute minimum\ndefault setting: 4000",
"firmwareKey": 60,
"key": "spindleMin",
"section": "Advanced Settings",
"title": "Spindle Speed Minimum",
"type": "string",
"value": "4000"
},
{
"default": "None",
"desc": "Spindle maximum speed\ndefault setting: 24000",
"firmwareKey": 61,
"key": "spindleMax",
"section": "Advanced Settings",
"title": "Spindle Speed Maximum",
"type": "string",
"value": "24000"
},
{
"default": 800,
"desc": "The maximum feedrate in mm/min that machine is capable of sustaining. Setting this value too high will cause movements to start before the prior movement finishes.\ndefault setting: 800",
Expand Down