Jim Morris [Tue, 25 Mar 2014 20:08:44 +0000 (13:08 -0700)]
Merge pull request #344 from wolfmanjm/upstreamedge
remove old boottloader, replace with latest bootloader
Jim Morris [Tue, 25 Mar 2014 20:07:01 +0000 (13:07 -0700)]
remove old boottloader, replace with latest bootloader
Jim Morris [Tue, 25 Mar 2014 08:30:17 +0000 (01:30 -0700)]
Merge pull request #343 from wolfmanjm/webui/add-play-file
Added playable/printable file list and click to play
Jim Morris [Tue, 25 Mar 2014 08:25:10 +0000 (01:25 -0700)]
Added playable/printable file list and click to play
added progress and abort buttons
added rakefile with webui task
Conflicts:
Rakefile
Jim Morris [Tue, 25 Mar 2014 04:32:10 +0000 (21:32 -0700)]
Merge pull request #342 from wolfmanjm/webui/replace-jog-rose
Webui/replace jog rose
Jim Morris [Tue, 25 Mar 2014 04:16:38 +0000 (21:16 -0700)]
Use Glen Beers SVG based Jogging rose
Minify the functions.js
split http into src and destination directories so js and html can be minified
Jim Morris [Mon, 24 Mar 2014 09:46:26 +0000 (02:46 -0700)]
split javascript out of index.html and Minify javascript
clean up index.html
Logxen [Mon, 24 Mar 2014 15:15:55 +0000 (08:15 -0700)]
Merge pull request #341 from PetteriAimonen/edge
Fix endptr checks in ConfigValue.h
Petteri Aimonen [Mon, 24 Mar 2014 15:08:02 +0000 (17:08 +0200)]
Fix endptr checks in ConfigValue.h
The function remove_non_number() was called twice, which will return
two different string instances. Then pointers to the separate instances
were compared to each other. If everything goes well, they will be allocated
at same point in memory and everything works, but there is no guarantee..
Fixed by adding a temporary variable.
Jim Morris [Mon, 24 Mar 2014 05:59:18 +0000 (22:59 -0700)]
Merge pull request #339 from wolfmanjm/updates/webui
Change web ui jog commands to G0
Jim Morris [Mon, 24 Mar 2014 05:54:50 +0000 (22:54 -0700)]
Change web ui jog commands to G0
implement get temperature
cleasn up uplaod file messages
fix a size bug in the makefsdata
More changes coming...
Jim Morris [Sat, 22 Mar 2014 03:37:00 +0000 (20:37 -0700)]
Merge pull request #336 from wolfmanjm/upstreamedge
add sample azteeg x5 config
Jim Morris [Sat, 22 Mar 2014 03:34:02 +0000 (20:34 -0700)]
added Example config for Azteeg X5 mini
Jim Morris [Fri, 21 Mar 2014 06:28:15 +0000 (23:28 -0700)]
Merge remote-tracking branch 'upstream/edge' into upstreamedge
Jim Morris [Fri, 21 Mar 2014 03:35:01 +0000 (20:35 -0700)]
Update README.creole
Jim Morris [Fri, 21 Mar 2014 03:31:57 +0000 (20:31 -0700)]
Update README.creole
Jim Morris [Mon, 17 Mar 2014 02:12:49 +0000 (19:12 -0700)]
Merge remote-tracking branch 'upstream/edge' into upstreamedge
Michael Moon [Mon, 17 Mar 2014 01:29:25 +0000 (12:29 +1100)]
USBMSD: allow dynamic instantiation
Jim Morris [Sat, 15 Mar 2014 23:27:21 +0000 (16:27 -0700)]
Merge remote-tracking branch 'upstream/edge' into upstreamedge
Jim Morris [Sat, 15 Mar 2014 05:09:49 +0000 (22:09 -0700)]
add back buttong pin to config sample
Jim Morris [Sat, 15 Mar 2014 04:16:46 +0000 (21:16 -0700)]
Merge pull request #334 from wolfmanjm/upstreamedge
add optional back button to rrd glcd
Jim Morris [Sat, 15 Mar 2014 04:15:24 +0000 (21:15 -0700)]
add optional back button to rrd glcd
Michael Moon [Fri, 14 Mar 2014 01:42:09 +0000 (12:42 +1100)]
Laser: do not dereference laser_pin if incorrect pin is set in config. Update config defaults to use appropriate pin
Jim Morris [Mon, 10 Mar 2014 22:47:28 +0000 (15:47 -0700)]
re assign encoder A/B pins for panel
Michael Moon [Sun, 23 Feb 2014 20:01:05 +0000 (07:01 +1100)]
Initialise actuator positions to current cartesian position (X0 Y0 Z0) so the first move is correct if homing is not performed. Addresses issue #333
Arthur Wolf [Thu, 20 Feb 2014 12:20:54 +0000 (13:20 +0100)]
Allow for Gcodes with numerical values higher than 255 in Switch module
Jim Morris [Wed, 19 Feb 2014 03:06:20 +0000 (19:06 -0800)]
Merge pull request #332 from wolfmanjm/upstreamedge
Use new c++11 way of doing checksum
Jim Morris [Wed, 19 Feb 2014 03:04:56 +0000 (19:04 -0800)]
Use new c++11 way of doing checksum
clean up temperaturecontrol headers
Jim Morris [Wed, 19 Feb 2014 02:54:10 +0000 (18:54 -0800)]
Merge pull request #331 from wolfmanjm/upstreamedge
Fix switch public access
Jim Morris [Wed, 19 Feb 2014 02:51:31 +0000 (18:51 -0800)]
Fix switch public access
Logxen [Wed, 19 Feb 2014 02:37:06 +0000 (18:37 -0800)]
Merge branch 'switch' into edge
Logxen [Wed, 19 Feb 2014 02:36:37 +0000 (18:36 -0800)]
added missing SwitchPublicAccess.h
Logxen [Wed, 19 Feb 2014 00:35:17 +0000 (16:35 -0800)]
added PublicAccessData support to Switch
Logxen [Tue, 18 Feb 2014 19:40:47 +0000 (11:40 -0800)]
made new longpress_delay apply only to up and down buttons
Arkadiusz Śpiewak [Sun, 16 Feb 2014 22:47:45 +0000 (23:47 +0100)]
add panel config for longpress
Arkadiusz Śpiewak [Sun, 16 Feb 2014 22:44:35 +0000 (23:44 +0100)]
add panel config for longpress
Arkadiusz Śpiewak [Sun, 16 Feb 2014 22:33:48 +0000 (23:33 +0100)]
Add longpress for panel buttons
Logxen [Sat, 15 Feb 2014 19:24:52 +0000 (11:24 -0800)]
enabled specifying numeric config values using all strtof capabilities
Logxen [Sat, 15 Feb 2014 18:48:42 +0000 (10:48 -0800)]
enabled specifying config values in hex with 0x prefix
Jim Morris [Thu, 13 Feb 2014 03:50:55 +0000 (19:50 -0800)]
change minimum travel to match what it used to be
Michael Moon [Wed, 12 Feb 2014 01:27:32 +0000 (12:27 +1100)]
Merge branch 'fix/Pauser' into edge
Michael Moon [Wed, 12 Feb 2014 01:12:56 +0000 (12:12 +1100)]
Pauser: if two consecutive blocks both used Pauser, paused_block would be overwritten with NULL at L55 *after* being set to the new block at L31. Use a temporary variable to get around this and allow paused_block to remain correct. Addresses issue #314
Michael Moon [Fri, 7 Feb 2014 22:43:36 +0000 (09:43 +1100)]
Robot: add a comment to clarify segmentation
Michael Moon [Fri, 7 Feb 2014 22:26:45 +0000 (09:26 +1100)]
Robot: forgot to check Z axis during segmentation. Reported by merkurk2k, found by wolfmanjm
Jim Morris [Fri, 7 Feb 2014 05:55:58 +0000 (21:55 -0800)]
Merge pull request #327 from wolfmanjm/upstreamedge
Add Makefile magic to exclude specified modules
Jim Morris [Fri, 7 Feb 2014 05:41:23 +0000 (21:41 -0800)]
Add Makefile magic to exclude specified modules
Conflicts:
makefile
Jim Morris [Mon, 3 Feb 2014 23:01:00 +0000 (15:01 -0800)]
Merge pull request #324 from wolfmanjm/fix/switch
Fix switch module to parse input and output commands properly
Jim Morris [Mon, 3 Feb 2014 22:57:55 +0000 (14:57 -0800)]
Fix switch module to parse input and output commands properly
Logxen [Fri, 31 Jan 2014 22:51:13 +0000 (14:51 -0800)]
enabled inversion of PWM pin within Laser Module
Michael Moon [Fri, 31 Jan 2014 21:10:58 +0000 (08:10 +1100)]
Vector3: C++ification. Apparently showing my roots as a C programmer.
Michael Moon [Fri, 31 Jan 2014 10:22:38 +0000 (21:22 +1100)]
Kossel: forward kinematics implementation. Added Vector3 class to handle vector math, eg bed autolevel transform
Michael Moon [Thu, 30 Jan 2014 05:40:38 +0000 (16:40 +1100)]
Robot: remove current_position as it's substantially similar to last_milestone and can be completely replaced by this slight rework of append_line()
Michael Moon [Fri, 31 Jan 2014 02:13:42 +0000 (13:13 +1100)]
Don't chain header includes if we don't have to, use predeclaration if we only need pointers. Include necessary headers from implementation rather than declaration.
Michael Moon [Fri, 31 Jan 2014 02:07:47 +0000 (13:07 +1100)]
Module: remove unused kernel pointer, shrink every Module instance by 4 bytes
Michael Moon [Sun, 26 Jan 2014 02:21:22 +0000 (13:21 +1100)]
TemperatureControlPool: fix off-by-one in pool_index
Logxen [Thu, 30 Jan 2014 21:56:52 +0000 (13:56 -0800)]
added laser_module_pwm_period to ConfigSamples
Logxen [Thu, 30 Jan 2014 21:23:36 +0000 (13:23 -0800)]
added laser_module_pwm_period config setting which adjusts the pwm rate by setting the pwm period in microseconds
Jim Morris [Wed, 29 Jan 2014 22:17:52 +0000 (14:17 -0800)]
Merge pull request #323 from wolfmanjm/upstreamedge
updaye from Wulfnor fixing epsilon
Jim Morris [Wed, 29 Jan 2014 22:16:08 +0000 (14:16 -0800)]
updaye from Wulfnor fixing epsilon
Jim Morris [Tue, 28 Jan 2014 07:37:41 +0000 (23:37 -0800)]
Merge pull request #322 from wolfmanjm/upstreamedge
fix M26 and M23
Jim Morris [Tue, 28 Jan 2014 07:33:41 +0000 (23:33 -0800)]
fix M26 and M23
Jim Morris [Mon, 27 Jan 2014 07:40:47 +0000 (23:40 -0800)]
Merge pull request #321 from wolfmanjm/upstreamedge
extend gkbeers fix for cd to player.cpp
Jim Morris [Mon, 27 Jan 2014 07:35:34 +0000 (23:35 -0800)]
extend gkbeears fix for cd to player.cpp
Jim Morris [Mon, 27 Jan 2014 07:08:53 +0000 (23:08 -0800)]
Merge pull request #320 from gkbeer/edge
Parsing of relative path corrected
gkbeer [Mon, 27 Jan 2014 06:45:37 +0000 (22:45 -0800)]
Parsing of relative path corrected
absolute_from_reletive() now returns an absolute path that accounts for
../ and .. in relative paths
Removed incorrect addition of trailing / from folder in cd_command()
Michael Moon [Mon, 27 Jan 2014 01:35:23 +0000 (12:35 +1100)]
Arm solutions: use appropriate constants
Michael Moon [Sat, 25 Jan 2014 23:13:52 +0000 (10:13 +1100)]
change minute -> second in relevant comments
Jim Morris [Fri, 24 Jan 2014 22:49:04 +0000 (14:49 -0800)]
Merge pull request #319 from wolfmanjm/upstreamedge
Add M203 to change max feedrates on the fly. Saveable with M500. Also wait for queue empty before changing accleration with M204
Jim Morris [Fri, 24 Jan 2014 22:46:35 +0000 (14:46 -0800)]
Add M203 to change max feedrates on the fly. Saveable with M500
Michael Moon [Fri, 24 Jan 2014 08:18:35 +0000 (19:18 +1100)]
remove redundant (and now incorrect) comment describing the recalculate procedure
Michael Moon [Fri, 24 Jan 2014 08:18:00 +0000 (19:18 +1100)]
Planner: missed a reference to minutes, we use seconds now
Michael Moon [Fri, 24 Jan 2014 08:04:26 +0000 (19:04 +1100)]
Merge branch 'master' into edge
Michael Moon [Fri, 24 Jan 2014 07:47:10 +0000 (18:47 +1100)]
Merge branch 'fix/TemperatureControl_indexes' into edge
Michael Moon [Fri, 24 Jan 2014 07:44:10 +0000 (18:44 +1100)]
Merge branch 'feature/Actuator' into edge
Michael Moon [Fri, 24 Jan 2014 07:27:03 +0000 (18:27 +1100)]
Robot: convert cartesian speed limits to mm/s
Michael Moon [Fri, 24 Jan 2014 06:58:12 +0000 (17:58 +1100)]
Planner: mixed up sizeof(pointer) with sizeof(array)
Michael Moon [Fri, 24 Jan 2014 05:53:16 +0000 (16:53 +1100)]
Consistently use seconds (mm/s, mm/s^2, steps/s, etc) internally, instead of switching between minutes and seconds arbitrarily
Michael Moon [Fri, 24 Jan 2014 05:50:20 +0000 (16:50 +1100)]
Robot: feed correct positions to actuators when reset_axis_position is called
Michael Moon [Fri, 24 Jan 2014 02:42:44 +0000 (13:42 +1100)]
Pin: code cleanup, no functionality changes
Michael Moon [Fri, 24 Jan 2014 02:42:27 +0000 (13:42 +1100)]
StepperMotor: just shifting things around
Michael Moon [Fri, 24 Jan 2014 02:42:05 +0000 (13:42 +1100)]
Robot,StepperMotor: per-actuator speed limits
Michael Moon [Fri, 24 Jan 2014 02:36:30 +0000 (13:36 +1100)]
Planner: accept unit vector instead of axis deltas
Michael Moon [Thu, 23 Jan 2014 23:05:36 +0000 (10:05 +1100)]
Pin: built-in copy ctor is adequate
Michael Moon [Thu, 23 Jan 2014 22:56:23 +0000 (09:56 +1100)]
StepperMotor has its own Pins. Copy data into them, and use accessor methods rather than reaching in and touching directly
Michael Moon [Thu, 23 Jan 2014 22:55:14 +0000 (09:55 +1100)]
Planner: steps is a delta, not absolute!
Michael Moon [Thu, 23 Jan 2014 06:30:14 +0000 (17:30 +1100)]
StepperMotor, Planner: fix a couple of potential rounding errors
Michael Moon [Thu, 23 Jan 2014 06:29:54 +0000 (17:29 +1100)]
Robot: remember to grab steps_per_mm from config
Michael Moon [Thu, 23 Jan 2014 06:29:13 +0000 (17:29 +1100)]
Arm Solutions: rename fields to reflect appropriate function
Michael Moon [Thu, 23 Jan 2014 06:05:20 +0000 (17:05 +1100)]
Move most handling of steps from arm_solution,Robot,Planner to StepperMotor
Jim Morris [Mon, 20 Jan 2014 22:45:49 +0000 (14:45 -0800)]
Merge pull request #318 from wolfmanjm/feature/parse-pycam-gcode
Feature/parse pycam gcode
Jim Morris [Mon, 20 Jan 2014 22:40:15 +0000 (14:40 -0800)]
Finish handling Pycam style gcode files
Jim Morris [Mon, 20 Jan 2014 10:24:54 +0000 (02:24 -0800)]
Implement parsing of standalone X Y Z or F as per pycam gcode
clean up some double/float constants
Michael Moon [Mon, 20 Jan 2014 03:02:22 +0000 (14:02 +1100)]
TemperatureControlPool: fix wrong index being assigned if a TemperatureControl is listed in config but disabled
Jim Morris [Sun, 19 Jan 2014 22:21:57 +0000 (14:21 -0800)]
Update config
Jim Morris [Sun, 19 Jan 2014 22:21:24 +0000 (14:21 -0800)]
Update config
Michael Moon [Sun, 19 Jan 2014 08:28:27 +0000 (19:28 +1100)]
Merge branch 'feature/Pauser_stall_queue' into edge
should address issue #314
Michael Moon [Sun, 19 Jan 2014 08:20:30 +0000 (19:20 +1100)]
Pauser: take block during on_block_begin to correctly stall queue while paused
Michael Moon [Sun, 19 Jan 2014 07:51:30 +0000 (18:51 +1100)]
Merge branch 'feature/ActionQueue_redux' into edge
Michael Moon [Sun, 19 Jan 2014 07:51:19 +0000 (18:51 +1100)]
Merge branch 'fix/USBMSD_report_error_no_sdcard' into edge
Michael Moon [Sun, 19 Jan 2014 06:24:27 +0000 (17:24 +1100)]
Found an error state which doesn't cause linux to spam usb resets