Michael Moore [Wed, 12 Oct 2016 13:35:13 +0000 (09:35 -0400)]
fixed whitespace issue and removed 'sd' to correct spacing.
Michael Moore [Wed, 12 Oct 2016 02:05:56 +0000 (22:05 -0400)]
modified timestamp format to HH:MM:SS.
- modified watch screen time format.
- modified 'progress' command time format.
Jim Morris [Sun, 9 Oct 2016 05:18:35 +0000 (22:18 -0700)]
Merge pull request #1036 from wolfmanjm/upstreamedge
Add fix to not recursively call refresh in ON_IDLE
Jim Morris [Sun, 9 Oct 2016 05:16:54 +0000 (22:16 -0700)]
Add fix to not recursively call refresh in ON_IDLE
Jim Morris [Wed, 5 Oct 2016 04:37:42 +0000 (21:37 -0700)]
Delete ZprobeGrid.config
Jim Morris [Sat, 24 Sep 2016 22:33:37 +0000 (15:33 -0700)]
Merge pull request #1033 from wolfmanjm/upstreamedge
add BS and DEL to the USB serial to delete last character entered
Jim Morris [Sat, 24 Sep 2016 22:31:53 +0000 (15:31 -0700)]
add BS and DEL to the USB serial to delete last chanracter entered, gives simple line editing to commands
Jim Morris [Sat, 24 Sep 2016 20:38:15 +0000 (13:38 -0700)]
Merge pull request #1031 from nallar/patch-1
Fix broken link in README (HowToFileIssues.md)
Arthur Wolf [Sat, 24 Sep 2016 18:22:31 +0000 (20:22 +0200)]
Making it clear issues are for issue ( Duh. )
Ross Allan [Sat, 24 Sep 2016 13:11:23 +0000 (14:11 +0100)]
Fix broken link in README (HowToFileIssues.md)
Was linking to HowToFileIssues.md which was renamed in these commits
7bb7936875 3fd39027e to ISSUE_TEMPLATE.md
Jim Morris [Fri, 23 Sep 2016 20:24:00 +0000 (13:24 -0700)]
Merge pull request #1030 from wolfmanjm/upstreamedge
add a set_g92 x,y,z to config
Jim Morris [Fri, 23 Sep 2016 20:22:11 +0000 (13:22 -0700)]
add a set_g92 x,y,z to config
Jim Morris [Thu, 22 Sep 2016 05:48:18 +0000 (22:48 -0700)]
Merge pull request #1029 from wolfmanjm/upstreamedge
fix modifyvalue screen, update laser screen
Jim Morris [Thu, 22 Sep 2016 05:41:07 +0000 (22:41 -0700)]
fix single entry ModifyValuesScreen when not immediate set
Jim Morris [Wed, 21 Sep 2016 07:54:59 +0000 (00:54 -0700)]
add set S value menu item to laser screen
Jim Morris [Wed, 21 Sep 2016 06:39:58 +0000 (23:39 -0700)]
update firmware.bin
Jim Morris [Wed, 21 Sep 2016 06:37:45 +0000 (23:37 -0700)]
Merge pull request #1028 from wolfmanjm/upstreamedge
fix watchscree
Jim Morris [Wed, 21 Sep 2016 06:36:09 +0000 (23:36 -0700)]
fix watchscree
Jim Morris [Thu, 15 Sep 2016 20:31:11 +0000 (13:31 -0700)]
Merge pull request #1025 from wolfmanjm/upstreamedge
Single entry ModifyValue menus go straight into value update mode and…
Jim Morris [Thu, 15 Sep 2016 20:27:52 +0000 (13:27 -0700)]
Single entry ModifyValue menus go straight into value update mode and exit direct to parent
No need to disolay a selection menu when only one entry.
Update laser power setting to use the above
Jim Morris [Wed, 14 Sep 2016 17:31:41 +0000 (10:31 -0700)]
Merge pull request #1023 from docdawning/patch-1
Update Readme.md
James [Wed, 14 Sep 2016 15:29:56 +0000 (09:29 -0600)]
Update Readme.md
s/alos/also
Jim Morris [Tue, 13 Sep 2016 20:49:28 +0000 (13:49 -0700)]
Merge pull request #1022 from wolfmanjm/features/laser-panel
Features/laser panel
Jim Morris [Tue, 13 Sep 2016 20:48:36 +0000 (13:48 -0700)]
add comments
Jim Morris [Tue, 13 Sep 2016 20:05:34 +0000 (13:05 -0700)]
add option to test fire menu to leave laser on when it exits, and disable the timeout
Jim Morris [Tue, 13 Sep 2016 07:28:23 +0000 (00:28 -0700)]
update control screen for both 3dprinter and cnc uses same file, fixes jogging in absolute mode for 3dprinter
added actual current laser power to watch screen
Jim Morris [Tue, 13 Sep 2016 06:20:20 +0000 (23:20 -0700)]
Add laser menu
sets power scaler
does test fire
Add Dynamic Menu class
Add Goto park position and set park position for CNC mode
Add current laser power value (S value) to watch screen
Jim Morris [Sat, 10 Sep 2016 19:07:17 +0000 (12:07 -0700)]
Update Readme.md
Jim Morris [Fri, 9 Sep 2016 05:15:21 +0000 (22:15 -0700)]
Merge remote-tracking branch 'upstream/edge' into features/laser-panel
Jim Morris [Thu, 8 Sep 2016 05:56:23 +0000 (22:56 -0700)]
Create PULL_REQUEST_TEMPLATE.md
Jim Morris [Wed, 7 Sep 2016 19:36:07 +0000 (12:36 -0700)]
update firmware.bin
Jim Morris [Wed, 7 Sep 2016 19:33:33 +0000 (12:33 -0700)]
Merge remote-tracking branch 'upstream/edge' into features/laser-panel
Jim Morris [Wed, 7 Sep 2016 19:32:56 +0000 (12:32 -0700)]
Merge pull request #1020 from wolfmanjm/upstreamedge
refactor
Jim Morris [Wed, 7 Sep 2016 19:32:19 +0000 (12:32 -0700)]
refactor
Jim Morris [Wed, 7 Sep 2016 19:30:57 +0000 (12:30 -0700)]
initial
Jim Morris [Wed, 7 Sep 2016 17:11:30 +0000 (10:11 -0700)]
Merge pull request #1019 from Speedy64i/edge
grbl mode homing response
JT [Wed, 7 Sep 2016 14:18:07 +0000 (09:18 -0500)]
grbl mode homing response
Added 'ok' response for '$H' command. As far as I can tell, grbl sends back an ok after a homing cycle. Currently, smoothie was not (when using the '$H" command), which was creating issues with bCNC having any command immediately following homing commands to be stuck in the send buffer.
Jim Morris [Wed, 7 Sep 2016 02:35:36 +0000 (19:35 -0700)]
update firmware.bin
Jim Morris [Sat, 3 Sep 2016 22:57:11 +0000 (15:57 -0700)]
Merge pull request #1018 from wolfmanjm/upstreamedge
fix laser auto mode after a halt
Jim Morris [Sat, 3 Sep 2016 22:56:01 +0000 (15:56 -0700)]
fix laser auto mode after a halt
Jim Morris [Sat, 3 Sep 2016 00:45:50 +0000 (17:45 -0700)]
Merge pull request #1015 from wolfmanjm/features/add-laser-features
Features/add laser features
Jim Morris [Fri, 2 Sep 2016 23:42:39 +0000 (16:42 -0700)]
refactor as per suggestions by @tritao
Jim Morris [Fri, 2 Sep 2016 18:56:49 +0000 (11:56 -0700)]
Fix the proportional laser power during acceleration and deceleration to be based on nominal rate not plateau rate
Jim Morris [Thu, 1 Sep 2016 08:09:24 +0000 (01:09 -0700)]
Merge remote-tracking branch 'upstream/edge' into features/add-laser-features
Jim Morris [Thu, 1 Sep 2016 07:55:32 +0000 (00:55 -0700)]
Merge pull request #1017 from wolfmanjm/upstreamedge
allow _ instead of space in switch commands
Jim Morris [Thu, 1 Sep 2016 07:54:29 +0000 (00:54 -0700)]
allow _ instead of space in switch commands
Jim Morris [Tue, 30 Aug 2016 20:23:51 +0000 (13:23 -0700)]
Update upgrade-notes.md
Jim Morris [Tue, 30 Aug 2016 20:16:57 +0000 (13:16 -0700)]
Update upgrade-notes.md
Jim Morris [Tue, 30 Aug 2016 20:16:35 +0000 (13:16 -0700)]
Update upgrade-notes.md
Jim Morris [Tue, 30 Aug 2016 20:15:54 +0000 (13:15 -0700)]
Update upgrade-notes.md
Jim Morris [Tue, 30 Aug 2016 19:14:47 +0000 (12:14 -0700)]
Merge branch 'upstreamedge' into features/add-laser-features
Jim Morris [Tue, 30 Aug 2016 19:14:11 +0000 (12:14 -0700)]
Merge pull request #1016 from wolfmanjm/upstreamedge
remove is_scara from places that it obviously is incorrect
Jim Morris [Tue, 30 Aug 2016 19:13:09 +0000 (12:13 -0700)]
remove is_scara from places that it obviously is incorrect
Jim Morris [Tue, 30 Aug 2016 00:41:57 +0000 (17:41 -0700)]
allow fire command to averide auto mode of laser
add fire off to turn off (as well as fire 0)
Jim Morris [Tue, 30 Aug 2016 00:25:42 +0000 (17:25 -0700)]
fix message for fire command
Jim Morris [Tue, 30 Aug 2016 00:21:20 +0000 (17:21 -0700)]
Merge branch 'upstreamedge' into features/add-laser-features
Jim Morris [Mon, 29 Aug 2016 20:33:42 +0000 (13:33 -0700)]
Merge pull request #1014 from wolfmanjm/upstreamedge
Fix G28.2 (and grbl G28) to use mm when in inch mode
Jim Morris [Mon, 29 Aug 2016 20:32:22 +0000 (13:32 -0700)]
fix absolute mode
Jim Morris [Mon, 29 Aug 2016 20:30:29 +0000 (13:30 -0700)]
Fix G28.2 (G28 in grbl) to use mm and move in absolute mode.
Jim Morris [Mon, 29 Aug 2016 19:49:32 +0000 (12:49 -0700)]
add fire command to laser
Jim Morris [Mon, 29 Aug 2016 00:05:02 +0000 (17:05 -0700)]
Add M221 Sxx to scale laser power by xx 0-100%
Jim Morris [Mon, 22 Aug 2016 23:23:19 +0000 (16:23 -0700)]
Merge pull request #1007 from wolfmanjm/upstreamedge
add THEROBOT->disable_arm_solution for special homing solutions like …
Jim Morris [Mon, 22 Aug 2016 23:22:05 +0000 (16:22 -0700)]
add THEROBOT->disable_arm_solution for special homing solutions like for scara.
Jim Morris [Tue, 16 Aug 2016 00:43:16 +0000 (17:43 -0700)]
Update config
Jim Morris [Tue, 16 Aug 2016 00:42:48 +0000 (17:42 -0700)]
Update config
Jim Morris [Tue, 16 Aug 2016 00:42:13 +0000 (17:42 -0700)]
Update config
Jim Morris [Tue, 16 Aug 2016 00:40:16 +0000 (17:40 -0700)]
Update config
Jim Morris [Mon, 15 Aug 2016 20:27:44 +0000 (13:27 -0700)]
Merge pull request #1002 from wolfmanjm/upstreamedge
Fix test circle
Jim Morris [Mon, 15 Aug 2016 20:26:50 +0000 (13:26 -0700)]
fix typo in comment
Jim Morris [Mon, 15 Aug 2016 20:19:12 +0000 (13:19 -0700)]
fix test circle to be a circle around current position, leave at the original position when finished
Jim Morris [Sun, 14 Aug 2016 01:01:55 +0000 (18:01 -0700)]
add comments about G2/G3 needing to support 3D printers
Jim Morris [Sat, 13 Aug 2016 23:57:05 +0000 (16:57 -0700)]
Merge pull request #1001 from wolfmanjm/upstreamedge
change default setting for max_travel
Jim Morris [Sat, 13 Aug 2016 23:55:21 +0000 (16:55 -0700)]
Merge remote-tracking branch 'upstream/edge' into upstreamedge
Jim Morris [Sat, 13 Aug 2016 23:54:43 +0000 (16:54 -0700)]
make max_travel twice the max value iof not specified. update upgrade notes
Jim Morris [Sat, 13 Aug 2016 18:38:52 +0000 (11:38 -0700)]
Merge pull request #999 from quillford/patch-2
fix config typo
quillford [Sat, 13 Aug 2016 18:36:18 +0000 (11:36 -0700)]
fix config typo
Jim Morris [Mon, 8 Aug 2016 21:44:55 +0000 (14:44 -0700)]
Merge pull request #998 from wolfmanjm/upstreamedge
add sample config for azteeg X5 Version 3 on a delta
Jim Morris [Mon, 8 Aug 2016 21:44:02 +0000 (14:44 -0700)]
add sample comfigf for azteeg Version 3 on a delta
Jim Morris [Mon, 8 Aug 2016 17:16:07 +0000 (10:16 -0700)]
update firmware.bin
Jim Morris [Mon, 8 Aug 2016 17:08:10 +0000 (10:08 -0700)]
Merge pull request #997 from johnkingsley/edge
"Fix" problem with flushing 64 byte packets
John Kingsley [Mon, 8 Aug 2016 14:58:49 +0000 (10:58 -0400)]
"Fix" problem with flushing 64 byte packets
When exactly 64 bytes are sent, it isn't flushed immediately.
(it is sent later, whenever we have more bytes to send)
If the data is 63 or less bytes, then it is flushed immediately.
This is a problem if the user is waiting for an immediate response from Smoothie.
For example, when sending the '?' character to get the location.
This "fix" is a work-around: we split the data into packets
of 63 bytes or less. The actual bug should probably be hunted down
and properly fixed.
Other people have hit this problem. E.g.
https://community.nxp.com/message/360747
Jim Morris [Sun, 7 Aug 2016 20:10:56 +0000 (13:10 -0700)]
Merge pull request #995 from wolfmanjm/upstreamedge
some minor laser tweaks
Jim Morris [Sun, 7 Aug 2016 20:09:06 +0000 (13:09 -0700)]
Merge branch 'add/new-laser' into upstreamedge
Jim Morris [Sun, 7 Aug 2016 20:06:25 +0000 (13:06 -0700)]
Merge pull request #994 from Smoothieware/add/new-laser
Add laser to the new motion control
Jim Morris [Fri, 5 Aug 2016 01:02:22 +0000 (18:02 -0700)]
update firmware.bin
Jim Morris [Thu, 4 Aug 2016 19:47:24 +0000 (12:47 -0700)]
Merge pull request #992 from wolfmanjm/upstreamedge
fix potential issue with init in universal panel adapter
Jim Morris [Thu, 4 Aug 2016 19:46:16 +0000 (12:46 -0700)]
fix potential issue with init in universal panel adapter
Jim Morris [Tue, 2 Aug 2016 06:52:54 +0000 (23:52 -0700)]
set power update to the minimum of 1KHz or PWM frequency
Jim Morris [Tue, 2 Aug 2016 06:38:55 +0000 (23:38 -0700)]
only update laser power at no more than double the PWM frequency
Jim Morris [Mon, 1 Aug 2016 03:40:12 +0000 (20:40 -0700)]
make s_value 1.11 fixed pointto use no extra memory in Block
Jim Morris [Sun, 31 Jul 2016 21:12:46 +0000 (14:12 -0700)]
set a default s value on boot in Robot.cpp
Jim Morris [Sun, 31 Jul 2016 04:42:29 +0000 (21:42 -0700)]
implement the calculation of the proportional power based on the trapezoid speed of the current block
Jim Morris [Sun, 31 Jul 2016 01:18:42 +0000 (18:18 -0700)]
set is_g123 and S value in block
Jim Morris [Sun, 31 Jul 2016 01:02:31 +0000 (18:02 -0700)]
initial implementation of new laser module
Jim Morris [Sat, 30 Jul 2016 20:49:34 +0000 (13:49 -0700)]
Merge pull request #990 from wolfmanjm/upstreamedge
Make the arm solution routines const to avoid issues in the future
Jim Morris [Sat, 30 Jul 2016 20:46:18 +0000 (13:46 -0700)]
Make the arm solution routines const to avoid issues in the future
Jim Morris [Fri, 22 Jul 2016 21:27:11 +0000 (14:27 -0700)]
Update upgrade-notes.md
Jim Morris [Fri, 22 Jul 2016 19:12:26 +0000 (12:12 -0700)]
Merge pull request #988 from wolfmanjm/upstreamedge
add gamma_max_travel for homing
Jim Morris [Fri, 22 Jul 2016 07:26:58 +0000 (00:26 -0700)]
minor refactoring for homing
Jim Morris [Fri, 22 Jul 2016 01:03:07 +0000 (18:03 -0700)]
add config settings gamma_max_travel instead of using gamma_max for homing motion limit
ditto for alpha and beta