clinton/Smoothieware.git
11 years agoMerge pull request #139 from logxen/edge
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

11 years agomade 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

11 years agoMerge pull request #138 from logxen/edge
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

11 years agoadded '{' 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

11 years agoMerge pull request #136 from bgamari/fix-homing
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

11 years agoMerge pull request #137 from wolfmanjm/feature/add-reset
Logxen [Mon, 25 Feb 2013 05:18:04 +0000 (21:18 -0800)]
Merge pull request #137 from wolfmanjm/feature/add-reset

Feature/add reset

11 years agoadd a pause of 5 seconds after issuing reset so the user can exit the console
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

11 years agoMerge pull request #135 from wolfmanjm/feature/add-est-to-progress
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

11 years agountabify
Jim Morris [Mon, 25 Feb 2013 04:28:55 +0000 (20:28 -0800)]
untabify

11 years agoadded reset to console comamnd to actually reset the chip, dfu still goes into boot...
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

11 years agoEndstops: Properly wait for queue to empty
Ben Gamari [Mon, 25 Feb 2013 03:11:41 +0000 (22:11 -0500)]
Endstops: Properly wait for queue to empty

11 years agoConveyor: Introduce wait_for_empty_queue
Ben Gamari [Mon, 25 Feb 2013 03:11:06 +0000 (22:11 -0500)]
Conveyor: Introduce wait_for_empty_queue

11 years agoPID Autotune: M304 aborts
Michael Moon [Sat, 23 Feb 2013 02:42:09 +0000 (13:42 +1100)]
PID Autotune: M304 aborts

11 years agoFixes issue #129 - Don't leak gcodes in block.
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.

11 years agoAdd freespace GDB command to .gdbinit
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.

11 years agoMerge remote-tracking branch 'origin/fix/USBSerial-breaks-if-host-doesnt-assert-DTR...
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

11 years agoStepperMotor: change minimum step frequency from 1Hz to 20Hz
Michael Moon [Thu, 21 Feb 2013 15:45:59 +0000 (02:45 +1100)]
StepperMotor: change minimum step frequency from 1Hz to 20Hz

11 years agoPID Autotune: move processing to idle context so we can safely printf
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

11 years agoRemove bitmask from within for loop.
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.

11 years agoMerge pull request #118 from bgamari/temp-no-irq
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

11 years agochar is bad
Arthur Wolf [Wed, 20 Feb 2013 23:15:41 +0000 (00:15 +0100)]
char is bad

11 years agocleaning up debug gpios
Arthur Wolf [Wed, 20 Feb 2013 23:12:01 +0000 (00:12 +0100)]
cleaning up debug gpios

11 years agoMerge branch 'edge' of github.com:arthurwolf/Smoothie into edge
Arthur Wolf [Wed, 20 Feb 2013 22:57:20 +0000 (23:57 +0100)]
Merge branch 'edge' of github.com:arthurwolf/Smoothie into edge

11 years agoPossible problem with the way Conveyor takes and releases blocks that modules did...
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

11 years agoMerge pull request #134 from wolfmanjm/optimization/fastmath-rostock-solution
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

11 years agoadd elapsed time and estimated time to progress command
Jim Morris [Wed, 20 Feb 2013 11:27:37 +0000 (03:27 -0800)]
add elapsed time and estimated time to progress command

11 years agoremove timing code
Jim Morris [Wed, 20 Feb 2013 10:12:56 +0000 (02:12 -0800)]
remove timing code

11 years agoSwitch rostock arm solution to use floats, fastmath and sqrtf
Jim Morris [Wed, 20 Feb 2013 10:05:49 +0000 (02:05 -0800)]
Switch rostock arm solution to use floats, fastmath and sqrtf

11 years agofixing the printfs in Endstops
Arthur Wolf [Tue, 19 Feb 2013 17:38:21 +0000 (18:38 +0100)]
fixing the printfs in Endstops

11 years agoSwitch heap start from __HeapBase to __end__.
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.

11 years agoKeep memory options together in makefile.
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.

11 years agoMerge remote-tracking branch 'origin/edge' into track_allocs
Adam Green [Mon, 18 Feb 2013 22:02:29 +0000 (14:02 -0800)]
Merge remote-tracking branch 'origin/edge' into track_allocs

11 years agoMerge pull request #128 from logxen/edge
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

11 years agofixed 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

11 years agoMerge branch 'edge' into track_allocs
Adam Green [Mon, 18 Feb 2013 11:03:27 +0000 (03:03 -0800)]
Merge branch 'edge' into track_allocs

11 years agoremoving G90 from main.cpp
Arthur Wolf [Mon, 18 Feb 2013 10:24:38 +0000 (11:24 +0100)]
removing G90 from main.cpp

11 years agothe new Player module was not created in main.cpp, fixing
Arthur Wolf [Mon, 18 Feb 2013 10:20:42 +0000 (11:20 +0100)]
the new Player module was not created in main.cpp, fixing

11 years agocleaning up main.cpp
Arthur Wolf [Mon, 18 Feb 2013 10:17:25 +0000 (11:17 +0100)]
cleaning up main.cpp

11 years agoFire an attach event if we're detached and receive data- apparently some OSes don... origin/fix/USBSerial-breaks-if-host-doesnt-assert-DTR
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

11 years agoMerge pull request #125 from arthurwolf/fix/NullStream
Logxen [Mon, 18 Feb 2013 00:37:18 +0000 (16:37 -0800)]
Merge pull request #125 from arthurwolf/fix/NullStream

Fix/null stream

11 years agoGcode: simplify get_int, use get_int to derive cached M and G codes
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

11 years agoButtonPool: silence warning from button_checksum being defined in both Button.h and...
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

11 years agoStreamOutput: implement static NullStream for code clarity; Button, Player: use stati...
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

11 years agoadd .o to gitignore
Arthur Wolf [Sun, 17 Feb 2013 20:04:04 +0000 (21:04 +0100)]
add .o to gitignore

11 years agomake -q work
Arthur Wolf [Sun, 17 Feb 2013 19:57:21 +0000 (20:57 +0100)]
make -q work

11 years agoMerge pull request #124 from logxen/onboot
arthurwolf [Sun, 17 Feb 2013 18:05:40 +0000 (10:05 -0800)]
Merge pull request #124 from logxen/onboot

Onboot

11 years agofixed Button
Logxen [Sun, 17 Feb 2013 17:56:32 +0000 (09:56 -0800)]
fixed Button

11 years agoMerge branch 'edge' into onboot
Logxen [Sun, 17 Feb 2013 17:53:48 +0000 (09:53 -0800)]
Merge branch 'edge' into onboot

Conflicts:
src/main.cpp

11 years agoonboot feedback now sent to hardware uart
Logxen [Sun, 17 Feb 2013 17:52:03 +0000 (09:52 -0800)]
onboot feedback now sent to hardware uart

11 years agoMerge pull request #123 from logxen/button
Logxen [Sun, 17 Feb 2013 17:51:23 +0000 (09:51 -0800)]
Merge pull request #123 from logxen/button

Button

11 years agoadded button normal_state
Logxen [Sun, 17 Feb 2013 17:37:40 +0000 (09:37 -0800)]
added button normal_state

11 years agogot things working with current edge
Logxen [Sun, 17 Feb 2013 17:33:46 +0000 (09:33 -0800)]
got things working with current edge

11 years agomake usbserial handle \r the same way the other serial inputs do
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

11 years agopreparing Button for modern edge
Logxen [Sun, 17 Feb 2013 16:14:45 +0000 (08:14 -0800)]
preparing Button for modern edge

11 years agoMerge branch 'edge' into button
Logxen [Sun, 17 Feb 2013 04:43:19 +0000 (20:43 -0800)]
Merge branch 'edge' into button

11 years agoMerge branch 'edge' into onboot
Logxen [Sun, 17 Feb 2013 04:36:39 +0000 (20:36 -0800)]
Merge branch 'edge' into onboot

11 years agoMerge 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

11 years agoMerge pull request #122 from logxen/edge
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

11 years agomake 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

11 years agoMerge pull request #121 from logxen/debugbreak
Logxen [Sat, 16 Feb 2013 22:08:33 +0000 (14:08 -0800)]
Merge pull request #121 from logxen/debugbreak

Debugbreak

11 years agoMerge branch 'edge' into 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

11 years agocleaned whitespace
Logxen [Sat, 16 Feb 2013 22:00:10 +0000 (14:00 -0800)]
cleaned whitespace

11 years agoMerge branch 'edge' into button
Logxen [Sat, 16 Feb 2013 19:16:25 +0000 (11:16 -0800)]
Merge branch 'edge' into button

11 years agoMerge pull request #119 from bgamari/fixes
Logxen [Sat, 16 Feb 2013 18:26:07 +0000 (10:26 -0800)]
Merge pull request #119 from bgamari/fixes

Endstops: Fix default direction

11 years agoEndstops: 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.

11 years agoTemperatureControl: Move printf out of interrupt context
Ben Gamari [Sat, 26 Jan 2013 21:39:48 +0000 (16:39 -0500)]
TemperatureControl: Move printf out of interrupt context

11 years agoMerge branch 'edge' into button
Logxen [Sat, 16 Feb 2013 06:03:14 +0000 (22:03 -0800)]
Merge branch 'edge' into button

11 years agoMerge pull request #117 from logxen/edge
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

11 years agoupdated rostock config defaults in code
Logxen [Sat, 16 Feb 2013 04:24:36 +0000 (20:24 -0800)]
updated rostock config defaults in code

11 years agoMerge pull request #116 from wolfmanjm/update/sampleconfigs
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

11 years agoupdated 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

11 years agoMerge pull request #114 from orcinus/HomingDirection
arthurwolf [Fri, 15 Feb 2013 21:09:42 +0000 (13:09 -0800)]
Merge pull request #114 from orcinus/HomingDirection

Homing direction

11 years agoMerge pull request #115 from logxen/rotatedcartesian
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

11 years agoadded RotatableCartesionSolution.h to Robot.cpp
Logxen [Fri, 15 Feb 2013 16:10:14 +0000 (08:10 -0800)]
added RotatableCartesionSolution.h to Robot.cpp

11 years agoMerge branch 'edge' into rotatedcartesian
Logxen [Fri, 15 Feb 2013 16:06:20 +0000 (08:06 -0800)]
Merge branch 'edge' into rotatedcartesian

11 years agoMerge pull request #113 from wolfmanjm/fix/homing
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...

11 years agomaking stepper::moving volatile fixes the homing cycle from hanging after retract
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

11 years agoMerge pull request #112 from logxen/edge
Logxen [Fri, 15 Feb 2013 07:51:58 +0000 (23:51 -0800)]
Merge pull request #112 from logxen/edge

made FileConfigSource tolerate tabs

11 years agomade FileConfigSource tolerate tabs
Logxen [Fri, 15 Feb 2013 07:49:04 +0000 (23:49 -0800)]
made FileConfigSource tolerate tabs

11 years agoinitial rotated cartesian solution implementation
Logxen [Fri, 15 Feb 2013 07:41:55 +0000 (23:41 -0800)]
initial rotated cartesian solution implementation

11 years agoMerge pull request #110 from logxen/rostock2
Logxen [Fri, 15 Feb 2013 04:28:14 +0000 (20:28 -0800)]
Merge pull request #110 from logxen/rostock2

Rostock2

11 years agoMerge branch 'edge' into rostock2
Logxen [Fri, 15 Feb 2013 04:08:56 +0000 (20:08 -0800)]
Merge branch 'edge' into rostock2

11 years agochanged solve_arm() to TriffidHunters's solution, which is reported to work
Logxen [Fri, 15 Feb 2013 04:07:52 +0000 (20:07 -0800)]
changed solve_arm() to TriffidHunters's solution, which is reported to work

11 years agoSmoothieSerial.inf should be DOS type.
Adam Green [Fri, 15 Feb 2013 00:51:21 +0000 (16:51 -0800)]
SmoothieSerial.inf should be DOS type.

11 years agoTry clarifing SerialConsole() UART selection.
Adam Green [Thu, 14 Feb 2013 20:34:14 +0000 (12:34 -0800)]
Try clarifing SerialConsole() UART selection.

11 years agoMerge branch 'edge' into rostock2
Logxen [Thu, 14 Feb 2013 08:31:44 +0000 (00:31 -0800)]
Merge branch 'edge' into rostock2

11 years agoMerge pull request #109 from logxen/edge
Logxen [Thu, 14 Feb 2013 08:30:46 +0000 (00:30 -0800)]
Merge pull request #109 from logxen/edge

added second_usb_serial_enable config option

11 years agoadded second_usb_serial_enable config option
Logxen [Thu, 14 Feb 2013 08:26:16 +0000 (00:26 -0800)]
added second_usb_serial_enable config option

11 years agorenamed beta_angle and gamma_angle to beta_relative_angle etc
Logxen [Thu, 14 Feb 2013 07:49:13 +0000 (23:49 -0800)]
renamed beta_angle and gamma_angle to beta_relative_angle etc

11 years agoadded alpha_angle config for rostock and abstracted the matrix rotation
Logxen [Thu, 14 Feb 2013 07:27:30 +0000 (23:27 -0800)]
added alpha_angle config for rostock and abstracted the matrix rotation

11 years agoadded configable beta and gamma angle offsets to the rostock solution
Logxen [Thu, 14 Feb 2013 06:58:24 +0000 (22:58 -0800)]
added configable beta and gamma angle offsets to the rostock solution

11 years agoremoved carriage_radius setting and made a sample rostock config file
Logxen [Thu, 14 Feb 2013 06:08:09 +0000 (22:08 -0800)]
removed carriage_radius setting and made a sample rostock config file

11 years agoMerge branch 'edge' of git://github.com/arthurwolf/Smoothie into HomingDirection
Ante Vukorepa [Thu, 14 Feb 2013 03:54:18 +0000 (04:54 +0100)]
Merge branch 'edge' of git://github.com/arthurwolf/Smoothie into HomingDirection

11 years agoAccidentally left a hard-coded position in.
Ante Vukorepa [Thu, 14 Feb 2013 03:53:56 +0000 (04:53 +0100)]
Accidentally left a hard-coded position in.

11 years agoAdded position reset at homing end; Added min and max axis positions.
Ante Vukorepa [Thu, 14 Feb 2013 03:45:12 +0000 (04:45 +0100)]
Added position reset at homing end; Added min and max axis positions.

11 years agoMerge branch 'edge' into track_allocs
Adam Green [Thu, 14 Feb 2013 03:10:23 +0000 (19:10 -0800)]
Merge branch 'edge' into track_allocs

11 years agoMerge branch 'edge' into rostock2
Logxen [Wed, 13 Feb 2013 23:44:52 +0000 (15:44 -0800)]
Merge branch 'edge' into rostock2

11 years agoMerge pull request #108 from logxen/edge
Logxen [Wed, 13 Feb 2013 23:06:51 +0000 (15:06 -0800)]
Merge pull request #108 from logxen/edge

commented the second usbserial to simplify life for new users

11 years agocommented the second usbserial to simplify life for new users
Logxen [Wed, 13 Feb 2013 23:05:32 +0000 (15:05 -0800)]
commented the second usbserial to simplify life for new users

11 years agoMerge pull request #1 from wolfmanjm/fix/solution-selection
Logxen [Wed, 13 Feb 2013 22:25:18 +0000 (14:25 -0800)]
Merge pull request #1 from wolfmanjm/fix/solution-selection

change switch to if/then/else for solution selection, so it compiles und...