clinton/Smoothieware.git
11 years agoremoving more debug pins
Arthur Wolf [Tue, 16 Apr 2013 13:49:36 +0000 (15:49 +0200)]
removing more debug pins

11 years agoPlayLed should not work this way
Arthur Wolf [Tue, 16 Apr 2013 13:42:44 +0000 (15:42 +0200)]
PlayLed should not work this way

11 years agoremoving debug pins and counter in StepTicker
Arthur Wolf [Tue, 16 Apr 2013 13:41:24 +0000 (15:41 +0200)]
removing debug pins and counter in StepTicker

11 years agotemporary fix to the decel bug
Arthur Wolf [Tue, 16 Apr 2013 13:31:48 +0000 (15:31 +0200)]
temporary fix to the decel bug

11 years agoMerge branch 'edge' into accel
Arthur Wolf [Mon, 15 Apr 2013 14:25:20 +0000 (16:25 +0200)]
Merge branch 'edge' into accel

11 years agotrying something. hopefully that can be a temp fix to the accel problem
Arthur Wolf [Mon, 15 Apr 2013 14:25:13 +0000 (16:25 +0200)]
trying something. hopefully that can be a temp fix to the accel problem

11 years agoPwm: limit _max to PID_PWM_MAX - 1
Michael Moon [Sun, 14 Apr 2013 01:53:43 +0000 (11:53 +1000)]
Pwm: limit _max to PID_PWM_MAX - 1

Reported-by: Hagrid
11 years agoTemperatureControl: simplify handling of presets, fix preset not working for set...
Michael Moon [Sun, 7 Apr 2013 14:53:42 +0000 (00:53 +1000)]
TemperatureControl: simplify handling of presets, fix preset not working for set-and-wait gcode

11 years agoshould make it work in octoprint
Arthur Wolf [Sun, 7 Apr 2013 09:28:25 +0000 (11:28 +0200)]
should make it work in octoprint

11 years agoRestructure mbed SDK makefiles.
Adam Green [Sat, 30 Mar 2013 01:39:12 +0000 (18:39 -0700)]
Restructure mbed SDK makefiles.

No longer deploy common headers to drop subdirectory from the device
specific makefiles.  This caused contention during some parallel build
runs.  Now the common headers are deployed to drop from the main
makefile in the mbed/src directory.  This should not only remove the
parallel build race condition but even improve the performance of
since the common header deployment can now occur in parallel with
the device specific builds.

11 years agoMove mpu.h to the correct location.
Adam Green [Fri, 29 Mar 2013 02:51:19 +0000 (19:51 -0700)]
Move mpu.h to the correct location.

This header shouldn't have been located in the main Smoothie src tree
but in the build specific portion of the tree.  I think it got placed
in the incorrect location during my major merge just before pushing the
new build system into the edge branch.

11 years agoMerge pull request #153 from logxen/edge
Logxen [Thu, 28 Mar 2013 21:45:47 +0000 (14:45 -0700)]
Merge pull request #153 from logxen/edge

Added endstops_enable config setting

11 years agoadded endstops_enable setting to config samples
Logxen [Thu, 28 Mar 2013 21:42:39 +0000 (14:42 -0700)]
added endstops_enable setting to config samples

11 years agoenabled disabling of Endstops module
Logxen [Thu, 28 Mar 2013 21:41:17 +0000 (14:41 -0700)]
enabled disabling of Endstops module

11 years agoMerge branch 'edge' into accel
Arthur Wolf [Wed, 27 Mar 2013 17:02:52 +0000 (18:02 +0100)]
Merge branch 'edge' into accel

11 years agoMerge pull request #152 from logxen/hbot
Logxen [Mon, 25 Mar 2013 14:25:55 +0000 (07:25 -0700)]
Merge pull request #152 from logxen/hbot

Initial commit of HBotSolution

11 years agoInitial commit of HBotSolution
Logxen [Mon, 25 Mar 2013 14:24:06 +0000 (07:24 -0700)]
Initial commit of HBotSolution

11 years agoextruder now creates its own blocks
Arthur Wolf [Sun, 17 Mar 2013 21:18:13 +0000 (22:18 +0100)]
extruder now creates its own blocks

11 years agochanged default on_boot.gcode to be in the /sd/ folder
Logxen [Sun, 17 Mar 2013 07:07:51 +0000 (00:07 -0700)]
changed default on_boot.gcode to be in the /sd/ folder

11 years agofixing merge conflict
Arthur Wolf [Sat, 16 Mar 2013 20:03:41 +0000 (21:03 +0100)]
fixing merge conflict

11 years agoMerge branch 'edge' into extruderfix
Arthur Wolf [Fri, 15 Mar 2013 23:01:21 +0000 (00:01 +0100)]
Merge branch 'edge' into extruderfix

11 years agoMerge pull request #149 from wolfmanjm/extruderfixorig
arthurwolf [Fri, 15 Mar 2013 20:29:55 +0000 (13:29 -0700)]
Merge pull request #149 from wolfmanjm/extruderfixorig

Change default homing direction in example config for delta/rostock

11 years agoChange default homing direction in example config for delta/rostock
Jim Morris [Fri, 15 Mar 2013 20:20:49 +0000 (13:20 -0700)]
Change default homing direction in example config for delta/rostock

11 years agofixed default direction for homing in config and defaults
Arthur Wolf [Thu, 14 Mar 2013 22:44:20 +0000 (23:44 +0100)]
fixed default direction for homing in config and defaults

11 years agofixed homing freezing due to not calling on_idle
Arthur Wolf [Wed, 13 Mar 2013 23:35:22 +0000 (00:35 +0100)]
fixed homing freezing due to not calling on_idle

11 years agoputting Endstops back into main.cpp
Arthur Wolf [Mon, 11 Mar 2013 21:40:43 +0000 (22:40 +0100)]
putting Endstops back into main.cpp

11 years agoMerge branch 'extruderfix' of github.com:arthurwolf/Smoothie into extruderfix
Arthur Wolf [Mon, 11 Mar 2013 21:38:16 +0000 (22:38 +0100)]
Merge branch 'extruderfix' of github.com:arthurwolf/Smoothie into extruderfix

11 years agohoming problem solved ( defaults in Endstops.cpp were broken )
Arthur Wolf [Mon, 11 Mar 2013 21:37:12 +0000 (22:37 +0100)]
homing problem solved ( defaults in Endstops.cpp were broken )

11 years agoMerge pull request #148 from logxen/edge
Logxen [Mon, 11 Mar 2013 16:36:06 +0000 (09:36 -0700)]
Merge pull request #148 from logxen/edge

added note about how to have git ignore config.default to config.default

11 years agoadded note about how to have git ignore config.default to config.default
Logxen [Mon, 11 Mar 2013 16:34:03 +0000 (09:34 -0700)]
added note about how to have git ignore config.default to config.default

11 years agoMerge pull request #142 from arthurwolf/firmconfig
Logxen [Mon, 11 Mar 2013 16:02:27 +0000 (09:02 -0700)]
Merge pull request #142 from arthurwolf/firmconfig

initial implementation of FirmConfigSource

11 years agoMerge remote-tracking branch 'upstream/edge' into firmconfig
Logxen [Mon, 11 Mar 2013 15:44:26 +0000 (08:44 -0700)]
Merge remote-tracking branch 'upstream/edge' into firmconfig

11 years agoExtruder: ensure steps_to_step is >= 0
Michael Moon [Mon, 11 Mar 2013 11:14:02 +0000 (22:14 +1100)]
Extruder: ensure steps_to_step is >= 0

11 years agoExtruder: don't clobber flowrate in FOLLOW mode, we don't use it anyway
Michael Moon [Mon, 11 Mar 2013 10:33:32 +0000 (21:33 +1100)]
Extruder: don't clobber flowrate in FOLLOW mode, we don't use it anyway

11 years agoExtruder: whitespace and comments
Michael Moon [Mon, 11 Mar 2013 10:30:53 +0000 (21:30 +1100)]
Extruder: whitespace and comments

11 years agoExtruder: use block returned from append_empty_block() instead of munging the queue
Michael Moon [Mon, 11 Mar 2013 10:30:37 +0000 (21:30 +1100)]
Extruder: use block returned from append_empty_block() instead of munging the queue

11 years agoExtruder: don't clobber target position
Michael Moon [Mon, 11 Mar 2013 10:30:06 +0000 (21:30 +1100)]
Extruder: don't clobber target position

11 years agoExtruder: remove redundant relative/absolute conversions
Michael Moon [Mon, 11 Mar 2013 10:27:42 +0000 (21:27 +1100)]
Extruder: remove redundant relative/absolute conversions

11 years agoExtruder: append_empty_block returns the new block so we don't have to look it up
Michael Moon [Mon, 11 Mar 2013 10:26:27 +0000 (21:26 +1100)]
Extruder: append_empty_block returns the new block so we don't have to look it up

11 years agoExtruder: move handling for flowrate outside SOLO mode condition so we can remember...
Michael Moon [Mon, 11 Mar 2013 10:25:34 +0000 (21:25 +1100)]
Extruder: move handling for flowrate outside SOLO mode condition so we can remember previous flowrates

11 years agoExtruder: clarify handling of relative/absolute mode on incoming gcode
Michael Moon [Mon, 11 Mar 2013 10:24:34 +0000 (21:24 +1100)]
Extruder: clarify handling of relative/absolute mode on incoming gcode

11 years agoMakefile: allow user-specified baud rate for console, ie "make BAUD=115200 console...
Michael Moon [Mon, 11 Mar 2013 05:21:20 +0000 (16:21 +1100)]
Makefile: allow user-specified baud rate for console, ie "make BAUD=115200 console" works as expected

11 years agoStart message: report system clock frequency
Michael Moon [Mon, 11 Mar 2013 05:20:48 +0000 (16:20 +1100)]
Start message: report system clock frequency

11 years agoG90 and G91 were missing
Arthur Wolf [Fri, 8 Mar 2013 19:12:57 +0000 (20:12 +0100)]
G90 and G91 were missing

11 years agoMerge branch 'feature/ethernet-driver' into edge
Michael Moon [Thu, 7 Mar 2013 04:48:54 +0000 (15:48 +1100)]
Merge branch 'feature/ethernet-driver' into edge

11 years agoLPC17xx Ethernet Support. Driver only, no network stack or application layer yet!
Michael Moon [Wed, 6 Mar 2013 07:22:27 +0000 (18:22 +1100)]
LPC17xx Ethernet Support. Driver only, no network stack or application layer yet!

11 years agoUSB: fix a const cast warning
Michael Moon [Thu, 7 Mar 2013 04:41:21 +0000 (15:41 +1100)]
USB: fix a const cast warning

11 years agoMerge pull request #147 from bgamari/fixes
Michael Moon [Thu, 7 Mar 2013 04:32:20 +0000 (20:32 -0800)]
Merge pull request #147 from bgamari/fixes

Fix various warnings

11 years agoCurrentControl: Add virtual destructor
Ben Gamari [Wed, 6 Mar 2013 23:24:34 +0000 (18:24 -0500)]
CurrentControl: Add virtual destructor

See commit message of eeef2894e7e7e7708c10582210a7b8e12f027826 for
rationale.

11 years agoCurrentControl: Fix whitespace
Ben Gamari [Wed, 6 Mar 2013 23:24:00 +0000 (18:24 -0500)]
CurrentControl: Fix whitespace

11 years agoLaser: Add virtual destructor
Ben Gamari [Wed, 6 Mar 2013 23:17:03 +0000 (18:17 -0500)]
Laser: Add virtual destructor

This is to resolve the warning,

    modules/tools/laser/Laser.cpp:21:29: warning: deleting object of
    polymorphic class type 'Laser' which has non-virtual destructor might
    cause undefined behaviour [-Wdelete-non-virtual-dtor]

Caused by the `delete this;` used to destroy the object if it's
unneeded.

Unfortunately, this a bit of a large hammer for the issue. While it's
unlikely that Laser will ever be inherited from, I can't seem to
convince the compiler that this is the case. We could disable this
warning outright, but this sort of thing one often wants to be warned of
(e.g. in the case of the BaseSolution warning fixed in
24ceac7a79d322b48d325e9362434fb295be1d21).

All things considered, the cost of adding a vtable to Laser seems worth
the piece of mind solving this warning brings.

11 years agoStepper: minimum_steps_per_minute should be unsigned
Ben Gamari [Wed, 6 Mar 2013 23:05:53 +0000 (18:05 -0500)]
Stepper: minimum_steps_per_minute should be unsigned

Silences warning

11 years agoLaser: Fix up whitespace
Ben Gamari [Wed, 6 Mar 2013 23:05:37 +0000 (18:05 -0500)]
Laser: Fix up whitespace

11 years agoBaseSolution: Needed a virtual destructor
Ben Gamari [Wed, 6 Mar 2013 23:00:36 +0000 (18:00 -0500)]
BaseSolution: Needed a virtual destructor

11 years agoUSBSerial: Add const annotations to writeBlock's buffer
Ben Gamari [Wed, 6 Mar 2013 22:53:40 +0000 (17:53 -0500)]
USBSerial: Add const annotations to writeBlock's buffer

This silences a warning. Unless the hardware is doing writes, this
should be correct.

11 years agocompiles and does not crash
Arthur Wolf [Wed, 6 Mar 2013 22:47:49 +0000 (23:47 +0100)]
compiles and does not crash

11 years agocompiles again
Arthur Wolf [Wed, 6 Mar 2013 22:33:03 +0000 (23:33 +0100)]
compiles again

11 years agodoes not commit yet, but getting close
Arthur Wolf [Wed, 6 Mar 2013 22:25:21 +0000 (23:25 +0100)]
does not commit yet, but getting close

11 years agothis commit does not compile, commiting to get help with the errors
Arthur Wolf [Wed, 6 Mar 2013 20:25:32 +0000 (21:25 +0100)]
this commit does not compile, commiting to get help with the errors

11 years agowas not supposed to be false
Arthur Wolf [Wed, 6 Mar 2013 15:29:58 +0000 (16:29 +0100)]
was not supposed to be false

11 years agoMerge remote-tracking branch 'origin/edge' into local-firmconfig
Michael Moon [Wed, 6 Mar 2013 08:42:06 +0000 (19:42 +1100)]
Merge remote-tracking branch 'origin/edge' into local-firmconfig

11 years agoMerge branch 'edge' into local-firmconfig
Michael Moon [Wed, 6 Mar 2013 08:39:44 +0000 (19:39 +1100)]
Merge branch 'edge' into local-firmconfig

11 years agoMerge pull request #146 from wolfmanjm/feature/add-est-to-progress
Michael Moon [Wed, 6 Mar 2013 08:38:02 +0000 (00:38 -0800)]
Merge pull request #146 from wolfmanjm/feature/add-est-to-progress

Use on_second_tick for progress est and elapzed time as RTC doesn;t work...

11 years agoMerge pull request #145 from wolfmanjm/feature/add-reset
Michael Moon [Wed, 6 Mar 2013 08:36:48 +0000 (00:36 -0800)]
Merge pull request #145 from wolfmanjm/feature/add-reset

use on_second_tick for reset timeout as smoothie board doesn't have a cr...

11 years agoDon't display ETA for first 10 seconds
Jim Morris [Wed, 6 Mar 2013 08:32:08 +0000 (00:32 -0800)]
Don't display ETA for first 10 seconds
don't accumulate time if paused

11 years agoMerge remote-tracking branch 'upstream/edge' into feature/add-est-to-progress
Jim Morris [Wed, 6 Mar 2013 08:17:08 +0000 (00:17 -0800)]
Merge remote-tracking branch 'upstream/edge' into feature/add-est-to-progress

11 years agousing Checked instead of Release
Arthur Wolf [Wed, 6 Mar 2013 08:13:39 +0000 (09:13 +0100)]
using Checked instead of Release

11 years agoUSBSerial: remove special handling of \r
Michael Moon [Wed, 6 Mar 2013 07:23:04 +0000 (18:23 +1100)]
USBSerial: remove special handling of \r

11 years agoUse on_second_tick for progress est and elapzed time as RTC doesn;t work on smoothieboard
Jim Morris [Wed, 6 Mar 2013 04:16:44 +0000 (20:16 -0800)]
Use on_second_tick for progress est and elapzed time as RTC doesn;t work on smoothieboard

11 years agoPlayLed: use Pauser::paused() instead of referencing PauseButton.
Michael Moon [Wed, 6 Mar 2013 04:02:54 +0000 (15:02 +1100)]
PlayLed: use Pauser::paused() instead of referencing PauseButton.

PauseButton: no longer need static self-reference

11 years agoPlayLed: light off at boot
Michael Moon [Wed, 6 Mar 2013 04:02:18 +0000 (15:02 +1100)]
PlayLed: light off at boot

11 years agoPauser: add method bool paused()
Michael Moon [Wed, 6 Mar 2013 04:01:46 +0000 (15:01 +1100)]
Pauser: add method bool paused()

11 years agoNew LED behaviour: off = not paused, not running. flash = paused. on = executing...
Michael Moon [Wed, 6 Mar 2013 03:37:02 +0000 (14:37 +1100)]
New LED behaviour: off = not paused, not running. flash = paused. on = executing blocks. Implemented with new PlayLed module

11 years agoPauseButton: eliminate potential race condition
Michael Moon [Wed, 6 Mar 2013 03:35:17 +0000 (14:35 +1100)]
PauseButton: eliminate potential race condition

11 years agouse on_second_tick for reset timeout as smoothie board doesn't have a crysal on its RTC
Jim Morris [Wed, 6 Mar 2013 02:27:03 +0000 (18:27 -0800)]
use on_second_tick for reset timeout as smoothie board doesn't have a crysal on its RTC

11 years agoSlowTicker: G4 pause now also acceps S<seconds> in addition to P<milliseconds>
Michael Moon [Wed, 6 Mar 2013 02:09:00 +0000 (13:09 +1100)]
SlowTicker: G4 pause now also acceps S<seconds> in addition to P<milliseconds>

11 years agoTemperatureControl: support 2 preset temperatures, activate with M104 S1, M190 S2...
Michael Moon [Wed, 6 Mar 2013 01:31:00 +0000 (12:31 +1100)]
TemperatureControl: support 2 preset temperatures, activate with M104 S1, M190 S2 or similar

11 years agoIm dumb
Arthur Wolf [Tue, 5 Mar 2013 22:31:46 +0000 (23:31 +0100)]
Im dumb

11 years agofixing merge conflicts when merging edge back in
Arthur Wolf [Tue, 5 Mar 2013 22:05:17 +0000 (23:05 +0100)]
fixing merge conflicts when merging edge back in

11 years agomost probably corrected the Extruder bug, which was actually a much deeper problem...
Arthur Wolf [Tue, 5 Mar 2013 22:02:31 +0000 (23:02 +0100)]
most probably corrected the Extruder bug, which was actually a much deeper problem, see Gcode.h for this part of the solution, previous commits for the rest

11 years agoMerge remote-tracking branch 'upstream/edge' into firmconfig
Logxen [Tue, 5 Mar 2013 00:56:12 +0000 (16:56 -0800)]
Merge remote-tracking branch 'upstream/edge' into firmconfig

11 years agoMerge pull request #144 from wolfmanjm/feature/delta-segmentation
arthurwolf [Mon, 4 Mar 2013 23:38:58 +0000 (15:38 -0800)]
Merge pull request #144 from wolfmanjm/feature/delta-segmentation

Feature/delta segmentation
Looks pretty harmless, merging, thanks a lot for the feature !

11 years agoImplement Johanns method of specifying segments for delta bots in segments per second.
Jim Morris [Mon, 4 Mar 2013 23:04:42 +0000 (15:04 -0800)]
Implement Johanns method of specifying segments for delta bots in segments per second.
  Added a config delta_segments_per_second which defaults to 0, which is off
  Modified mm_per_line_segment to turn off segmentation when set to 0, otherwise is exactly the same
  If both mm_per_line_segment and delta_segments_per_second are set then delta_segments_per_second takes precedence
  Added example to rostock config which uses the delta_segments_per_second to match current Johanns Marlin/Delta

11 years agoImplement Johanns method of specifying segments for delta bots in segments per second.
Jim Morris [Mon, 4 Mar 2013 09:38:14 +0000 (01:38 -0800)]
Implement Johanns method of specifying segments for delta bots in segments per second.
Added a config delta_segments_per_second which defaults to 0, which is off
Modified mm_per_line_segment to turn off segmentation when set to 0, otherwise is exactly the same
If both mm_per_line_segment and delta_segments_per_second are set then delta_segments_per_second takes precedence

11 years agoFix #143 - SerialConsole::puts is broken in new build.
Adam Green [Mon, 4 Mar 2013 17:58:04 +0000 (09:58 -0800)]
Fix #143 - SerialConsole::puts is broken in new build.

My dumb dumb!  Used the correct casting operator and actually tested
the UART serial path this time before committing.

11 years agoMakefile: keep default configuration in flash, do not load into ram at runtime
Michael Moon [Mon, 4 Mar 2013 13:45:09 +0000 (00:45 +1100)]
Makefile: keep default configuration in flash, do not load into ram at runtime

11 years agoFirmConfigSource: use base class methods
Michael Moon [Mon, 4 Mar 2013 13:50:51 +0000 (00:50 +1100)]
FirmConfigSource: use base class methods

11 years agoConfigSource: Implement line/stream parsing in base class to reduce code duplication
Michael Moon [Sun, 3 Mar 2013 01:46:40 +0000 (12:46 +1100)]
ConfigSource: Implement line/stream parsing in base class to reduce code duplication
FileConfigSource: use base class parsing routines

11 years agoinitial implementation of FirmConfigSource
Logxen [Sun, 3 Mar 2013 22:56:40 +0000 (14:56 -0800)]
initial implementation of FirmConfigSource

11 years agoFix for make -j (n>1).
Adam Green [Sat, 2 Mar 2013 22:29:57 +0000 (14:29 -0800)]
Fix for make -j (n>1).

Enforce mbed SDK library dependency in root makefile.  Before it would
try to build both the mbed SDK and the Smoothie firmware at the same
time.

A better solution would be to pull the mbed SDK make steps into the
main Smoothie makefile so that the dependencies were clearer to make
which would allow it to build the SDK in parallel to the Smoothie
firmware.  I don't currently do this as the current build system is
closer to what was used before but now there are just sources and
makefiles which can build the mbed SDK (libs and headers) for us.  I
also expect most people to do their clearn builds from within the src/
directory once they have the mbed SDK built since they don't really
need to even keep looking at that part of the code anymore.

11 years agoMerge branch 'edge' of github.com:arthurwolf/Smoothie into edge
Arthur Wolf [Sat, 2 Mar 2013 21:13:03 +0000 (22:13 +0100)]
Merge branch 'edge' of github.com:arthurwolf/Smoothie into edge

11 years agomove back to get_ref in conveyors flush
Arthur Wolf [Sat, 2 Mar 2013 21:12:51 +0000 (22:12 +0100)]
move back to get_ref in conveyors flush

11 years agoMerge pull request #141 from logxen/edge
Logxen [Sat, 2 Mar 2013 20:34:08 +0000 (12:34 -0800)]
Merge pull request #141 from logxen/edge

Config now checks for config.txt if config is not found

11 years agosimple optimize
Logxen [Sat, 2 Mar 2013 20:33:24 +0000 (12:33 -0800)]
simple optimize

11 years agoConfig now checks for config.txt if config is not found
Logxen [Sat, 2 Mar 2013 20:30:25 +0000 (12:30 -0800)]
Config now checks for config.txt if config is not found

11 years agoMerge branch 'edge' into extruderfix
Arthur Wolf [Sat, 2 Mar 2013 19:08:49 +0000 (20:08 +0100)]
Merge branch 'edge' into extruderfix

11 years agomade Extruder create its own blocks for solo moves, and other modules explicitely...
Arthur Wolf [Sat, 2 Mar 2013 19:06:05 +0000 (20:06 +0100)]
made Extruder create its own blocks for solo moves, and other modules explicitely adding their gcodes to the last block, instead of having Robot doing that for them

11 years agoMerge remote-tracking branch 'origin/edge' into feature/new_build
Adam Green [Sat, 2 Mar 2013 02:57:24 +0000 (18:57 -0800)]
Merge remote-tracking branch 'origin/edge' into feature/new_build

11 years agoVerify that malloc/realloc/free aren't called from ISR.
Adam Green [Fri, 1 Mar 2013 08:36:13 +0000 (00:36 -0800)]
Verify that malloc/realloc/free aren't called from ISR.

This was previously done with the malloc_lock() routine but this isn't
called from the newlib nano routines used in the new build.  This new
code provides wraps for malloc/realloc/free to first make this check of
the IPSR register and then call the real routines if not being called
from ISR.

11 years agoUpdate README to no longer mention GCC4MBED.
Adam Green [Fri, 1 Mar 2013 08:07:55 +0000 (00:07 -0800)]
Update README to no longer mention GCC4MBED.