Michael Moon [Wed, 15 Jan 2014 22:31:05 +0000 (09:31 +1100)]
Change Conveyor,Planner,Block to use HeapRing
Michael Moon [Wed, 15 Jan 2014 23:10:17 +0000 (10:10 +1100)]
Revert "Change Conveyor,Planner,Block to use HeapRing"
This reverts commit
5bd37b4d1309789eb1dc8f3300f0ee206901a171.
Michael Moon [Wed, 15 Jan 2014 22:45:56 +0000 (09:45 +1100)]
HeapRing: missed a free() in a corner case
Michael Moon [Wed, 15 Jan 2014 22:31:05 +0000 (09:31 +1100)]
Change Conveyor,Planner,Block to use HeapRing
Michael Moon [Wed, 15 Jan 2014 22:38:53 +0000 (09:38 +1100)]
add HeapRing: a new RingBuffer constructed from the trials and tribulations of the existing one
Michael Moon [Wed, 15 Jan 2014 01:39:44 +0000 (12:39 +1100)]
provide one method to add gcode to blocks, reduce code duplication
Jim Morris [Mon, 13 Jan 2014 03:01:00 +0000 (19:01 -0800)]
Merge pull request #313 from powertomato/feature/mri_all_locations
Changed SerialConsole definition for MRI/Debug UART so it supports all 4...
Stefan Krulj [Mon, 13 Jan 2014 03:54:20 +0000 (04:54 +0100)]
Changed SerialConsole definition for MRI/Debug UART so it supports all 4 locations
Jim Morris [Sun, 12 Jan 2014 05:57:56 +0000 (21:57 -0800)]
Merge pull request #311 from wolfmanjm/upstreamedge
Make minimum planner speed configurable
Jim Morris [Sun, 12 Jan 2014 05:54:33 +0000 (21:54 -0800)]
Make minimum planner speed configurable
pop all flushable blocks for queue in one on_idle
Add M205 Sxxx to set minimum planner speed from console and save with M500
Jim Morris [Sat, 11 Jan 2014 07:54:19 +0000 (23:54 -0800)]
Merge pull request #310 from wolfmanjm/upstreamedge
Set previous_nominal_speed to 0 if the next block is a zero move block s...
Jim Morris [Sat, 11 Jan 2014 07:51:38 +0000 (23:51 -0800)]
Set previous_nominal_speed to 0 if the next block is a zero move block so jerk can be calculated correctly
clean up some stuff
Jim Morris [Fri, 10 Jan 2014 04:37:36 +0000 (20:37 -0800)]
Merge pull request #309 from wolfmanjm/upstreamedge
M500 save current settings for E only if different from the config value
Jim Morris [Fri, 10 Jan 2014 04:34:49 +0000 (20:34 -0800)]
M500 save current settings for E only if different from the config value
Jim Morris [Wed, 8 Jan 2014 08:34:11 +0000 (00:34 -0800)]
Merge pull request #308 from wolfmanjm/upstreamedge
Fix acceleration calculation bug when preceded by extruder only move bloc...
Jim Morris [Wed, 8 Jan 2014 08:28:49 +0000 (00:28 -0800)]
Fix acceleration calculatin bug when preceded by extruder only move block (entry speed was not being set to zero)
Clean up block initialization, actually zero all block fields on ctor and add a clear() method
Jim Morris [Mon, 6 Jan 2014 08:16:29 +0000 (00:16 -0800)]
Merge pull request #307 from wolfmanjm/upstreamedge
further fields that extruder needs to initialize
Jim Morris [Mon, 6 Jan 2014 08:14:10 +0000 (00:14 -0800)]
further fields that extruder needs to initialize
Jim Morris [Mon, 6 Jan 2014 07:35:23 +0000 (23:35 -0800)]
Merge pull request #306 from wolfmanjm/upstreamedge
Fix acceleration bug, and memory leak
Jim Morris [Mon, 6 Jan 2014 07:33:08 +0000 (23:33 -0800)]
rename RingBuffer::delete_first() to delete)tail() to reflect what it actually does
Jim Morris [Mon, 6 Jan 2014 07:25:54 +0000 (23:25 -0800)]
Fix acceleration bug where an extruder only move was though to be a real move and uninitialized fields were being used to calculate trapezoids
Fix partial memory leak where the blocks gocde vector was not being cleared when it was popped from the tail
Jim Morris [Thu, 2 Jan 2014 21:25:38 +0000 (13:25 -0800)]
Update config
Jim Morris [Thu, 2 Jan 2014 02:32:45 +0000 (18:32 -0800)]
Merge pull request #304 from wolfmanjm/upstreamedge
Fix M500 and M503 for PID values M301
Jim Morris [Thu, 2 Jan 2014 02:29:44 +0000 (18:29 -0800)]
Fix M500 and M503 for PID values M301
Jim Morris [Thu, 2 Jan 2014 02:05:50 +0000 (18:05 -0800)]
Merge pull request #303 from wolfmanjm/upstreamedge
Added M501 to load config-override
Jim Morris [Thu, 2 Jan 2014 02:04:24 +0000 (18:04 -0800)]
Added M501 to load config-override
renamed old M501 to M502 as it should have been for removing config-override
Added M504 xxx to save to config-override.xxx
added load/save to load and save names config override files
Make Filestream open for "w" not "a"
Jim Morris [Fri, 27 Dec 2013 05:18:24 +0000 (21:18 -0800)]
Merge pull request #300 from wolfmanjm/upstreamedge
no need to copy input now input is already float
Jim Morris [Fri, 27 Dec 2013 05:14:42 +0000 (21:14 -0800)]
no need to copy input now input is already float
Michael Moon [Fri, 27 Dec 2013 02:35:24 +0000 (13:35 +1100)]
missed an atan() in Robot, changed to atanf
Michael Moon [Fri, 27 Dec 2013 02:34:42 +0000 (13:34 +1100)]
replace sqrt, hypot, sin, cos with float variants (ie sqrtf, hypotf, sinf, cosf)
Michael Moon [Fri, 27 Dec 2013 02:31:16 +0000 (13:31 +1100)]
replace strtod with strtof
Michael Moon [Fri, 27 Dec 2013 02:21:32 +0000 (13:21 +1100)]
Replace all doubles with floats including some constants
Michael Moon [Fri, 27 Dec 2013 02:09:01 +0000 (13:09 +1100)]
replace all uses of module::kernel pointer with kernel::instance singleton pointer
Michael Moon [Fri, 27 Dec 2013 01:55:26 +0000 (12:55 +1100)]
Use static kernel singleton pointer instead of per-class instance pointer
Michael Moon [Fri, 27 Dec 2013 01:43:28 +0000 (12:43 +1100)]
Merge branch 'fix/Queue_scan_consolidation' into edge
Michael Moon [Fri, 27 Dec 2013 01:43:23 +0000 (12:43 +1100)]
Revert "Revert "Merge branch 'fix/Queue_scan_consolidation' into edge""
This reverts commit
e918c030e3ced39ce7d6f8d7a66d1ce8bb78e7d9.
Michael Moon [Fri, 27 Dec 2013 01:31:42 +0000 (12:31 +1100)]
works! hooray! add some final cleanups and clarifications
Michael Moon [Fri, 27 Dec 2013 01:10:48 +0000 (12:10 +1100)]
found another off by one, starting to wonder how original code ever worked
Michael Moon [Fri, 27 Dec 2013 00:38:45 +0000 (11:38 +1100)]
found an off-by-one, see if this works
Michael Moon [Thu, 26 Dec 2013 06:46:30 +0000 (17:46 +1100)]
Revert "Merge branch 'fix/Queue_scan_consolidation' into edge"
This reverts commit
b4f9b9b5b4186df5a681dc63cd4174c543cd41d7, reversing
changes made to
d97f94e3d8782e77793011430bb38784640b1f6f.
needs more work
Michael Moon [Thu, 26 Dec 2013 05:11:34 +0000 (16:11 +1100)]
Merge branch 'fix/Queue_scan_consolidation' into edge
I keep being told that if I want something tested, merge it into edge
Michael Moon [Thu, 26 Dec 2013 03:21:05 +0000 (14:21 +1100)]
Merge branch 'fix/Ringbuffer' into edge
Michael Moon [Thu, 26 Dec 2013 01:33:02 +0000 (12:33 +1100)]
Remove unused parameters to Block::reverse pass and Block::forward_pass
Michael Moon [Thu, 26 Dec 2013 01:30:14 +0000 (12:30 +1100)]
Consolidate planner's block queue scan
Michael Moon [Thu, 26 Dec 2013 00:59:05 +0000 (11:59 +1100)]
get_tail_ref was also mis-named, should be get_head_ref
Michael Moon [Thu, 26 Dec 2013 00:52:38 +0000 (11:52 +1100)]
Swap ringbuffer around the right way
Michael Moon [Thu, 26 Dec 2013 00:16:32 +0000 (11:16 +1100)]
make console defaults in src/makefile slightly less machine specific
Jim Morris [Mon, 23 Dec 2013 22:23:55 +0000 (14:23 -0800)]
Merge pull request #298 from wolfmanjm/upstreamedge
Panel displays Printing when getting gcodes from pronterface or such
Jim Morris [Mon, 23 Dec 2013 22:21:19 +0000 (14:21 -0800)]
Panel displays Printing when getting gcodes from pronterface or such
Michael Moon [Mon, 23 Dec 2013 07:33:03 +0000 (18:33 +1100)]
Merge branch 'feature/MemoryPool_redux' into edge
Michael Moon [Mon, 23 Dec 2013 07:09:19 +0000 (18:09 +1100)]
USBSerial/CircBuffer: use MemoryPool allocator
Michael Moon [Mon, 23 Dec 2013 07:05:40 +0000 (18:05 +1100)]
Add AHB heapwalk to SimpleShell mem -v output
Michael Moon [Mon, 23 Dec 2013 07:05:12 +0000 (18:05 +1100)]
MemoryPool: remove redundant sbrk variable
Michael Moon [Mon, 23 Dec 2013 07:03:07 +0000 (18:03 +1100)]
use AHB0.alloc to allocate array, new (AHB0) char[] doesn't seem to work
Jim Morris [Mon, 23 Dec 2013 05:31:53 +0000 (21:31 -0800)]
show total available memory free in mem command
Jim Morris [Mon, 23 Dec 2013 05:13:40 +0000 (21:13 -0800)]
update panel to use new memory pool
add free ahb ram to mem command
Michael Moon [Mon, 23 Dec 2013 03:11:06 +0000 (14:11 +1100)]
USBMSD: use MemoryPool instead of ahbmalloc
Michael Moon [Mon, 23 Dec 2013 03:10:16 +0000 (14:10 +1100)]
MemoryPool Redux: works! ahbmalloc has been deprecated and will be removed soon.
Michael Moon [Sun, 22 Dec 2013 23:07:06 +0000 (10:07 +1100)]
Merge branch 'fix/deadlock_on_long_lines' into edge
Michael Moon [Sun, 22 Dec 2013 22:35:31 +0000 (09:35 +1100)]
USBSerial: increase RX buffer to 256 bytes to reduce likelihood of short line/long line corner case
Michael Moon [Sun, 22 Dec 2013 22:33:36 +0000 (09:33 +1100)]
handle case where a short line, and the start of a line longer than (buffer - usbpacket) are bundled into one usb packet. the longer line will unfortunately be discarded.
Jim Morris [Sun, 22 Dec 2013 22:17:53 +0000 (14:17 -0800)]
Merge pull request #297 from wolfmanjm/fix/dhcp-default
make dhcp/auto the default for network if nothing specified in config
Jim Morris [Sun, 22 Dec 2013 22:16:17 +0000 (14:16 -0800)]
make dhcp/auto the default for network if nothing specified in config
Michael Moon [Sun, 22 Dec 2013 22:12:55 +0000 (09:12 +1100)]
Long lines could cause a deadlock since the buffer can become full without us seeing a newline. In this case, we drop the line and continue flushing until we see our newline. The line is discarded and no response is sent to the host.
Jim Morris [Sun, 22 Dec 2013 22:12:14 +0000 (14:12 -0800)]
Merge pull request #296 from wolfmanjm/fix/long-lines-in-play
fix long lines in player, current limit 128 is discarded
Jim Morris [Sun, 22 Dec 2013 22:09:52 +0000 (14:09 -0800)]
fix long lines in player, current limit 128 is discarded
Jim Morris [Sun, 22 Dec 2013 10:56:40 +0000 (02:56 -0800)]
Merge pull request #295 from wolfmanjm/feature/uip-network-webserver
Merge Network code with webserver etc
Jim Morris [Sun, 22 Dec 2013 09:56:41 +0000 (01:56 -0800)]
Merge Network code with webserver etc
Add some re entrancy fixes to circbuffer and ringbuffer
Allow network to be eliminated from build with make NONETWORK=1
Jim Morris [Fri, 20 Dec 2013 23:05:04 +0000 (15:05 -0800)]
Merge pull request #294 from wolfmanjm/upstreamedge
Allow config setting of encoder resolution to override default set in pa...
Jim Morris [Fri, 20 Dec 2013 22:52:53 +0000 (14:52 -0800)]
Allow config setting of encoder resolution to override default set in panel specific code
Jim Morris [Thu, 19 Dec 2013 08:40:11 +0000 (00:40 -0800)]
add feedrate to panel extrude/retract command
Jim Morris [Tue, 17 Dec 2013 02:25:45 +0000 (18:25 -0800)]
Merge pull request #293 from wolfmanjm/upstreamedge
clean up includes in streamoutput
Jim Morris [Tue, 17 Dec 2013 02:24:06 +0000 (18:24 -0800)]
clean up includes in streamoutput
refactor endstops
Jim Morris [Tue, 17 Dec 2013 02:08:35 +0000 (18:08 -0800)]
Merge pull request #292 from wolfmanjm/upstreamedge
Upstreamedge
Jim Morris [Tue, 17 Dec 2013 02:06:38 +0000 (18:06 -0800)]
don't inherit from mbed:stream anymore
Jim Morris [Tue, 17 Dec 2013 01:57:58 +0000 (17:57 -0800)]
Use FileStream intead of append file stream for M500, seems to fix crash
don't use use string in appendfilestream
Jim Morris [Sun, 15 Dec 2013 02:47:55 +0000 (18:47 -0800)]
Merge pull request #291 from wolfmanjm/upstreamedge
Upstreamedge
Jim Morris [Sun, 15 Dec 2013 02:46:33 +0000 (18:46 -0800)]
make corexy home x and y at the same time
fix conflict
Jim Morris [Sun, 15 Dec 2013 02:41:51 +0000 (18:41 -0800)]
Make X and Y home at the same time on corexy/hbot like regular homing
Conflicts:
src/modules/tools/endstops/Endstops.cpp
Jim Morris [Sat, 14 Dec 2013 21:33:35 +0000 (13:33 -0800)]
Merge pull request #290 from wolfmanjm/upstreamedge
Add comment to M503 indicating if override file present or not
Jim Morris [Sat, 14 Dec 2013 21:30:17 +0000 (13:30 -0800)]
Add comment to M503 indicating if override file present or not
increase precision on saved steps/mm to 5 dp
Jim Morris [Sat, 14 Dec 2013 11:39:42 +0000 (03:39 -0800)]
Merge pull request #289 from wolfmanjm/upstreamedge
Add M500, M501, M503 to save certain settings
Jim Morris [Sat, 14 Dec 2013 11:28:03 +0000 (03:28 -0800)]
swap corexy homing back to x y z
Jim Morris [Sat, 14 Dec 2013 09:22:54 +0000 (01:22 -0800)]
Fix homing for corexy to honor the home to min or home to max setting.
Jim Morris [Fri, 13 Dec 2013 07:42:58 +0000 (23:42 -0800)]
added an append to file streamthat appends and printfs to a file
Jim Morris [Fri, 13 Dec 2013 07:34:32 +0000 (23:34 -0800)]
Added M500, M501, M503 to save certain values to a config-override file that gets loaded at boot time if present
Currently M206, M92, M301 are saved when M500 is used, M503 just displays current overriden settings
Jim Morris [Tue, 10 Dec 2013 07:01:03 +0000 (23:01 -0800)]
Merge pull request #288 from wolfmanjm/upstreamedge
Fix menu movement in panel when menu_offset != 0, this fixes oversensiti...
Jim Morris [Tue, 10 Dec 2013 06:55:37 +0000 (22:55 -0800)]
Fix menu movement in panel when menu_offset != 0, this fixes oversensitive encoder wheels
Jim Morris [Wed, 4 Dec 2013 09:27:55 +0000 (01:27 -0800)]
Merge pull request #286 from wolfmanjm/upstreamedge
Upstreamedge
Jim Morris [Wed, 4 Dec 2013 09:24:46 +0000 (01:24 -0800)]
move checksum defines into cpp from h
implement new autopid based on Bretts https://github.com/br3ttb/Arduino-PID-AutoTune-Library
Jim Morris [Wed, 4 Dec 2013 09:26:04 +0000 (01:26 -0800)]
Merge remote-tracking branch 'upstream/edge' into upstreamedge
Jim Morris [Mon, 2 Dec 2013 21:24:56 +0000 (13:24 -0800)]
Merge pull request #285 from wolfmanjm/upstreamedge
tweak idle timeouts on some panel menus that need more time
Jim Morris [Mon, 2 Dec 2013 21:23:40 +0000 (13:23 -0800)]
Merge remote-tracking branch 'upstream/edge' into upstreamedge
Jim Morris [Mon, 2 Dec 2013 21:22:08 +0000 (13:22 -0800)]
tweak idle timeouts on some panel menus that need more time
Jim Morris [Fri, 29 Nov 2013 22:14:39 +0000 (14:14 -0800)]
Merge pull request #284 from wolfmanjm/upstreamedge
Fix bug in simpleshell where cat /sd/file where file has a very long lin...
Jim Morris [Fri, 29 Nov 2013 22:13:17 +0000 (14:13 -0800)]
Fix buf in simpleshell where cat /sd/file where file has a very long line causes crash
Jim Morris [Fri, 29 Nov 2013 10:19:45 +0000 (02:19 -0800)]
Merge pull request #283 from wolfmanjm/upstreamedge
Add M400 which waits for all moves to complete before returning ok
Jim Morris [Fri, 29 Nov 2013 10:12:52 +0000 (02:12 -0800)]
Add M400 which waits for all moves to complete before returning ok
Michael Moon [Fri, 29 Nov 2013 01:58:37 +0000 (12:58 +1100)]
MBED::Serial: improved baudrate calculator. see github.com/mbedmicro/mbed/pull/116
Arthur Wolf [Sun, 24 Nov 2013 00:14:36 +0000 (01:14 +0100)]
incomplete implementation of multi-extruder support. backwards compatible