clinton/Smoothieware.git
7 years agoget pos prints ABC for more versions
Jim Morris [Tue, 1 Nov 2016 06:14:26 +0000 (23:14 -0700)]
get pos prints ABC for more versions

7 years agoFix M907 setting currents to use ABC instead of EAB, will allow backward compatibilit...
Jim Morris [Tue, 1 Nov 2016 05:55:13 +0000 (22:55 -0700)]
Fix M907 setting currents to use ABC instead of EAB, will allow backward compatibility with a warning

7 years agoAdd handling of M500 and M92, M203 etc for ABC axis if they are not extruders
Jim Morris [Tue, 1 Nov 2016 04:37:17 +0000 (21:37 -0700)]
Add handling of M500 and M92, M203 etc for ABC axis if they are not extruders
  still todo handle G2/G3 for ABC

7 years agoMerge branch 'feature/e-endstop' into merge-abc-with-homing
Jim Morris [Tue, 1 Nov 2016 03:31:39 +0000 (20:31 -0700)]
Merge branch 'feature/e-endstop' into merge-abc-with-homing

7 years agoMerge remote-tracking branch 'upstream/edge' into merge-abc-with-homing
Jim Morris [Tue, 1 Nov 2016 03:30:57 +0000 (20:30 -0700)]
Merge remote-tracking branch 'upstream/edge' into merge-abc-with-homing

Conflicts:
src/main.cpp

7 years agoUpdate ISSUE_TEMPLATE.md
Jim Morris [Mon, 31 Oct 2016 22:36:46 +0000 (15:36 -0700)]
Update ISSUE_TEMPLATE.md

7 years agoMerge pull request #1053 from wolfmanjm/add/ssd1306-oled
Jim Morris [Fri, 28 Oct 2016 04:41:58 +0000 (21:41 -0700)]
Merge pull request #1053 from wolfmanjm/add/ssd1306-oled

Add/ssd1306 oled

7 years agomake a0 optional
Jim Morris [Thu, 27 Oct 2016 01:47:13 +0000 (18:47 -0700)]
make a0 optional

7 years agoadd the variant for ssd1306 oled support to the ST7565 which is almost identical
Jim Morris [Wed, 26 Oct 2016 22:39:48 +0000 (15:39 -0700)]
add the variant for ssd1306 oled support to the ST7565 which is almost identical

7 years agoMerge pull request #1050 from michael-moore0/feature/extruder-display
Jim Morris [Tue, 25 Oct 2016 22:00:51 +0000 (15:00 -0700)]
Merge pull request #1050 from michael-moore0/feature/extruder-display

modified watch screen to display extruder when printing.

7 years agoadded example configuration for Extruder Display.
Michael Moore [Tue, 25 Oct 2016 21:50:17 +0000 (17:50 -0400)]
added example configuration for Extruder Display.

7 years agoadded config option for extruder display on watch screen.
Michael Moore [Tue, 25 Oct 2016 21:41:22 +0000 (17:41 -0400)]
added config option for extruder display on watch screen.

7 years agomodified watch screen to display extruder when printing.
Michael Moore [Tue, 25 Oct 2016 01:06:46 +0000 (21:06 -0400)]
modified watch screen to display extruder when printing.

7 years agoMerge pull request #1048 from wolfmanjm/upstreamedge
Jim Morris [Mon, 24 Oct 2016 02:15:48 +0000 (19:15 -0700)]
Merge pull request #1048 from wolfmanjm/upstreamedge

Make the nomsd build default to msd disabled

7 years agoMake th enomsd build default to msd disabled
Jim Morris [Mon, 24 Oct 2016 02:06:12 +0000 (19:06 -0700)]
Make th enomsd build default to msd disabled

7 years agocheck halted before sending on halt off
Jim Morris [Mon, 24 Oct 2016 01:39:08 +0000 (18:39 -0700)]
check halted before sending on halt off

7 years agoMerge remote-tracking branch 'upstream/edge' into feature/e-endstop
Jim Morris [Sun, 23 Oct 2016 23:31:24 +0000 (16:31 -0700)]
Merge remote-tracking branch 'upstream/edge' into feature/e-endstop

7 years agoMerge pull request #1046 from Smoothieware/fix/simpler-temp-runaway-fix
Jim Morris [Sun, 23 Oct 2016 23:18:18 +0000 (16:18 -0700)]
Merge pull request #1046 from Smoothieware/fix/simpler-temp-runaway-fix

simple fix for the runaway issue.

7 years agomerge robot correctly
Jim Morris [Fri, 21 Oct 2016 04:59:00 +0000 (21:59 -0700)]
merge robot correctly

7 years agomerge endstops correctly
Jim Morris [Fri, 21 Oct 2016 04:57:17 +0000 (21:57 -0700)]
merge endstops correctly

7 years agoMerge branch 'feature/e-endstop' into merge-abc-with-homing
Jim Morris [Fri, 21 Oct 2016 04:50:51 +0000 (21:50 -0700)]
Merge branch 'feature/e-endstop' into merge-abc-with-homing

Conflicts:
src/modules/robot/Robot.cpp
src/modules/tools/endstops/Endstops.cpp

7 years agoMerge remote-tracking branch 'upstream/edge' into feature/abc-axis
Jim Morris [Fri, 21 Oct 2016 04:41:23 +0000 (21:41 -0700)]
Merge remote-tracking branch 'upstream/edge' into feature/abc-axis

7 years agoUpdate config samples with runaway detection examples
Jim Morris [Thu, 20 Oct 2016 22:43:04 +0000 (15:43 -0700)]
Update config samples with runaway detection examples

7 years agoturn on runaway detection safety by default
Jim Morris [Thu, 20 Oct 2016 21:50:00 +0000 (14:50 -0700)]
turn on runaway detection safety by default

7 years agoIncrease timeout max to 2040 secs or 34 minutes
Jim Morris [Thu, 20 Oct 2016 21:33:57 +0000 (14:33 -0700)]
Increase timeout max to 2040 secs or 34 minutes

7 years agoadd extra cooling down timeout for runaway
Jim Morris [Thu, 20 Oct 2016 06:23:21 +0000 (23:23 -0700)]
add extra cooling down timeout for runaway
Pack more stuff in header so we do not have any net gain in memory usage (the 16 bits would have been padded to 32 before).
Add Cooling DOWN state so if temp is set lower it has a cooling down timeout (defaulkt is the same as heating up)

7 years agoincrease runaway_heating_timeout to a max of 511 seconds
Jim Morris [Tue, 18 Oct 2016 06:56:47 +0000 (23:56 -0700)]
increase runaway_heating_timeout to a max of 511 seconds
decrease runaway_range to a max of 63 degrees

7 years agoFirst pass at a simple fix for the runaway issue where changing the temp causes ON_HALT
Jim Morris [Tue, 18 Oct 2016 04:42:50 +0000 (21:42 -0700)]
First pass at a simple fix for the runaway issue where changing the temp causes ON_HALT

7 years agosome comments
Jim Morris [Tue, 18 Oct 2016 04:40:49 +0000 (21:40 -0700)]
some comments

7 years agoadd comments
Jim Morris [Mon, 17 Oct 2016 20:24:33 +0000 (13:24 -0700)]
add comments

7 years agofix extruder actuator setting when reseting axis
Jim Morris [Mon, 17 Oct 2016 20:08:16 +0000 (13:08 -0700)]
fix extruder actuator setting when reseting axis

7 years agoFix typos in for loop
Jim Morris [Mon, 17 Oct 2016 19:42:02 +0000 (12:42 -0700)]
Fix typos in for loop

7 years agosetting for an actuator to be an extruder
Jim Morris [Sun, 16 Oct 2016 22:05:05 +0000 (15:05 -0700)]
setting for an actuator to be an extruder
check the actuator is an extruder before applying or using e_scale()

7 years agoReset ABC and/or E axis correctly in reset_position_from_current_actuator_position()
Jim Morris [Sun, 16 Oct 2016 10:50:04 +0000 (03:50 -0700)]
Reset ABC and/or E axis correctly in reset_position_from_current_actuator_position()
in G92 En handle e scale properly if n != 0

7 years agoMerge remote-tracking branch 'upstream/edge' into feature/e-endstop
Jim Morris [Sun, 16 Oct 2016 10:11:45 +0000 (03:11 -0700)]
Merge remote-tracking branch 'upstream/edge' into feature/e-endstop

7 years agoMerge pull request #1043 from wolfmanjm/feature/Allow-relative-G10-L2
Jim Morris [Sun, 16 Oct 2016 10:09:57 +0000 (03:09 -0700)]
Merge pull request #1043 from wolfmanjm/feature/Allow-relative-G10-L2

Allow relative mode to affect G10 L2

7 years agoAllow relative mode to affect G10 L2
Jim Morris [Sun, 16 Oct 2016 10:07:26 +0000 (03:07 -0700)]
Allow relative mode to affect G10 L2

7 years agoMerge remote-tracking branch 'upstream/edge' into feature/e-endstop
Jim Morris [Sun, 16 Oct 2016 05:27:09 +0000 (22:27 -0700)]
Merge remote-tracking branch 'upstream/edge' into feature/e-endstop

7 years agoMerge pull request #1042 from wolfmanjm/feature/M18-allow-axis-parameter
Jim Morris [Sun, 16 Oct 2016 05:23:03 +0000 (22:23 -0700)]
Merge pull request #1042 from wolfmanjm/feature/M18-allow-axis-parameter

Feature/m18 allow axis parameter

7 years agoAdd motor_id to stepper motors so they know what axis they are
Jim Morris [Sun, 16 Oct 2016 05:18:36 +0000 (22:18 -0700)]
Add motor_id to stepper motors so they know what axis they are
Change MotorDriver Control so that the designator is actually the axis it is attached to.

7 years agoAllow M18 E0 to act on currently selected extruder
Jim Morris [Sun, 16 Oct 2016 04:11:21 +0000 (21:11 -0700)]
Allow M18 E0 to act on currently selected extruder

7 years agoAllow M18 to turn off selected motors
Jim Morris [Sun, 16 Oct 2016 04:05:22 +0000 (21:05 -0700)]
Allow M18 to turn off selected motors

7 years agoMerge remote-tracking branch 'upstream/edge' into upstreamedge
Jim Morris [Sun, 16 Oct 2016 03:25:36 +0000 (20:25 -0700)]
Merge remote-tracking branch 'upstream/edge' into upstreamedge

7 years agocomment out max endstops if not used
Jim Morris [Sat, 15 Oct 2016 04:51:11 +0000 (21:51 -0700)]
comment out max endstops if not used

7 years agoadd Snippet config for enabllin ABC axis. Old syntax left in Config Sample
Jim Morris [Sat, 15 Oct 2016 04:49:01 +0000 (21:49 -0700)]
add Snippet config for enabllin ABC axis. Old syntax left in Config Sample

7 years agoupdate firmware.bin
Jim Morris [Fri, 14 Oct 2016 07:41:33 +0000 (00:41 -0700)]
update firmware.bin

7 years agoMerge remote-tracking branch 'upstream/edge' into feature/e-endstop
Jim Morris [Fri, 14 Oct 2016 07:39:43 +0000 (00:39 -0700)]
Merge remote-tracking branch 'upstream/edge' into feature/e-endstop

7 years agoMerge pull request #1041 from wolfmanjm/upstreamedge
Jim Morris [Fri, 14 Oct 2016 07:38:54 +0000 (00:38 -0700)]
Merge pull request #1041 from wolfmanjm/upstreamedge

Better and correct fix for Kill hanging on E moving

7 years agoMerge remote-tracking branch 'upstream/edge' into feature/e-endstop
Jim Morris [Fri, 14 Oct 2016 07:27:48 +0000 (00:27 -0700)]
Merge remote-tracking branch 'upstream/edge' into feature/e-endstop

7 years agoMerge remote-tracking branch 'upstream/edge' into upstreamedge
Jim Morris [Fri, 14 Oct 2016 07:25:59 +0000 (00:25 -0700)]
Merge remote-tracking branch 'upstream/edge' into upstreamedge

7 years agoupdate firmware.bin
Jim Morris [Fri, 14 Oct 2016 07:21:36 +0000 (00:21 -0700)]
update firmware.bin

7 years agoBetter and correct fix for Kill hanging on E moving
Jim Morris [Fri, 14 Oct 2016 07:15:28 +0000 (00:15 -0700)]
Better and correct fix for Kill hanging on E moving

7 years agoupdate firmware.bin
Jim Morris [Thu, 13 Oct 2016 22:56:15 +0000 (15:56 -0700)]
update firmware.bin

7 years agoMerge pull request #1040 from wolfmanjm/upstreamedge
Jim Morris [Thu, 13 Oct 2016 22:53:12 +0000 (15:53 -0700)]
Merge pull request #1040 from wolfmanjm/upstreamedge

workaround to handle kill and not wait for motors to stop

7 years agochange ERROR : to ERROR: for out of band temp errors
Jim Morris [Thu, 13 Oct 2016 22:52:15 +0000 (15:52 -0700)]
change ERROR : to ERROR: for out of band temp errors

7 years agoworkaround to handle kill and not wait for motors to stop as that seems to hang
Jim Morris [Thu, 13 Oct 2016 09:00:52 +0000 (02:00 -0700)]
workaround to handle kill and not wait for motors to stop as that seems to hang

7 years agoMerge remote-tracking branch 'upstream/edge' into feature/e-endstop
Jim Morris [Thu, 13 Oct 2016 06:20:39 +0000 (23:20 -0700)]
Merge remote-tracking branch 'upstream/edge' into feature/e-endstop

7 years agoMerge pull request #1038 from michael-moore0/feature/time-format
Jim Morris [Wed, 12 Oct 2016 21:13:39 +0000 (14:13 -0700)]
Merge pull request #1038 from michael-moore0/feature/time-format

modified timestamp format to HH:MM:SS.

7 years agoMerge pull request #1039 from michael-moore0/feature/implement-mkdir
Jim Morris [Wed, 12 Oct 2016 21:12:26 +0000 (14:12 -0700)]
Merge pull request #1039 from michael-moore0/feature/implement-mkdir

implemented the 'mkdir' command on the shell.

7 years agoimplemented the 'mkdir' command on the shell.
Michael Moore [Wed, 12 Oct 2016 20:46:59 +0000 (16:46 -0400)]
implemented the 'mkdir' command on the shell.

7 years agofixed whitespace issue and removed 'sd' to correct spacing.
Michael Moore [Wed, 12 Oct 2016 13:35:13 +0000 (09:35 -0400)]
fixed whitespace issue and removed 'sd' to correct spacing.

7 years agomodified timestamp format to HH:MM:SS.
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.

7 years agoMerge remote-tracking branch 'upstream/edge' into feature/e-endstop
Jim Morris [Sun, 9 Oct 2016 05:19:51 +0000 (22:19 -0700)]
Merge remote-tracking branch 'upstream/edge' into feature/e-endstop

7 years agoMerge pull request #1036 from wolfmanjm/upstreamedge
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

7 years agoAdd 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

7 years agocheck probe status before starting probe.
Jim Morris [Sun, 9 Oct 2016 03:27:31 +0000 (20:27 -0700)]
check probe status before starting probe.

7 years agoMerge remote-tracking branch 'upstream/edge' into feature/e-endstop
Jim Morris [Fri, 7 Oct 2016 22:09:15 +0000 (15:09 -0700)]
Merge remote-tracking branch 'upstream/edge' into feature/e-endstop

7 years agoclean up M119 and limit switch hit messages
Jim Morris [Fri, 7 Oct 2016 19:32:27 +0000 (12:32 -0700)]
clean up M119 and limit switch hit messages

7 years agomove where compensation transform is disabled so axis reset gets it right and Z does...
Jim Morris [Fri, 7 Oct 2016 19:13:28 +0000 (12:13 -0700)]
move where compensation transform is disabled so axis reset gets it right and Z does not move during home

7 years agoFix detection of endstops when it is a corexy and X or Y are moving.
Jim Morris [Thu, 6 Oct 2016 05:36:42 +0000 (22:36 -0700)]
Fix detection of endstops when it is a corexy and X or Y are moving.

7 years agoupdate comments
Jim Morris [Thu, 6 Oct 2016 04:55:12 +0000 (21:55 -0700)]
update comments

7 years agoDelete ZprobeGrid.config
Jim Morris [Wed, 5 Oct 2016 04:37:42 +0000 (21:37 -0700)]
Delete ZprobeGrid.config

7 years agoAdd more info to M119 to show pins as well as homing endstops
Jim Morris [Wed, 5 Oct 2016 00:18:01 +0000 (17:18 -0700)]
Add more info to M119 to show pins as well as homing endstops
implement the manual homing for axis ABC
fix the reset axis for axis ABC

7 years agoallow homing of A B and C individually
Jim Morris [Tue, 4 Oct 2016 20:20:26 +0000 (13:20 -0700)]
allow homing of A B and C individually

7 years agocompleted refactor
Jim Morris [Tue, 4 Oct 2016 19:59:24 +0000 (12:59 -0700)]
completed refactor
added new config for ABC endstops
changed the public access for homing_offset

7 years agorefactor again to split pin info of endstops from homing axis info
Jim Morris [Tue, 4 Oct 2016 00:48:28 +0000 (17:48 -0700)]
refactor again to split pin info of endstops from homing axis info

7 years agomajor refactor of endstop definitions and storage
Jim Morris [Mon, 3 Oct 2016 22:06:16 +0000 (15:06 -0700)]
major refactor of endstop definitions and storage
introdue new syntax for endstops config requied for using ABC endstops

7 years agoMerge branch 'fix/inverse-transform' into feature/e-endstop
Jim Morris [Mon, 3 Oct 2016 18:03:31 +0000 (11:03 -0700)]
Merge branch 'fix/inverse-transform' into feature/e-endstop

7 years agocomment
Jim Morris [Mon, 3 Oct 2016 18:03:13 +0000 (11:03 -0700)]
comment

7 years agoMerge branch 'fix/inverse-transform' into feature/e-endstop
Jim Morris [Mon, 3 Oct 2016 04:39:30 +0000 (21:39 -0700)]
Merge branch 'fix/inverse-transform' into feature/e-endstop

7 years agorefactor to rename last_milestone to machine_position, and last_machne_position to...
Jim Morris [Mon, 3 Oct 2016 04:37:05 +0000 (21:37 -0700)]
refactor to rename last_milestone to machine_position, and last_machne_position to compensated_machine_position
  Thi smore accurately refelcts what is going on and will hopefully reduce confusion

7 years agorefactor endstops pins to handle three extra axis
Jim Morris [Mon, 3 Oct 2016 00:55:23 +0000 (17:55 -0700)]
refactor endstops pins to handle three extra axis
initial handling of A axis homing

7 years agochange M306 again to use MCS position not actuator position
Jim Morris [Sun, 2 Oct 2016 20:23:48 +0000 (13:23 -0700)]
change M306 again to use MCS position not actuator position

7 years agoset homed for all axis if a delta
Jim Morris [Sun, 2 Oct 2016 06:02:23 +0000 (23:02 -0700)]
set homed for all axis if a delta

7 years agoIntroduce concept of homed or not
Jim Morris [Sun, 2 Oct 2016 05:55:28 +0000 (22:55 -0700)]
Introduce concept of homed or not
  add G28.6 to display homed status
  add G28.5 to clear homed status (set unhomed ala linuxcnc)

M306 now requires axis be homed or returns error, and forces axis to be homed before setting it again
 Note M306 may still be buggy if compenstaion transform is on

7 years agoFix reset_axis_position for homing.
Jim Morris [Sat, 1 Oct 2016 07:09:03 +0000 (00:09 -0700)]
Fix reset_axis_position for homing.
   we are given the post compensation position sdo use inverse transform to get last milestone
Change the way G30 Zxxx works.
   so it actually just does a G92 Zxxx after the probe

7 years agoFix homing comamnds if in grbl mode
Jim Morris [Wed, 28 Sep 2016 05:49:24 +0000 (22:49 -0700)]
Fix homing comamnds if in grbl mode

7 years agomore zprobe refactor, remove probeDistance()
Jim Morris [Wed, 28 Sep 2016 05:40:30 +0000 (22:40 -0700)]
more zprobe refactor, remove probeDistance()

7 years agorefactor zprobe probe return to be a method and returns to saved last_milestone so...
Jim Morris [Wed, 28 Sep 2016 05:30:43 +0000 (22:30 -0700)]
refactor zprobe probe return to be a method and returns to saved last_milestone so compensation will be taken into account

7 years agoMerge remote-tracking branch 'upstream/edge' into fix/inverse-transform
Jim Morris [Sat, 24 Sep 2016 22:43:56 +0000 (15:43 -0700)]
Merge remote-tracking branch 'upstream/edge' into fix/inverse-transform

7 years agoMerge pull request #1033 from wolfmanjm/upstreamedge
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

7 years agoadd BS and DEL to the USB serial to delete last chanracter entered, gives simple...
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

7 years agoMerge pull request #1031 from nallar/patch-1
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)

7 years agoMaking it clear issues are for issue ( Duh. )
Arthur Wolf [Sat, 24 Sep 2016 18:22:31 +0000 (20:22 +0200)]
Making it clear issues are for issue ( Duh. )

7 years agoFix broken link in README (HowToFileIssues.md)
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

7 years agoMerge branch 'upstreamedge' into fix/inverse-transform
Jim Morris [Fri, 23 Sep 2016 20:24:36 +0000 (13:24 -0700)]
Merge branch 'upstreamedge' into fix/inverse-transform

7 years agoMerge pull request #1030 from wolfmanjm/upstreamedge
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

7 years agoadd 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

7 years agoMerge pull request #1029 from wolfmanjm/upstreamedge
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

7 years agoMerge branch 'upstreamedge' into fix/inverse-transform
Jim Morris [Thu, 22 Sep 2016 05:42:00 +0000 (22:42 -0700)]
Merge branch 'upstreamedge' into fix/inverse-transform