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
Jim Morris [Tue, 21 Jun 2016 19:35:25 +0000 (12:35 -0700)]
check max speeds in solo_move
Jim Morris [Tue, 21 Jun 2016 08:08:18 +0000 (01:08 -0700)]
minor updates
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
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
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
Jim Morris [Mon, 20 Jun 2016 18:46:27 +0000 (11:46 -0700)]
rewrite extruder to handle new core system
Jim Morris [Sun, 19 Jun 2016 23:00:37 +0000 (16:00 -0700)]
initial modification for 5 axis, two extruders only one active
Jim Morris [Sat, 18 Jun 2016 19:50:55 +0000 (12:50 -0700)]
minoir refactor of config_load
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
Jim Morris [Fri, 17 Jun 2016 23:29:38 +0000 (16:29 -0700)]
update scaralcal to compile
Jim Morris [Fri, 17 Jun 2016 23:21:11 +0000 (16:21 -0700)]
rewrite zprobe to work with new motion control
Jim Morris [Fri, 17 Jun 2016 21:44:40 +0000 (14:44 -0700)]
refactors
Jim Morris [Fri, 17 Jun 2016 20:18:45 +0000 (13:18 -0700)]
Merge remote-tracking branch 'upstream/edge' into feature/acceleration-per-tick
Jim Morris [Fri, 17 Jun 2016 20:16:38 +0000 (13:16 -0700)]
Update HowToFileIssues.md
Arthur Wolf [Fri, 17 Jun 2016 19:50:36 +0000 (21:50 +0200)]
Removed octoprint mention
Jim Morris [Fri, 17 Jun 2016 09:33:37 +0000 (02:33 -0700)]
fix homing, speeds and backoffs
Jim Morris [Fri, 17 Jun 2016 01:56:20 +0000 (18:56 -0700)]
refactor how axis are selected for homing
Jim Morris [Fri, 17 Jun 2016 01:38:59 +0000 (18:38 -0700)]
Implement homing for deltas, which only homes in the Z Axis
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
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
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
Zaaphod [Thu, 16 Jun 2016 23:32:39 +0000 (19:32 -0400)]
Merge pull request #1 from Zaaphod/remove-test-output
Remove test output
Jim Morris [Thu, 16 Jun 2016 08:13:45 +0000 (01:13 -0700)]
fix bugs inconveyor so it starts queue off correctly
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
Zaaphod [Sun, 12 Jun 2016 18:00:20 +0000 (14:00 -0400)]
Change default
Change default for mm_per_arc_segment
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
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
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
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
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
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
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
Jim Morris [Fri, 10 Jun 2016 21:02:59 +0000 (14:02 -0700)]
Merge remote-tracking branch 'upstream/edge' into feature/acceleration-per-tick
Jim Morris [Fri, 10 Jun 2016 20:50:50 +0000 (13:50 -0700)]
update firmware.bin
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
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
Jim Morris [Thu, 9 Jun 2016 18:37:39 +0000 (11:37 -0700)]
Update README.creole
Zaaphod [Thu, 9 Jun 2016 16:41:51 +0000 (12:41 -0400)]
Update Robot.cpp
Zaaphod [Thu, 9 Jun 2016 14:42:26 +0000 (10:42 -0400)]
disable test output
Comment out test output
Zaaphod [Thu, 9 Jun 2016 14:32:01 +0000 (10:32 -0400)]
Minor change
Jim Morris [Thu, 9 Jun 2016 08:12:18 +0000 (01:12 -0700)]
Update HowToFileIssues.md
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
Jim Morris [Thu, 9 Jun 2016 08:09:11 +0000 (01:09 -0700)]
how to file issues document
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
Jim Morris [Tue, 7 Jun 2016 04:53:33 +0000 (21:53 -0700)]
move where the stepticker debug pin is defined
Jim Morris [Mon, 6 Jun 2016 21:36:57 +0000 (14:36 -0700)]
remove the minimum stepper rate as it is no longer used
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.
Jim Morris [Wed, 1 Jun 2016 23:09:19 +0000 (16:09 -0700)]
update firmware.bin
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
Jim Morris [Wed, 1 Jun 2016 20:14:56 +0000 (13:14 -0700)]
Merge branch 'upstreamedge' into feature/acceleration-per-tick
Jim Morris [Wed, 1 Jun 2016 20:14:17 +0000 (13:14 -0700)]
Attempt to fix the USB serial output stall
Jim Morris [Tue, 31 May 2016 21:30:35 +0000 (14:30 -0700)]
Update .gitignore
Jim Morris [Mon, 30 May 2016 23:07:31 +0000 (16:07 -0700)]
Merge remote-tracking branch 'upstream/edge' into feature/acceleration-per-tick
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
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
Jim Morris [Sat, 28 May 2016 22:53:40 +0000 (15:53 -0700)]
fix step ticker debug pin definition
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
Jim Morris [Sat, 28 May 2016 20:54:13 +0000 (13:54 -0700)]
Update Readme.md
Jim Morris [Sat, 28 May 2016 20:50:27 +0000 (13:50 -0700)]
add cnc build
Jim Morris [Sat, 28 May 2016 20:39:43 +0000 (13:39 -0700)]
Update .travis.yml
Jim Morris [Sat, 28 May 2016 20:37:42 +0000 (13:37 -0700)]
Update .travis.yml
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
Jim Morris [Thu, 26 May 2016 01:23:57 +0000 (18:23 -0700)]
make the jobq time atomic
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
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
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
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
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.
Jim Morris [Wed, 18 May 2016 22:38:37 +0000 (15:38 -0700)]
Merge pull request #926 from wolfmanjm/upstreamedge
fix reset pin for st7565
Jim Morris [Wed, 18 May 2016 22:37:40 +0000 (15:37 -0700)]
fix reset pin for st7565
Jim Morris [Wed, 18 May 2016 22:31:22 +0000 (15:31 -0700)]
Merge pull request #925 from wolfmanjm/upstreamedge
Fix drilling cycles to use WCS
Jim Morris [Wed, 18 May 2016 22:28:50 +0000 (15:28 -0700)]
Fix drillign cycles to use WCS
Jim Morris [Wed, 18 May 2016 22:28:50 +0000 (15:28 -0700)]
Fix drillign cycles to use WCS
Jim Morris [Wed, 18 May 2016 05:48:14 +0000 (22:48 -0700)]
do not disable irqs in block queue anymore. Should not be needed
Jim Morris [Tue, 17 May 2016 08:01:20 +0000 (01:01 -0700)]
started hacking on the new conveyor model
removed stepper as it doesn nothing now
removed the events on_block_begin, on_block_end, on_gcode_execute
Jim Morris [Sun, 24 Apr 2016 21:17:52 +0000 (14:17 -0700)]
allow for a default_excludes.mk file in src that will be used for the excluded midules but is not checked into git
Conflicts:
src/makefile
src/modules/utils/panel/screens/cnc/WatchScreen.cpp
src/modules/utils/panel/screens/cnc/WatchScreen.h
Jim Morris [Tue, 17 May 2016 02:55:45 +0000 (19:55 -0700)]
comments
Arthur Wolf [Mon, 16 May 2016 18:31:35 +0000 (20:31 +0200)]
Adding license information
Jim Morris [Sun, 15 May 2016 23:54:57 +0000 (16:54 -0700)]
start at tick 0
round the fp to fixfp rather than floor
Arthur Wolf [Sun, 15 May 2016 07:22:49 +0000 (09:22 +0200)]
Added a bit of contribution information to the readme
Jim Morris [Sun, 15 May 2016 06:41:39 +0000 (23:41 -0700)]
add job queue to stepticker.
remove unused data from steppermotor
Jim Morris [Sun, 15 May 2016 03:47:24 +0000 (20:47 -0700)]
fixed bugs
optimized stepticker to use fixed point
generates steps now
Jim Morris [Sat, 14 May 2016 08:27:15 +0000 (01:27 -0700)]
Inital rewrite of stepticker and associated code to implement accleration per tick.
Jim Morris [Fri, 13 May 2016 23:02:00 +0000 (16:02 -0700)]
print out CNC build if a CNC build
Jim Morris [Fri, 13 May 2016 22:58:55 +0000 (15:58 -0700)]
define -DCNC if a CNC build
Jim Morris [Wed, 11 May 2016 03:06:20 +0000 (20:06 -0700)]
only build the new test command for a cnc build (although they may be usefulk for 3d printers u=it uses a lot more flash).
Jim Morris [Wed, 11 May 2016 02:58:20 +0000 (19:58 -0700)]
Merge remote-tracking branch 'upstream/edge' into feature/cnc-pendant-panel
Jim Morris [Mon, 9 May 2016 03:11:02 +0000 (20:11 -0700)]
fix the actualy feedrate display on panel for cnc pendant
Jim Morris [Sun, 8 May 2016 23:44:42 +0000 (16:44 -0700)]
display in CNC pendant the requested feedrate and the actual nominal feedrate of current block.
Jim Morris [Sat, 7 May 2016 20:59:07 +0000 (13:59 -0700)]
fix abort when probing from panel in cnc mode
Jim Morris [Sat, 7 May 2016 20:46:18 +0000 (13:46 -0700)]
add workspace coordinate selection screen for cnc panel
fix probing screen
Jim Morris [Fri, 6 May 2016 08:25:47 +0000 (01:25 -0700)]
show 3dp for jog increment
Jim Morris [Fri, 6 May 2016 00:05:18 +0000 (17:05 -0700)]
add inches and millimeter settings to prepare menu for cnc
rename watch screen to DRO on main menu for CNC
Jim Morris [Thu, 5 May 2016 20:58:26 +0000 (13:58 -0700)]
Add more probing entries for CNC
Add more prepare options for CNC (spindle on etc)
Jim Morris [Thu, 5 May 2016 07:47:35 +0000 (00:47 -0700)]
make sure the WCS settings are handled correctly in inch mode, report in inches if in inch mode
Jim Morris [Thu, 5 May 2016 07:30:42 +0000 (00:30 -0700)]
Indicate if in inch or mm mode in watch screen
make sure jog feedrate is converted to inch mode if in inch mode
add touch off X Y Z to prepare menu (sets current WCS)
Jim Morris [Thu, 5 May 2016 07:14:19 +0000 (00:14 -0700)]
make sure panel jogs are in absolute mode
add another finer jog setting
Jim Morris [Wed, 4 May 2016 21:18:22 +0000 (14:18 -0700)]
rename to MPG mode
Jim Morris [Sat, 30 Apr 2016 19:41:07 +0000 (12:41 -0700)]
refactor screens to avoid duplication
add settable jog feedrates screen