Adam Green [Mon, 18 Feb 2013 22:15:33 +0000 (14:15 -0800)]
Move files in preparation for new build system.
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
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
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.
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
Logxen [Fri, 15 Feb 2013 04:28:14 +0000 (20:28 -0800)]
Merge pull request #110 from logxen/rostock2
Rostock2
Logxen [Fri, 15 Feb 2013 04:08:56 +0000 (20:08 -0800)]
Merge branch 'edge' into rostock2
Logxen [Fri, 15 Feb 2013 04:07:52 +0000 (20:07 -0800)]
changed solve_arm() to TriffidHunters's solution, which is reported to work
Adam Green [Fri, 15 Feb 2013 00:51:21 +0000 (16:51 -0800)]
SmoothieSerial.inf should be DOS type.
Adam Green [Thu, 14 Feb 2013 20:34:14 +0000 (12:34 -0800)]
Try clarifing SerialConsole() UART selection.
Logxen [Thu, 14 Feb 2013 08:31:44 +0000 (00:31 -0800)]
Merge branch 'edge' into rostock2
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
Logxen [Thu, 14 Feb 2013 08:26:16 +0000 (00:26 -0800)]
added second_usb_serial_enable config option
Logxen [Thu, 14 Feb 2013 07:49:13 +0000 (23:49 -0800)]
renamed beta_angle and gamma_angle to beta_relative_angle etc
Logxen [Thu, 14 Feb 2013 07:27:30 +0000 (23:27 -0800)]
added alpha_angle config for rostock and abstracted the matrix rotation
Logxen [Thu, 14 Feb 2013 06:58:24 +0000 (22:58 -0800)]
added configable beta and gamma angle offsets to the rostock solution
Logxen [Thu, 14 Feb 2013 06:08:09 +0000 (22:08 -0800)]
removed carriage_radius setting and made a sample rostock config file
Ante Vukorepa [Thu, 14 Feb 2013 03:54:18 +0000 (04:54 +0100)]
Merge branch 'edge' of git://github.com/arthurwolf/Smoothie into HomingDirection
Ante Vukorepa [Thu, 14 Feb 2013 03:53:56 +0000 (04:53 +0100)]
Accidentally left a hard-coded position in.
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.
Logxen [Wed, 13 Feb 2013 23:44:52 +0000 (15:44 -0800)]
Merge branch 'edge' into rostock2
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
Logxen [Wed, 13 Feb 2013 23:05:32 +0000 (15:05 -0800)]
commented the second usbserial to simplify life for new users
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...
Jim Morris [Wed, 13 Feb 2013 21:47:31 +0000 (13:47 -0800)]
change switch to if/then/else for solution selection, so it compiles under DEBUG
Logxen [Wed, 13 Feb 2013 20:57:44 +0000 (12:57 -0800)]
rebuilt rostock solution into modern edge
arthurwolf [Wed, 13 Feb 2013 14:48:10 +0000 (06:48 -0800)]
Merge pull request #105 from wolfmanjm/feature/playprogress
added new simpleshell commands progress, abort and help
Jim Morris [Wed, 13 Feb 2013 07:58:31 +0000 (23:58 -0800)]
added new simplshell commands progress, abort and help
Michael Moon [Wed, 13 Feb 2013 06:01:34 +0000 (17:01 +1100)]
Merge branch 'feature/USBSerial-works-outside-ISR-context' into edge
Michael Moon [Wed, 13 Feb 2013 05:59:24 +0000 (16:59 +1100)]
USBSerial: remove redundant commented code
Michael Moon [Wed, 13 Feb 2013 05:59:05 +0000 (16:59 +1100)]
SimpleShell: cat: use puts instead of printf("%s") for efficiency
Michael Moon [Wed, 13 Feb 2013 05:57:29 +0000 (16:57 +1100)]
USBSerial: call USBHW::usbisr() to drain queue when necessary
Michael Moon [Wed, 13 Feb 2013 05:56:32 +0000 (16:56 +1100)]
USBSerial: enough room in buffer for 2 full USB packets, plus a little extra to maintain alignment
Michael Moon [Wed, 13 Feb 2013 05:55:22 +0000 (16:55 +1100)]
CircBuffer: use actual size specified, report free space correctly
Michael Moon [Wed, 13 Feb 2013 05:54:33 +0000 (16:54 +1100)]
CircBuffer: move USBSerial buffers into USB ram to conserve main ram
Ben Gamari [Wed, 13 Feb 2013 05:46:02 +0000 (21:46 -0800)]
Merge pull request #104 from bgamari/edge
Gcode: Ensure queued is initialized
Ben Gamari [Wed, 13 Feb 2013 05:39:10 +0000 (00:39 -0500)]
Gcode: Ensure queued is initialized
This was a silly and obvious oversight from
6a3328dfe514e66a98c0cf5adc7252d333567e83. Thanks to wolfmanjm for
spotting it.
Ben Gamari [Wed, 13 Feb 2013 00:34:27 +0000 (16:34 -0800)]
Merge pull request #102 from bgamari/fixes
Player: Reduce block queue depth to 16
Ben Gamari [Tue, 12 Feb 2013 23:41:29 +0000 (18:41 -0500)]
Player: Reduce block queue depth to 16
It seems we don't have enough memory to keep this many blocks around;
the heap collides with the stack on LPC1769.
arthurwolf [Wed, 13 Feb 2013 00:05:39 +0000 (16:05 -0800)]
Merge pull request #92 from wolfmanjm/move_digipot
move digipot to CurrentCOntrol Module
arthurwolf [Wed, 13 Feb 2013 00:04:41 +0000 (16:04 -0800)]
Merge pull request #96 from wolfmanjm/upstreamedge
add closedir to simpleshell commands that open directories
Adam Green [Tue, 12 Feb 2013 07:26:50 +0000 (23:26 -0800)]
Fixes issue #101
Simplified naming convention of sample config file and re-organized into
directory structure where more than one sample can live with each sample having
the correct final name of "config".
I have included a sample README.TXT file in the ConfigSamples directory that
others more knowledgable about this area may want to update.
Adam Green [Mon, 11 Feb 2013 08:11:16 +0000 (00:11 -0800)]
Switch gcc4mbed.c license to Apache v2
I never meant for this to have a LGPL license on it. I must have
copied that from MRI code base at some point. I should have been
Apache v2.
Michael Moon [Sun, 10 Feb 2013 03:01:20 +0000 (14:01 +1100)]
SimpleShell: use strtol to check for valid line limit instead of int(atof(...))
Michael Moon [Sun, 10 Feb 2013 02:57:47 +0000 (13:57 +1100)]
Gcode: simplify get_value with strtod
Ben Gamari [Mon, 11 Feb 2013 02:30:27 +0000 (18:30 -0800)]
Merge pull request #100 from bgamari/fixes
Various things encountered during search for source of heap corruption
Ben Gamari [Mon, 11 Feb 2013 02:26:25 +0000 (21:26 -0500)]
StreamOutput: Kill dead code
Ben Gamari [Sun, 10 Feb 2013 23:05:09 +0000 (18:05 -0500)]
StreamOutput: Buffer allocated by malloc being freed with delete
Thanks to adamgr for noticing this.
Ben Gamari [Sun, 10 Feb 2013 22:27:54 +0000 (17:27 -0500)]
Player: Pop Gcode before deleting
Ben Gamari [Sun, 10 Feb 2013 21:55:05 +0000 (16:55 -0500)]
SimpleShell: Reserve buffer before appending
Ben Gamari [Sun, 10 Feb 2013 21:54:44 +0000 (16:54 -0500)]
Gcode: Make command const
This also kills allocations from indexing
Ben Gamari [Sun, 10 Feb 2013 21:53:38 +0000 (16:53 -0500)]
GcodeDisplay: Use iterator instead of indexing
This avoids allocations due to _M_leak since possible_command is
mutable.
Adam Green [Sun, 10 Feb 2013 09:57:19 +0000 (01:57 -0800)]
I giveth 2k back to the heap.
With commit
d79d4eff87ffb5c88f19a32bf23d26ba0e52225a I initialized
_sbrk()'s heap pointer to the wrong linker symbol which ended up
taking away 2k from the heap.
Also removed redundant arm-none-eabi-size call in makefile.
Adam Green [Sun, 10 Feb 2013 05:20:21 +0000 (21:20 -0800)]
Merge remote-tracking branch 'origin/edge' into edge
Adam Green [Sun, 10 Feb 2013 05:17:36 +0000 (21:17 -0800)]
Switch back to ugly size output.
This works on Windows and doesn't assume *nix terminal with Perl installed.
Michael Moon [Sun, 10 Feb 2013 02:52:27 +0000 (13:52 +1100)]
Pin: use strtol to parse pindef strings in a simpler and more efficient fashion
Michael Moon [Sun, 10 Feb 2013 01:28:27 +0000 (12:28 +1100)]
ConfigValue: also accept 'y'/'yes' as a boolean
Michael Moon [Sun, 10 Feb 2013 01:27:49 +0000 (12:27 +1100)]
ConfigValue: use strtol/strtod instead of atoi/atof since they tell us directly if the string was a valid number, we don't have to do our own string parsing to work it out
Michael Moon [Sun, 10 Feb 2013 01:23:19 +0000 (12:23 +1100)]
Merge branch 'feature/static-Pins' into edge