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
Michael Moon [Fri, 22 Nov 2013 23:24:19 +0000 (10:24 +1100)]
Remove errant object files that should never have been in the source tree in the first place
Jim Morris [Tue, 19 Nov 2013 03:16:28 +0000 (19:16 -0800)]
Merge pull request #282 from wolfmanjm/upstreamedge
make play quiet by default added -v for verbose
Jim Morris [Tue, 19 Nov 2013 03:15:01 +0000 (19:15 -0800)]
make play quiet by default added -v for verbose
Jim Morris [Sun, 17 Nov 2013 23:44:01 +0000 (15:44 -0800)]
Merge pull request #281 from wolfmanjm/upstreamedge
allow leds to be disabled after config loaded
Jim Morris [Sun, 17 Nov 2013 23:41:43 +0000 (15:41 -0800)]
allow leds to be disabled after config loaded
added leds_disable true in config to disable leds
Jim Morris [Tue, 12 Nov 2013 01:26:13 +0000 (17:26 -0800)]
Merge pull request #278 from wolfmanjm/upstreamedge
Add M28/M29 to upload a file from pronterface to smoothie
Jim Morris [Tue, 12 Nov 2013 01:23:39 +0000 (17:23 -0800)]
Add M28/M29 to upload a file from pronterface to smoothie
Jim Morris [Sun, 10 Nov 2013 22:53:31 +0000 (14:53 -0800)]
Merge pull request #277 from wolfmanjm/upstreamedge
Upstreamedge
Jim Morris [Sun, 10 Nov 2013 22:48:33 +0000 (14:48 -0800)]
more panel clean up of unused includes and defines
Jim Morris [Sun, 10 Nov 2013 22:28:23 +0000 (14:28 -0800)]
clean up unwanted includes
Jim Morris [Sun, 10 Nov 2013 22:20:54 +0000 (14:20 -0800)]
Merge pull request #276 from wolfmanjm/upstreamedge
clean up panel headers
Jim Morris [Sun, 10 Nov 2013 22:17:53 +0000 (14:17 -0800)]
clean up panel headers
Jim Morris [Sun, 10 Nov 2013 02:56:26 +0000 (18:56 -0800)]
Merge pull request #275 from wolfmanjm/upstreamedge
allow _ for panel custom menu comamnds that need spaces (like G0 X100 Y1...
Jim Morris [Sun, 10 Nov 2013 02:51:49 +0000 (18:51 -0800)]
allow _ for panel custom menu comamnds that need spaces (like G0 X100 Y100 would be G1_X100_Y100)
allow | to separate commands to allow for multiple commands in custom menu
Allow each screen to determine its timeout value before returnign to watch screen
make custom menu and prepare timeouts much longer
allow button press in startup panel screen to go to main menu
Jim Morris [Sat, 9 Nov 2013 04:02:31 +0000 (20:02 -0800)]
Merge pull request #274 from wolfmanjm/upstreamedge
remove the definition of max() from nut_bolts.h as it breaks many stl fi...
Jim Morris [Sat, 9 Nov 2013 04:00:08 +0000 (20:00 -0800)]
remove the definition of max() from nut_bolts.h as it breaks many stl files which use max from algorithm.
defined max in the few files that actually use it.
Jim Morris [Sat, 9 Nov 2013 03:39:11 +0000 (19:39 -0800)]
Merge pull request #273 from wolfmanjm/feature/add-custom-menu
Allow custom menu entries and commands be setup in config for the panel
Jim Morris [Sat, 9 Nov 2013 03:32:27 +0000 (19:32 -0800)]
Allow custom menu entries and commands be setup in config for the panel
Jim Morris [Thu, 7 Nov 2013 19:52:51 +0000 (11:52 -0800)]
Merge pull request #272 from wolfmanjm/upstreamedge
set led4 to indicate sd card present or not
Jim Morris [Thu, 7 Nov 2013 19:49:49 +0000 (11:49 -0800)]
set led4 to indicate sd card present or not
Jim Morris [Thu, 7 Nov 2013 08:56:23 +0000 (00:56 -0800)]
Merge pull request #271 from wolfmanjm/fix/panel-scrolling
Change the way the panel scrolls with long lists like the file list, now...
Jim Morris [Thu, 7 Nov 2013 08:52:22 +0000 (00:52 -0800)]
Change the way the panel scrolls with long lists like the file list, now it scrolls as expected
Jim Morris [Thu, 7 Nov 2013 07:05:12 +0000 (23:05 -0800)]
Merge pull request #270 from wolfmanjm/upstreamedge
reformat and cleanup panel screen code
Jim Morris [Thu, 7 Nov 2013 06:51:20 +0000 (22:51 -0800)]
reformat and cleanup panel screen code
WARNING lots of whitespace changes!
Conflicts:
src/modules/utils/panel/PanelScreen.h
src/modules/utils/panel/screens/WatchScreen.cpp
src/modules/utils/simpleshell/SimpleShell.cpp
Jim Morris [Thu, 7 Nov 2013 05:05:04 +0000 (21:05 -0800)]
Merge pull request #269 from wolfmanjm/fix/panel-commands
Fix panel issuing commands inidle loop ratherthan main loop
Jim Morris [Thu, 7 Nov 2013 04:56:43 +0000 (20:56 -0800)]
Fix panel issuing commands inidle loop ratherthan main loop
Add z set Z0 command to panel menu
gets leds to flash when in idle and main lopps for diagnostics
Jim Morris [Wed, 6 Nov 2013 23:36:34 +0000 (15:36 -0800)]
Merge pull request #268 from wolfmanjm/feature/add-mviki-panel
Feature/add mviki panel
Jim Morris [Wed, 6 Nov 2013 23:26:36 +0000 (15:26 -0800)]
add reverse display for mini viki st7565
Jim Morris [Wed, 6 Nov 2013 22:33:45 +0000 (14:33 -0800)]
Make wulfnors st7565 configurable from config file, so it also works with the mini viki
Added contrast setting for st7565
Jim Morris [Tue, 5 Nov 2013 01:14:22 +0000 (17:14 -0800)]
Merge pull request #266 from TopherMan/M30
Add M30 -- Delete SD file
Chris George [Tue, 5 Nov 2013 00:59:01 +0000 (19:59 -0500)]
Add M30 -- Delete SD file, using rm_command
Jim Morris [Sat, 2 Nov 2013 22:16:56 +0000 (15:16 -0700)]
Merge pull request #265 from wolfmanjm/feature/delete-file
Add an rm file command to shell
Jim Morris [Sat, 2 Nov 2013 22:13:25 +0000 (15:13 -0700)]
Add an rm file command to shell
refactor simple shell to make it easier to add new commands
Jim Morris [Tue, 29 Oct 2013 08:02:52 +0000 (01:02 -0700)]
Merge pull request #263 from wolfmanjm/upstreamedge
fix long filename play for panel
Jim Morris [Tue, 29 Oct 2013 08:00:42 +0000 (01:00 -0700)]
fix long filename play for panel
Jim Morris [Wed, 23 Oct 2013 22:43:12 +0000 (15:43 -0700)]
Merge pull request #259 from wolfmanjm/fix/one-second-timer-and-disable-emac
Fix the one second timer
Jim Morris [Wed, 23 Oct 2013 22:35:06 +0000 (15:35 -0700)]
Fix the one second timer
Remove unused buffer in main
Disable EMAC in the lpc library
Jim Morris [Mon, 21 Oct 2013 03:30:27 +0000 (20:30 -0700)]
Merge pull request #256 from wolfmanjm/upstreamedge
Upstreamedge
Jim Morris [Mon, 21 Oct 2013 03:28:14 +0000 (20:28 -0700)]
Merge remote-tracking branch 'upstream/edge' into upstreamedge
Jim Morris [Mon, 21 Oct 2013 03:27:03 +0000 (20:27 -0700)]
ignore commented lines in other consumers of on_console_line
Michael Moon [Mon, 21 Oct 2013 02:10:17 +0000 (13:10 +1100)]
Merge branch 'feature/cleanup-clock-init' into edge
Jim Morris [Sat, 19 Oct 2013 23:24:33 +0000 (16:24 -0700)]
Merge pull request #255 from wolfmanjm/upstreamedge
fix a re entrancy bug in panel affecting menu
Jim Morris [Sat, 19 Oct 2013 23:20:45 +0000 (16:20 -0700)]
fix a re entrancy bug in panel affecting menu
Michael Moon [Sat, 19 Oct 2013 22:47:06 +0000 (09:47 +1100)]
reduce N for 100MHz case by removing common factors
Michael Moon [Sat, 19 Oct 2013 22:33:30 +0000 (09:33 +1100)]
typo in figures for 100MHz, thanks to wolfmanjim
Michael Moon [Sat, 19 Oct 2013 08:53:47 +0000 (19:53 +1100)]
run at 100MHz on LPC1768 instead of 96MHz
Michael Moon [Sat, 19 Oct 2013 08:53:11 +0000 (19:53 +1100)]
Rationalise SystemInit() wrt PLL setup and clocking
Jim Morris [Sat, 19 Oct 2013 06:49:53 +0000 (23:49 -0700)]
Merge pull request #253 from wolfmanjm/upstreamedge
Allow auto detection of MCU and set clock speed accordingly
Jim Morris [Sat, 19 Oct 2013 06:39:40 +0000 (23:39 -0700)]
Allow auto detection of MCU and set clock speed accordingly
Logxen [Fri, 18 Oct 2013 23:14:37 +0000 (16:14 -0700)]
Modified usb static header
Jim Morris [Fri, 18 Oct 2013 20:59:23 +0000 (13:59 -0700)]
Merge pull request #252 from wolfmanjm/upstreamedge
revert MSD fix
Jim Morris [Fri, 18 Oct 2013 20:57:38 +0000 (13:57 -0700)]
revert MSD fix
Jim Morris [Tue, 15 Oct 2013 08:24:24 +0000 (01:24 -0700)]
Merge pull request #249 from wolfmanjm/upstreamedge
Fix bug in Extruder where speed was not being initialiezed so extruder w...
Jim Morris [Tue, 15 Oct 2013 08:21:47 +0000 (01:21 -0700)]
Fix bug in Extruder where speed was not being initialiezed so extruder was not finishing at the same time as XYZ, causing stutters and pauses.
Jim Morris [Mon, 14 Oct 2013 20:20:06 +0000 (13:20 -0700)]
Merge pull request #248 from wolfmanjm/upstreamedge
allow config to set the max current and current conversion factor for th...
Jim Morris [Fri, 11 Oct 2013 06:35:00 +0000 (23:35 -0700)]
allow config to set the max current and current conversion factor for the digipot
Logxen [Sat, 12 Oct 2013 11:43:37 +0000 (04:43 -0700)]
Updated windows .inf file to compatible version
Arthur Wolf [Fri, 11 Oct 2013 09:11:13 +0000 (11:11 +0200)]
making mbed pwm pins for laser configurable
Jim Morris [Fri, 11 Oct 2013 05:33:07 +0000 (22:33 -0700)]
Merge pull request #247 from wolfmanjm/upstreamedge
don't create MSD if sdcard is not present
Jim Morris [Fri, 11 Oct 2013 05:30:58 +0000 (22:30 -0700)]
don't create MSD if sdcard is not present
Jim Morris [Tue, 8 Oct 2013 07:24:54 +0000 (00:24 -0700)]
Merge pull request #246 from wolfmanjm/upstreamedge
Fix output of M665 and M666 to be pronterface friendly
Jim Morris [Tue, 8 Oct 2013 07:22:40 +0000 (00:22 -0700)]
Fix output of M665 and M666 to be pronterface friendly
Jim Morris [Mon, 7 Oct 2013 22:56:33 +0000 (15:56 -0700)]
Merge pull request #245 from wolfmanjm/upstreamedge
Add M665 to adjust arm length and arm radius for kossel arm solution
Jim Morris [Mon, 7 Oct 2013 22:50:58 +0000 (15:50 -0700)]
Add M665 to adjust arm length and arm radius for kossel arm solution
Add M666 as replacement for M206
Add M665 Znnn to adjust gamma_max for delta Z
Jim Morris [Thu, 3 Oct 2013 20:41:13 +0000 (13:41 -0700)]
Merge pull request #244 from wolfmanjm/fix/lcd-progress
Fix/lcd progress
Jim Morris [Thu, 3 Oct 2013 20:30:59 +0000 (13:30 -0700)]
fix typo
Jim Morris [Thu, 3 Oct 2013 20:11:06 +0000 (13:11 -0700)]
Show printed sd filename even if started from console