clinton/Smoothieware.git
7 years agoallow deprectaed M203 A B C format, but warn about deprecation
Jim Morris [Sun, 26 Jun 2016 20:37:14 +0000 (13:37 -0700)]
allow deprectaed M203 A B C format, but warn about deprecation

7 years agominor refactor
Jim Morris [Sun, 26 Jun 2016 20:15:55 +0000 (13:15 -0700)]
minor refactor

7 years agorevert change to back off at fast rate, it is too violent on deltas.
Jim Morris [Sun, 26 Jun 2016 05:39:46 +0000 (22:39 -0700)]
revert change to back off at fast rate, it is too violent on deltas.

7 years agouse fast rate for backoff endstops
Jim Morris [Sun, 26 Jun 2016 03:10:18 +0000 (20:10 -0700)]
use fast rate for backoff endstops

7 years agoadd M114.3 for extruder
Jim Morris [Sun, 26 Jun 2016 01:20:06 +0000 (18:20 -0700)]
add M114.3 for extruder
fix for CNC build

7 years agofix M205 when printed out by M500
Jim Morris [Sat, 25 Jun 2016 07:03:17 +0000 (00:03 -0700)]
fix M205 when printed out by M500

7 years agofix M207 and M205
Jim Morris [Sat, 25 Jun 2016 06:58:56 +0000 (23:58 -0700)]
fix M207 and M205

7 years agoreset axis before trying to home
Jim Morris [Sat, 25 Jun 2016 06:08:25 +0000 (23:08 -0700)]
reset axis before trying to home

7 years agorename wait_for_empty_queue to wait for idle
Jim Morris [Sat, 25 Jun 2016 01:00:32 +0000 (18:00 -0700)]
rename wait_for_empty_queue to wait for idle

7 years agofix move to origin for deltas and cartesians when not homing all axis
Jim Morris [Fri, 24 Jun 2016 21:44:42 +0000 (14:44 -0700)]
fix move to origin for deltas and cartesians when not homing all axis

7 years agoallow $H to initiate homing when in halt, and clears halt as well (as per GRBL)
Jim Morris [Fri, 24 Jun 2016 21:10:26 +0000 (14:10 -0700)]
allow $H to initiate homing when in halt, and clears halt as well (as per GRBL)

7 years agoMerge remote-tracking branch 'upstream/edge' into feature/5-axis
Jim Morris [Fri, 24 Jun 2016 20:02:56 +0000 (13:02 -0700)]
Merge remote-tracking branch 'upstream/edge' into feature/5-axis

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

7 years agoMerge pull request #953 from Zaaphod/edge
Jim Morris [Fri, 24 Jun 2016 19:59:23 +0000 (12:59 -0700)]
Merge pull request #953 from Zaaphod/edge

Fix Homing when in G20

7 years agofix using is queue empty when it should be is_idle
Jim Morris [Fri, 24 Jun 2016 19:54:20 +0000 (12:54 -0700)]
fix using is queue empty when it should be is_idle

7 years agoUpdate method
James Richters [Fri, 24 Jun 2016 18:46:20 +0000 (14:46 -0400)]
Update method

Remove G21 from in front of G53 as this is not valid.   Turn off inch
mode directly.

7 years agoFix Homing when in G20
James Richters [Fri, 24 Jun 2016 17:54:24 +0000 (13:54 -0400)]
Fix Homing when in G20

This is a bug fix when homing when in G20  mode.  It was making the
final move in inches instead of mm.  Homing should always bring you to
the same exact point whether you are in G20 or G21.  See
https://github.com/Smoothieware/Smoothieware/issues/952

7 years agofix inconsistencies in disyance for e only moves and accleration scaling etc
Jim Morris [Thu, 23 Jun 2016 23:47:08 +0000 (16:47 -0700)]
fix inconsistencies in disyance for e only moves and accleration scaling etc
removed hack for G92 between G10 and G11

7 years agofix extruder E values when in volumetric mode. this is a breaking change as it now...
Jim Morris [Thu, 23 Jun 2016 22:39:20 +0000 (15:39 -0700)]
fix extruder E values when in volumetric mode. this is a breaking change as it now always expects the E parameter to be in mm^3
  - the down side here is that when you extrude 10mm form pronterface it will be interpreted as 10mm^3 instead
G10/G11 should now work, M207 still specifes retract length in mm, but is converted to mm^3 when G10 is executed
  - we now have a function pointer set by the active extruder to get the E scaling from robot

7 years agocalculate unit vector with real distance of XYZ not including E axis
Jim Morris [Thu, 23 Jun 2016 07:31:38 +0000 (00:31 -0700)]
calculate unit vector with real distance of XYZ not including E axis

7 years agofix entry speed of a move following an retracty or unretract (non primary axis move)
Jim Morris [Thu, 23 Jun 2016 07:07:18 +0000 (00:07 -0700)]
fix entry speed of a move following an retracty or unretract (non primary axis move)
include the E movement in the millimeters of travel calculation for when the E steps are greater than the XYZ

7 years agominor refactors
Jim Morris [Thu, 23 Jun 2016 01:21:28 +0000 (18:21 -0700)]
minor refactors

7 years agominior refactors and comment editing
Jim Morris [Wed, 22 Jun 2016 23:57:50 +0000 (16:57 -0700)]
minior refactors and comment editing

7 years agoHack to save position around G10 and G11 for older slic3rs that do G92 E0 between...
Jim Morris [Wed, 22 Jun 2016 23:39:47 +0000 (16:39 -0700)]
Hack to save position around G10 and G11 for older slic3rs that do G92 E0 between the two
  - note the current step position will still be incorrect after G11 has finished executing but only for E and only for M114.1

7 years agochange the M203 to be M203 and M203.1 for actuators and use XYZ not ABC
Jim Morris [Wed, 22 Jun 2016 08:07:15 +0000 (01:07 -0700)]
change the M203 to be M203 and M203.1 for actuators and use XYZ not ABC

7 years agoMerge pull request #949 from wolfmanjm/upstreamedge
Jim Morris [Wed, 22 Jun 2016 07:39:50 +0000 (00:39 -0700)]
Merge pull request #949 from wolfmanjm/upstreamedge

add config sample for version 3 of the azteeg X5

7 years agoadd config sample for version 3 of the azteeg X5
Jim Morris [Wed, 22 Jun 2016 07:37:55 +0000 (00:37 -0700)]
add config sample for version 3 of the azteeg X5

7 years agouse std::vector instead of std::array so we don't have one huge chunk when the block...
Jim Morris [Wed, 22 Jun 2016 07:36:04 +0000 (00:36 -0700)]
use std::vector instead of std::array so we don't have one huge chunk when the block queue is created

7 years agoremove debug of block
Jim Morris [Tue, 21 Jun 2016 23:44:39 +0000 (16:44 -0700)]
remove debug of block

7 years agomake the tick_info in Block a vector, assigning how ever many registered motors there are
Jim Morris [Tue, 21 Jun 2016 23:37:47 +0000 (16:37 -0700)]
make the tick_info in Block a vector, assigning how ever many registered motors there are
  This may use slightly more memory in the long run (std::vector vs std::array), but it doesn't need the huge chunk to allocate
  which may fails as the heap is too fragmented after config

7 years agomove more modules to AHB0
Jim Morris [Tue, 21 Jun 2016 22:20:11 +0000 (15:20 -0700)]
move more modules to AHB0

7 years agofix the public data for extruder that the panel uses
Jim Morris [Tue, 21 Jun 2016 21:11:08 +0000 (14:11 -0700)]
fix the public data for extruder that the panel uses
fix filament detector access to extruder

7 years agoFIx suspend/pause and saving/restoring Extruder state, this is complex due to possibl...
Jim Morris [Tue, 21 Jun 2016 20:36:52 +0000 (13:36 -0700)]
FIx suspend/pause and saving/restoring Extruder state, this is complex due to possible scaling of E parameter in the actuator

7 years agocheck max speeds in solo_move
Jim Morris [Tue, 21 Jun 2016 19:35:25 +0000 (12:35 -0700)]
check max speeds in solo_move

7 years agominor updates
Jim Morris [Tue, 21 Jun 2016 08:08:18 +0000 (01:08 -0700)]
minor updates

7 years agofix a lot of extruder functionality,
Jim Morris [Tue, 21 Jun 2016 04:19:03 +0000 (21:19 -0700)]
fix a lot of extruder functionality,
 firmware retract etc
 fix get axis position in robot to return more than 3 axis

7 years agoadd home_z_first option for homing, where Z will home first then X and Y
Jim Morris [Tue, 21 Jun 2016 01:30:08 +0000 (18:30 -0700)]
add home_z_first option for homing, where Z will home first then X and Y

7 years agoOld extruder config settings have been removed, Azteeg configs updated to accomodate
Jim Morris [Mon, 20 Jun 2016 22:30:13 +0000 (15:30 -0700)]
Old extruder config settings have been removed, Azteeg configs updated to accomodate

7 years agorewrite extruder to handle new core system
Jim Morris [Mon, 20 Jun 2016 18:46:27 +0000 (11:46 -0700)]
rewrite extruder to handle new core system

7 years agoinitial modification for 5 axis, two extruders only one active
Jim Morris [Sun, 19 Jun 2016 23:00:37 +0000 (16:00 -0700)]
initial modification for 5 axis, two extruders only one active

7 years agominoir refactor of config_load
Jim Morris [Sat, 18 Jun 2016 19:50:55 +0000 (12:50 -0700)]
minoir refactor of config_load

7 years agodebounce is now debounce_ms and the old debounce_count is ignored for zprobe but...
Jim Morris [Sat, 18 Jun 2016 01:08:23 +0000 (18:08 -0700)]
debounce is now debounce_ms and the old debounce_count is ignored for zprobe but still used for limit switches in endstops
  as the switches are now polled every millisecond that is usually enough for a debounce, so is set to 0 by default, but if set should be in ms and far less than it used to be

7 years agoupdate scaralcal to compile
Jim Morris [Fri, 17 Jun 2016 23:29:38 +0000 (16:29 -0700)]
update scaralcal to compile

7 years agorewrite zprobe to work with new motion control
Jim Morris [Fri, 17 Jun 2016 23:21:11 +0000 (16:21 -0700)]
rewrite zprobe to work with new motion control

7 years agorefactors
Jim Morris [Fri, 17 Jun 2016 21:44:40 +0000 (14:44 -0700)]
refactors

7 years agoMerge remote-tracking branch 'upstream/edge' into feature/acceleration-per-tick
Jim Morris [Fri, 17 Jun 2016 20:18:45 +0000 (13:18 -0700)]
Merge remote-tracking branch 'upstream/edge' into feature/acceleration-per-tick

7 years agoUpdate HowToFileIssues.md
Jim Morris [Fri, 17 Jun 2016 20:16:38 +0000 (13:16 -0700)]
Update HowToFileIssues.md

7 years agoRemoved octoprint mention
Arthur Wolf [Fri, 17 Jun 2016 19:50:36 +0000 (21:50 +0200)]
Removed octoprint mention

7 years agofix homing, speeds and backoffs
Jim Morris [Fri, 17 Jun 2016 09:33:37 +0000 (02:33 -0700)]
fix homing, speeds and backoffs

7 years agorefactor how axis are selected for homing
Jim Morris [Fri, 17 Jun 2016 01:56:20 +0000 (18:56 -0700)]
refactor how axis are selected for homing

7 years agoImplement homing for deltas, which only homes in the Z Axis
Jim Morris [Fri, 17 Jun 2016 01:38:59 +0000 (18:38 -0700)]
Implement homing for deltas, which only homes in the Z Axis

7 years agoImplement endstops using new motion control
Jim Morris [Fri, 17 Jun 2016 01:30:05 +0000 (18:30 -0700)]
Implement endstops using new motion control
  this breaks some backwards compatibility
    1. XY can home at the same time but not Z so by default XY homes then Z (on cartesians)
    2. the alpha_max, beta_max and gamma_max must be defined to limit the homing movement for that axis
    3. corexy can now only home each axis one at a time
  delta is not done yet
renamed THEKERNEL->robot to THEROBOT

7 years agoMerge pull request #944 from Zaaphod/edge
Jim Morris [Thu, 16 Jun 2016 23:46:59 +0000 (16:46 -0700)]
Merge pull request #944 from Zaaphod/edge

Feature: Interpolate Arcs based on Maximum Error

7 years agoMerge pull request #2 from Zaaphod/Update-Config---Change-Default
Zaaphod [Thu, 16 Jun 2016 23:34:42 +0000 (19:34 -0400)]
Merge pull request #2 from Zaaphod/Update-Config---Change-Default

Update config   change default

7 years agoMerge pull request #1 from Zaaphod/remove-test-output
Zaaphod [Thu, 16 Jun 2016 23:32:39 +0000 (19:32 -0400)]
Merge pull request #1 from Zaaphod/remove-test-output

Remove test output

7 years agofix bugs inconveyor so it starts queue off correctly
Jim Morris [Thu, 16 Jun 2016 08:13:45 +0000 (01:13 -0700)]
fix bugs inconveyor so it starts queue off correctly

7 years agoGo back to stepticker getting data direct from block queue.
Jim Morris [Thu, 16 Jun 2016 06:01:45 +0000 (23:01 -0700)]
Go back to stepticker getting data direct from block queue.
  This solves the issue of stepticker queue running dry
  uses the dual tail pointer that triffid designed
  block queue garbage collected during on_idle
  still has optimization to wait for queue to fill or timeout

7 years agoChange default
Zaaphod [Sun, 12 Jun 2016 18:00:20 +0000 (14:00 -0400)]
Change default

Change default for mm_per_arc_segment

7 years agoAdd mm_max_arc_error
Zaaphod [Sun, 12 Jun 2016 17:57:20 +0000 (13:57 -0400)]
Add mm_max_arc_error

Added mm_max_arc_error interpolation variable to sample config

7 years agoAdd mm_max_arc_error
Zaaphod [Sun, 12 Jun 2016 17:55:38 +0000 (13:55 -0400)]
Add mm_max_arc_error

Added mm_max_arc_error interpolation variable to sample config

7 years agoAdd mm_max_arc_error
Zaaphod [Sun, 12 Jun 2016 17:54:22 +0000 (13:54 -0400)]
Add mm_max_arc_error

Added mm_max_arc_error interpolation variable to sample config

7 years agoAdd mm_max_arc_error
Zaaphod [Sun, 12 Jun 2016 17:53:14 +0000 (13:53 -0400)]
Add mm_max_arc_error

Added mm_max_arc_error interpolation variable to sample config

7 years agoAdd mm_max_arc_error
Zaaphod [Sun, 12 Jun 2016 17:52:23 +0000 (13:52 -0400)]
Add mm_max_arc_error

Added mm_max_arc_error interpolation variable to sample config

7 years agoAdd mm_max_arc_error
Zaaphod [Sun, 12 Jun 2016 17:51:33 +0000 (13:51 -0400)]
Add mm_max_arc_error

Added mm_max_arc_error interpolation variable to sample config

7 years agoAdd mm_max_arc_error
Zaaphod [Sun, 12 Jun 2016 17:50:26 +0000 (13:50 -0400)]
Add mm_max_arc_error

Added mm_max_arc_error interpolation variable to sample config

7 years agoMerge remote-tracking branch 'upstream/edge' into feature/acceleration-per-tick
Jim Morris [Fri, 10 Jun 2016 21:02:59 +0000 (14:02 -0700)]
Merge remote-tracking branch 'upstream/edge' into feature/acceleration-per-tick

7 years agoupdate firmware.bin
Jim Morris [Fri, 10 Jun 2016 20:50:50 +0000 (13:50 -0700)]
update firmware.bin

7 years agoMerge pull request #942 from wolfmanjm/upstreamedge
Jim Morris [Fri, 10 Jun 2016 20:46:04 +0000 (13:46 -0700)]
Merge pull request #942 from wolfmanjm/upstreamedge

Fix resume so it uses G53 to restore position

7 years agoFix resume so it uses G53 to restore position
Jim Morris [Fri, 10 Jun 2016 20:35:28 +0000 (13:35 -0700)]
Fix resume so it uses G53 to restore position
Fix the alpha_max_speed config setting so it is in mm/min not mm/sec (reverting bug introduced by PR #759

7 years agoUpdate README.creole
Jim Morris [Thu, 9 Jun 2016 18:37:39 +0000 (11:37 -0700)]
Update README.creole

7 years agoUpdate Robot.cpp
Zaaphod [Thu, 9 Jun 2016 16:41:51 +0000 (12:41 -0400)]
Update Robot.cpp

7 years agodisable test output
Zaaphod [Thu, 9 Jun 2016 14:42:26 +0000 (10:42 -0400)]
disable test output

Comment out test output

7 years agoMinor change
Zaaphod [Thu, 9 Jun 2016 14:32:01 +0000 (10:32 -0400)]
Minor change

7 years agoUpdate HowToFileIssues.md
Jim Morris [Thu, 9 Jun 2016 08:12:18 +0000 (01:12 -0700)]
Update HowToFileIssues.md

7 years agoMerge pull request #941 from wolfmanjm/upstreamedge
Jim Morris [Thu, 9 Jun 2016 08:10:37 +0000 (01:10 -0700)]
Merge pull request #941 from wolfmanjm/upstreamedge

how to file issues document

7 years agohow to file issues document
Jim Morris [Thu, 9 Jun 2016 08:09:11 +0000 (01:09 -0700)]
how to file issues document

7 years agobug fix, changes with arc error, test output
Zaaphod [Wed, 8 Jun 2016 21:23:03 +0000 (17:23 -0400)]
bug fix, changes with arc error, test output

Fixed a bug on line 185 so mm_max_arc_error now is correctly read in from config file

Changed line 1025 so setting mm_max_arc_error = 0 will disable the new calculation.
Setting mm_per_arc_segment = 0 will run only new calculation
setting both will use whichever value is larger

changed formula on line 1032 to more accurately divide segments.  This prevents the error from ever being greater than the specified arc error. It is taking into account the start point that the original formula was ignoring.

added a printf to output relevant data to serial port for calculation verification testing purposes only

7 years agomove where the stepticker debug pin is defined
Jim Morris [Tue, 7 Jun 2016 04:53:33 +0000 (21:53 -0700)]
move where the stepticker debug pin is defined

7 years agoremove the minimum stepper rate as it is no longer used
Jim Morris [Mon, 6 Jun 2016 21:36:57 +0000 (14:36 -0700)]
remove the minimum stepper rate as it is no longer used

8 years ago[gcode] Limit arg segments by max arc error
Rene Aguirre [Fri, 3 Jun 2016 02:57:07 +0000 (19:57 -0700)]
[gcode] Limit arg segments by max arc error

Refer to issue 927.

Arc segments are limited by new mm_max_arc_error configuration.

The limit on generated segments is kept by existing mm_per_arc_segment.

8 years agoupdate firmware.bin
Jim Morris [Wed, 1 Jun 2016 23:09:19 +0000 (16:09 -0700)]
update firmware.bin

8 years agoMerge pull request #935 from wolfmanjm/upstreamedge
Jim Morris [Wed, 1 Jun 2016 20:29:13 +0000 (13:29 -0700)]
Merge pull request #935 from wolfmanjm/upstreamedge

Attempt to fix the USB serial output stall

8 years agoMerge branch 'upstreamedge' into feature/acceleration-per-tick
Jim Morris [Wed, 1 Jun 2016 20:14:56 +0000 (13:14 -0700)]
Merge branch 'upstreamedge' into feature/acceleration-per-tick

8 years agoAttempt to fix the USB serial output stall
Jim Morris [Wed, 1 Jun 2016 20:14:17 +0000 (13:14 -0700)]
Attempt to fix the USB serial output stall

8 years agoUpdate .gitignore
Jim Morris [Tue, 31 May 2016 21:30:35 +0000 (14:30 -0700)]
Update .gitignore

8 years agoMerge remote-tracking branch 'upstream/edge' into feature/acceleration-per-tick
Jim Morris [Mon, 30 May 2016 23:07:31 +0000 (16:07 -0700)]
Merge remote-tracking branch 'upstream/edge' into feature/acceleration-per-tick

8 years agoMerge pull request #934 from wolfmanjm/upstreamedge
Jim Morris [Mon, 30 May 2016 23:00:15 +0000 (16:00 -0700)]
Merge pull request #934 from wolfmanjm/upstreamedge

make the cnc test circle use G2

8 years agomake the cnc test circle use G2
Jim Morris [Mon, 30 May 2016 22:58:48 +0000 (15:58 -0700)]
make the cnc test circle use G2
fix float ops for G2/G3

8 years agofix step ticker debug pin definition
Jim Morris [Sat, 28 May 2016 22:53:40 +0000 (15:53 -0700)]
fix step ticker debug pin definition

8 years agoMerge remote-tracking branch 'upstream/edge' into mergecnc-accpertick
Jim Morris [Sat, 28 May 2016 22:42:19 +0000 (15:42 -0700)]
Merge remote-tracking branch 'upstream/edge' into mergecnc-accpertick

Conflicts:
src/libs/StepTicker.cpp
src/libs/StepTicker.h
src/libs/StepperMotor.cpp
src/libs/StepperMotor.h
src/modules/robot/Conveyor.cpp
src/modules/robot/Conveyor.h
src/modules/utils/simpleshell/SimpleShell.cpp

8 years agoUpdate Readme.md
Jim Morris [Sat, 28 May 2016 20:54:13 +0000 (13:54 -0700)]
Update Readme.md

8 years agoadd cnc build
Jim Morris [Sat, 28 May 2016 20:50:27 +0000 (13:50 -0700)]
add cnc build

8 years agoUpdate .travis.yml
Jim Morris [Sat, 28 May 2016 20:39:43 +0000 (13:39 -0700)]
Update .travis.yml

8 years agoUpdate .travis.yml
Jim Morris [Sat, 28 May 2016 20:37:42 +0000 (13:37 -0700)]
Update .travis.yml

8 years agoMerge pull request #921 from wolfmanjm/feature/cnc-pendant-panel
Jim Morris [Sat, 28 May 2016 20:27:54 +0000 (13:27 -0700)]
Merge pull request #921 from wolfmanjm/feature/cnc-pendant-panel

Feature/cnc pendant panel

8 years agomake the jobq time atomic
Jim Morris [Thu, 26 May 2016 01:23:57 +0000 (18:23 -0700)]
make the jobq time atomic

8 years agoattempt to fix the issues regarding the job q drying up and motion stoppoing dead...
Jim Morris [Wed, 25 May 2016 23:26:31 +0000 (16:26 -0700)]
attempt to fix the issues regarding the job q drying up and motion stoppoing dead - not complete

8 years agoimprove the check for blocks that can be pushed onto the job queue
Jim Morris [Tue, 24 May 2016 05:45:43 +0000 (22:45 -0700)]
improve the check for blocks that can be pushed onto the job queue

8 years agoFix conveyor to autostart
Jim Morris [Tue, 24 May 2016 03:54:56 +0000 (20:54 -0700)]
Fix conveyor to autostart
Fix the way the queues are kept full
FIx detection of idle condition
  TOD if moves are faster than about 150ms the job queue will dry up which is a problen for the planner as it will not know and will not decelerate

8 years agotweak the check_queue for when to push new blocks onto the job queue
Jim Morris [Mon, 23 May 2016 08:19:38 +0000 (01:19 -0700)]
tweak the check_queue for when to push new blocks onto the job queue

8 years agoReworked the entire block queue and conveyor, see comments in COnveyor for new method.
Jim Morris [Mon, 23 May 2016 03:17:34 +0000 (20:17 -0700)]
Reworked the entire block queue and conveyor, see comments in COnveyor for new method.
  Advantages:- no delay between moves as handoff is no longer in ISR, uses a littl ebit more mempory to store queues
  blocks are deleted when moved to step ticker job queue, but no more on_block_begin etc
  the gc_pending double tail is no longer needed as block queue is always handled in on_main_loop()
  There is a slight delay before first block will run, currently hardcoded to 100ms will be settable in config, the longer it is the more likely the first moves will be planned properly.
  if it is too short then planning may not be done correctly when streaming.