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
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
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.
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.
Arthur Wolf [Sat, 2 Mar 2013 21:13:03 +0000 (22:13 +0100)]
Merge branch 'edge' of github.com:arthurwolf/Smoothie into edge
Arthur Wolf [Sat, 2 Mar 2013 21:12:51 +0000 (22:12 +0100)]
move back to get_ref in conveyors flush
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
Logxen [Sat, 2 Mar 2013 20:33:24 +0000 (12:33 -0800)]
simple optimize
Logxen [Sat, 2 Mar 2013 20:30:25 +0000 (12:30 -0800)]
Config now checks for config.txt if config is not found
Adam Green [Sat, 2 Mar 2013 02:57:24 +0000 (18:57 -0800)]
Merge remote-tracking branch 'origin/edge' into feature/new_build
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.
Adam Green [Fri, 1 Mar 2013 08:07:55 +0000 (00:07 -0800)]
Update README to no longer mention GCC4MBED.
Adam Green [Fri, 1 Mar 2013 07:11:49 +0000 (23:11 -0800)]
Merge remote-tracking branch 'origin/edge' into feature/new_build
Conflicts:
.gitignore
build/mbed_custom.c
gcc4mbed/build/gcc4mbed.mk
makefile
mbed/src/vendor/NXP/cmsis/LPC1768/GCC_ARM/LPC1768.ld
Fixed conflicts caused by heap tagging commit which modified several
files that had been moved around for this new build system.
NOTE: HEAP_TAGS has been disabled since it isn't compatible with newlib
nano. If we decide that we want to stay with newlib nano then I
can update the heap tag code to work with this newer library.
Michael Moon [Tue, 26 Feb 2013 01:13:01 +0000 (12:13 +1100)]
TemperatureControl: use Pwm::max_pwm properly
Michael Moon [Tue, 26 Feb 2013 01:11:25 +0000 (12:11 +1100)]
Conveyor: use get_tail_ref
Logxen [Mon, 25 Feb 2013 07:49:35 +0000 (23:49 -0800)]
Merge pull request #139 from logxen/edge
made Conveyor::wait_for_empty_queue() actually return
Logxen [Mon, 25 Feb 2013 07:48:55 +0000 (23:48 -0800)]
made Conveyor::wait_for_empty_queue() actually return
Logxen [Mon, 25 Feb 2013 07:29:06 +0000 (23:29 -0800)]
Merge pull request #138 from logxen/edge
added '{' to fix the new Conveyor::wait_for_empty_queue() method
Logxen [Mon, 25 Feb 2013 07:27:50 +0000 (23:27 -0800)]
added '{' to fix the new Conveyor::wait_for_empty_queue() method
Logxen [Mon, 25 Feb 2013 07:22:49 +0000 (23:22 -0800)]
Merge pull request #136 from bgamari/fix-homing
Endstops: Invoke ON_IDLE while waiting for queue
Logxen [Mon, 25 Feb 2013 05:18:04 +0000 (21:18 -0800)]
Merge pull request #137 from wolfmanjm/feature/add-reset
Feature/add reset
Jim Morris [Mon, 25 Feb 2013 05:09:40 +0000 (21:09 -0800)]
add a pause of 5 seconds after issuing reset so the user can exit the console
Logxen [Mon, 25 Feb 2013 05:00:14 +0000 (21:00 -0800)]
Merge pull request #135 from wolfmanjm/feature/add-est-to-progress
add elapsed time and estimated time to progress command
Jim Morris [Mon, 25 Feb 2013 04:28:55 +0000 (20:28 -0800)]
untabify
Jim Morris [Mon, 25 Feb 2013 04:22:37 +0000 (20:22 -0800)]
added reset to console comamnd to actually reset the chip, dfu still goes into boot mode
Ben Gamari [Mon, 25 Feb 2013 03:11:41 +0000 (22:11 -0500)]
Endstops: Properly wait for queue to empty
Ben Gamari [Mon, 25 Feb 2013 03:11:06 +0000 (22:11 -0500)]
Conveyor: Introduce wait_for_empty_queue
Michael Moon [Sat, 23 Feb 2013 02:42:09 +0000 (13:42 +1100)]
PID Autotune: M304 aborts
Adam Green [Thu, 21 Feb 2013 22:58:45 +0000 (14:58 -0800)]
Fixes issue #129 - Don't leak gcodes in block.
Previously Conveyor::new_block() was never executing the last chance
code it contained to clean up the next block that it was going to
overwrite and use in the ring buffer. This was failing to run becaues
this->queue.get_ref(this->queue.size()) would always return a NULL
pointer as that method doesn't allow indexing to or past the tail.
I added a get_tail_ref() method to RingBuffer which returns the
required pointer.
NOTE: There is still a bug in the flush_blocks / Conveyor::on_idle()
code path as it should have cleaned up this block already but it
failed to do so.
Adam Green [Thu, 21 Feb 2013 22:57:13 +0000 (14:57 -0800)]
Add freespace GDB command to .gdbinit
This just reports how much space there is currently unused between the
top of the heap and the top of the stack.
Adam Green [Thu, 21 Feb 2013 22:13:29 +0000 (14:13 -0800)]
Merge remote-tracking branch 'origin/fix/USBSerial-breaks-if-host-doesnt-assert-DTR' into edge
Michael Moon [Thu, 21 Feb 2013 15:45:59 +0000 (02:45 +1100)]
StepperMotor: change minimum step frequency from 1Hz to 20Hz
Michael Moon [Thu, 21 Feb 2013 15:44:02 +0000 (02:44 +1100)]
PID Autotune: move processing to idle context so we can safely printf
Adam Green [Thu, 21 Feb 2013 02:11:52 +0000 (18:11 -0800)]
Remove bitmask from within for loop.
This makes the loop use a uint16_t for the bitmask variable instead of
uint8_t.
Ben Gamari [Thu, 21 Feb 2013 00:00:26 +0000 (16:00 -0800)]
Merge pull request #118 from bgamari/temp-no-irq
TemperatureControl: Move printf out of interrupt context
Arthur Wolf [Wed, 20 Feb 2013 23:15:41 +0000 (00:15 +0100)]
char is bad
Arthur Wolf [Wed, 20 Feb 2013 23:12:01 +0000 (00:12 +0100)]
cleaning up debug gpios
Arthur Wolf [Wed, 20 Feb 2013 22:57:20 +0000 (23:57 +0100)]
Merge branch 'edge' of github.com:arthurwolf/Smoothie into edge
Arthur Wolf [Wed, 20 Feb 2013 22:57:05 +0000 (23:57 +0100)]
Possible problem with the way Conveyor takes and releases blocks that modules did not take, trying a fix
Logxen [Wed, 20 Feb 2013 17:32:19 +0000 (09:32 -0800)]
Merge pull request #134 from wolfmanjm/optimization/fastmath-rostock-solution
Optimization/fastmath rostock solution
Jim Morris [Wed, 20 Feb 2013 11:27:37 +0000 (03:27 -0800)]
add elapsed time and estimated time to progress command
Jim Morris [Wed, 20 Feb 2013 10:12:56 +0000 (02:12 -0800)]
remove timing code
Jim Morris [Wed, 20 Feb 2013 10:05:49 +0000 (02:05 -0800)]
Switch rostock arm solution to use floats, fastmath and sqrtf
Arthur Wolf [Tue, 19 Feb 2013 17:38:21 +0000 (18:38 +0100)]
fixing the printfs in Endstops
Adam Green [Tue, 19 Feb 2013 16:04:45 +0000 (08:04 -0800)]
Switch heap start from __HeapBase to __end__.
I verified that these symbols point to the same address by diffing
the before and after main.bin output files. This change caused no
change in the resulting binary.
The use of the __end__ variable is just more correct since it comes
from the linker script.
Adam Green [Tue, 19 Feb 2013 16:02:17 +0000 (08:02 -0800)]
Keep memory options together in makefile.
Moved the STACK_SIZE option up closer to the HEAP_TAGS and
WRITE_BUFFER_DISABLE options.
Adam Green [Tue, 19 Feb 2013 03:14:20 +0000 (19:14 -0800)]
Fix rules in src/makefile.
I moved the output binaries to /LPC1768 but the rules like upload,
flash, etc were still looking for the binaries in /src/LPC1768.
Adam Green [Tue, 19 Feb 2013 00:45:48 +0000 (16:45 -0800)]
Change /src/LPC1768 to /LPC1768 in .gitignore
Adam Green [Mon, 18 Feb 2013 23:31:27 +0000 (15:31 -0800)]
Output binaries to /LPC1768
Adam Green [Mon, 18 Feb 2013 23:05:37 +0000 (15:05 -0800)]
Update to new build system.
IMPORTANT NOTES!
* Do a "make clean" before pulling down this new build system. This
will cleanup files used by older build system as the new build system
has moved things around a bit.
* Run linux_install, win_install.cmd, or mac_install to update the GNU
toolchain used for the new build. Note that there isn't a gcc4mbed
directory anymore so these scripts are in the root of the Smoothie
project.
* Run "make" from root of the Smoothie project.
* The binaries are now located in the src/LPC1768 folder <--IMPORTANT NOTE
* Make targets such as upload, etc. should still work as I attempted to
port them to this new build system.
Adam Green [Mon, 18 Feb 2013 22:15:33 +0000 (14:15 -0800)]
Move files in preparation for new build system.
Adam Green [Mon, 18 Feb 2013 22:02:29 +0000 (14:02 -0800)]
Merge remote-tracking branch 'origin/edge' into track_allocs
Logxen [Mon, 18 Feb 2013 16:54:03 +0000 (08:54 -0800)]
Merge pull request #128 from logxen/edge
fixed merge error from the rename of Conveyor
Logxen [Mon, 18 Feb 2013 16:52:18 +0000 (08:52 -0800)]
fixed merge error from the rename of Conveyor
Adam Green [Mon, 18 Feb 2013 11:03:27 +0000 (03:03 -0800)]
Merge branch 'edge' into track_allocs
Arthur Wolf [Mon, 18 Feb 2013 10:24:38 +0000 (11:24 +0100)]
removing G90 from main.cpp
Arthur Wolf [Mon, 18 Feb 2013 10:20:42 +0000 (11:20 +0100)]
the new Player module was not created in main.cpp, fixing
Arthur Wolf [Mon, 18 Feb 2013 10:17:25 +0000 (11:17 +0100)]
cleaning up main.cpp
Michael Moon [Mon, 18 Feb 2013 09:44:26 +0000 (20:44 +1100)]
Fire an attach event if we're detached and receive data- apparently some OSes don't assert DTR when a program opens the port
Logxen [Mon, 18 Feb 2013 00:37:18 +0000 (16:37 -0800)]
Merge pull request #125 from arthurwolf/fix/NullStream
Fix/null stream
Michael Moon [Sun, 17 Feb 2013 23:40:02 +0000 (10:40 +1100)]
Gcode: simplify get_int, use get_int to derive cached M and G codes
Michael Moon [Sun, 17 Feb 2013 23:39:03 +0000 (10:39 +1100)]
ButtonPool: silence warning from button_checksum being defined in both Button.h and ButtonPool.h
Michael Moon [Sun, 17 Feb 2013 23:36:16 +0000 (10:36 +1100)]
StreamOutput: implement static NullStream for code clarity; Button, Player: use static NullStream when appropriate
Arthur Wolf [Sun, 17 Feb 2013 20:04:04 +0000 (21:04 +0100)]
add .o to gitignore
Arthur Wolf [Sun, 17 Feb 2013 19:57:21 +0000 (20:57 +0100)]
make -q work
arthurwolf [Sun, 17 Feb 2013 18:05:40 +0000 (10:05 -0800)]
Merge pull request #124 from logxen/onboot
Onboot
Logxen [Sun, 17 Feb 2013 17:56:32 +0000 (09:56 -0800)]
fixed Button
Logxen [Sun, 17 Feb 2013 17:53:48 +0000 (09:53 -0800)]
Merge branch 'edge' into onboot
Conflicts:
src/main.cpp
Logxen [Sun, 17 Feb 2013 17:52:03 +0000 (09:52 -0800)]
onboot feedback now sent to hardware uart
Logxen [Sun, 17 Feb 2013 17:51:23 +0000 (09:51 -0800)]
Merge pull request #123 from logxen/button
Button
Logxen [Sun, 17 Feb 2013 17:37:40 +0000 (09:37 -0800)]
added button normal_state
Logxen [Sun, 17 Feb 2013 17:33:46 +0000 (09:33 -0800)]
got things working with current edge
Arthur Wolf [Sun, 17 Feb 2013 16:56:57 +0000 (17:56 +0100)]
make usbserial handle \r the same way the other serial inputs do
Logxen [Sun, 17 Feb 2013 16:14:45 +0000 (08:14 -0800)]
preparing Button for modern edge
Logxen [Sun, 17 Feb 2013 04:43:19 +0000 (20:43 -0800)]
Merge branch 'edge' into button
Logxen [Sun, 17 Feb 2013 04:36:39 +0000 (20:36 -0800)]
Merge branch 'edge' into onboot
Logxen [Sun, 17 Feb 2013 04:35:52 +0000 (20:35 -0800)]
Merge branch 'edge' into onboot
Conflicts:
src/libs/Kernel.cpp
src/libs/Kernel.h
src/modules/robot/Block.cpp
src/modules/robot/Block.h
src/modules/robot/Conveyor.cpp
src/modules/utils/simpleshell/SimpleShell.cpp
src/modules/utils/simpleshell/SimpleShell.h
Logxen [Sat, 16 Feb 2013 22:15:39 +0000 (14:15 -0800)]
Merge pull request #122 from logxen/edge
make direction[] in the EndStop module always be boolean
Logxen [Sat, 16 Feb 2013 22:13:04 +0000 (14:13 -0800)]
make direction[] in the EndStop module always be boolean
Logxen [Sat, 16 Feb 2013 22:08:33 +0000 (14:08 -0800)]
Merge pull request #121 from logxen/debugbreak
Debugbreak
Logxen [Sat, 16 Feb 2013 22:05:39 +0000 (14:05 -0800)]
Merge branch 'edge' into debugbreak
Conflicts:
src/modules/utils/simpleshell/SimpleShell.cpp
src/modules/utils/simpleshell/SimpleShell.h
Logxen [Sat, 16 Feb 2013 22:00:10 +0000 (14:00 -0800)]
cleaned whitespace
Logxen [Sat, 16 Feb 2013 19:16:25 +0000 (11:16 -0800)]
Merge branch 'edge' into button
Logxen [Sat, 16 Feb 2013 18:26:07 +0000 (10:26 -0800)]
Merge pull request #119 from bgamari/fixes
Endstops: Fix default direction
Ben Gamari [Sat, 16 Feb 2013 15:31:01 +0000 (10:31 -0500)]
Endstops: Fix default direction
Not sure why parsing the default from a string didn't work (it seemed to
return 0), but regardless this is simpler and works.
Ben Gamari [Sat, 26 Jan 2013 21:39:48 +0000 (16:39 -0500)]
TemperatureControl: Move printf out of interrupt context
Logxen [Sat, 16 Feb 2013 06:03:14 +0000 (22:03 -0800)]
Merge branch 'edge' into button
Logxen [Sat, 16 Feb 2013 04:26:40 +0000 (20:26 -0800)]
Merge pull request #117 from logxen/edge
updated rostock config defaults in code
Logxen [Sat, 16 Feb 2013 04:24:36 +0000 (20:24 -0800)]
updated rostock config defaults in code
Logxen [Fri, 15 Feb 2013 22:17:47 +0000 (14:17 -0800)]
Merge pull request #116 from wolfmanjm/update/sampleconfigs
updated Sample configs with new endstop settings
Jim Morris [Fri, 15 Feb 2013 22:07:36 +0000 (14:07 -0800)]
updated Sample configs with new endstop settings
Changed default settings for Kossel
arthurwolf [Fri, 15 Feb 2013 21:09:42 +0000 (13:09 -0800)]
Merge pull request #114 from orcinus/HomingDirection
Homing direction
Logxen [Fri, 15 Feb 2013 20:56:48 +0000 (12:56 -0800)]
Merge pull request #115 from logxen/rotatedcartesian
adds support for a cartesian system that is rotated from the mechanical system on the z axis
Logxen [Fri, 15 Feb 2013 16:10:14 +0000 (08:10 -0800)]
added RotatableCartesionSolution.h to Robot.cpp
Logxen [Fri, 15 Feb 2013 16:06:20 +0000 (08:06 -0800)]
Merge branch 'edge' into rotatedcartesian
Logxen [Fri, 15 Feb 2013 07:56:24 +0000 (23:56 -0800)]
Merge pull request #113 from wolfmanjm/fix/homing
making stepper::moving volatile fixes the homing cycle from hanging afte...
Jim Morris [Fri, 15 Feb 2013 07:53:10 +0000 (23:53 -0800)]
making stepper::moving volatile fixes the homing cycle from hanging after retract
Logxen [Fri, 15 Feb 2013 07:51:58 +0000 (23:51 -0800)]
Merge pull request #112 from logxen/edge
made FileConfigSource tolerate tabs
Logxen [Fri, 15 Feb 2013 07:49:04 +0000 (23:49 -0800)]
made FileConfigSource tolerate tabs
Logxen [Fri, 15 Feb 2013 07:41:55 +0000 (23:41 -0800)]
initial rotated cartesian solution implementation