clinton/Smoothieware.git
9 years agoconverted laser pin to union to save ram origin/laser_dac
Logxen [Sun, 12 Oct 2014 19:56:58 +0000 (12:56 -0700)]
converted laser pin to union to save ram

9 years agoremoved extra line of old code
Logxen [Sun, 12 Oct 2014 17:06:31 +0000 (10:06 -0700)]
removed extra line of old code

9 years agoimplemented laser control via built in DAC output and fixed laser to stop firing...
Logxen [Sun, 12 Oct 2014 16:18:27 +0000 (09:18 -0700)]
implemented laser control via built in DAC output and fixed laser to stop firing when a print is aborted

9 years agoMerge pull request #532 from wolfmanjm/upstreamedge
Jim Morris [Fri, 10 Oct 2014 20:12:17 +0000 (13:12 -0700)]
Merge pull request #532 from wolfmanjm/upstreamedge

fix ls

9 years agofix ls
Jim Morris [Fri, 10 Oct 2014 20:11:26 +0000 (13:11 -0700)]
fix ls

9 years agoadd a disablemsd version of firmware.bin
Jim Morris [Thu, 9 Oct 2014 20:14:06 +0000 (13:14 -0700)]
add a disablemsd version of firmware.bin

9 years agoMerge pull request #531 from wolfmanjm/upstreamedge
Jim Morris [Thu, 9 Oct 2014 19:58:42 +0000 (12:58 -0700)]
Merge pull request #531 from wolfmanjm/upstreamedge

add DISABLEMSD to options allowed on make command line

9 years agoadd DISABLEMSD to options allowed on make command line
Jim Morris [Thu, 9 Oct 2014 19:57:24 +0000 (12:57 -0700)]
add DISABLEMSD to options allowed on make command line

9 years agoupdate firmware.bin with dfu disabled
Jim Morris [Thu, 9 Oct 2014 07:03:03 +0000 (00:03 -0700)]
update firmware.bin with dfu disabled

9 years agoMerge pull request #530 from wolfmanjm/feature/disable-dfu-option
Jim Morris [Thu, 9 Oct 2014 07:00:14 +0000 (00:00 -0700)]
Merge pull request #530 from wolfmanjm/feature/disable-dfu-option

Feature/disable dfu option

9 years agoadd dfu_enable to config
Jim Morris [Thu, 9 Oct 2014 06:55:38 +0000 (23:55 -0700)]
add dfu_enable to config

9 years agoallocate secind serial to AHBO
Jim Morris [Thu, 9 Oct 2014 06:40:21 +0000 (23:40 -0700)]
allocate secind serial to AHBO
disable DFU by default

9 years agoMerge branch 'edge' of github.com:Smoothieware/Smoothieware into edge
Jim Morris [Mon, 6 Oct 2014 19:53:00 +0000 (12:53 -0700)]
Merge branch 'edge' of github.com:Smoothieware/Smoothieware into edge

9 years agoadd md5sum for bootloader hex
Jim Morris [Mon, 6 Oct 2014 19:52:34 +0000 (12:52 -0700)]
add md5sum for bootloader hex

9 years agoMerge pull request #529 from wolfmanjm/upstreamedge
Jim Morris [Sun, 5 Oct 2014 22:12:31 +0000 (15:12 -0700)]
Merge pull request #529 from wolfmanjm/upstreamedge

fix M306 as per qharley (with improvements)

9 years agofix M306 as per qharley (with improvements)
Jim Morris [Sun, 5 Oct 2014 22:11:16 +0000 (15:11 -0700)]
fix M306 as per qharley (with improvements)

9 years agoMerge pull request #528 from wolfmanjm/upstreamedge
Jim Morris [Sun, 5 Oct 2014 01:26:58 +0000 (18:26 -0700)]
Merge pull request #528 from wolfmanjm/upstreamedge

add an additional offset to M306 if Z has a value other than 0

9 years agoadd an additional offset to M306 if Z has a value other than 0
Jim Morris [Sun, 5 Oct 2014 01:25:38 +0000 (18:25 -0700)]
add an additional offset to M306 if Z has a value other than 0

9 years agoMerge pull request #527 from wolfmanjm/feature/modify-new_m206-changes
Jim Morris [Sat, 4 Oct 2014 23:10:18 +0000 (16:10 -0700)]
Merge pull request #527 from wolfmanjm/feature/modify-new_m206-changes

Move M206 improvements to M306 and leave M206 as is

9 years agoMove M206 improvements to M306 and leave M206 as is
Jim Morris [Sat, 4 Oct 2014 23:07:27 +0000 (16:07 -0700)]
Move M206 improvements to M306 and leave M206 as is

9 years agoMerge pull request #524 from RepRapMorgan/M206_improvements
Jim Morris [Sat, 4 Oct 2014 22:58:55 +0000 (15:58 -0700)]
Merge pull request #524 from RepRapMorgan/M206_improvements

Added automatic end-stop offset calbration to M206:

9 years agoMerge pull request #525 from RepRapMorgan/scara_updates
Jim Morris [Sat, 4 Oct 2014 21:01:32 +0000 (14:01 -0700)]
Merge pull request #525 from RepRapMorgan/scara_updates

Repairs issues surrounding homing for scara systems

9 years agoRepairs issues surrounding homing for scara systems
Quentin Harley [Sat, 4 Oct 2014 10:51:46 +0000 (12:51 +0200)]
Repairs issues surrounding homing for scara systems
Scara systems are not deltas, and just specifying delta homing will cause
issues in other mudules, such as zprobe

9 years agoAdded automatic end-stop offset calbration to M206:
Quentin Harley [Sat, 4 Oct 2014 10:38:44 +0000 (12:38 +0200)]
Added automatic end-stop offset calbration to M206:

M206 P X Y Z
When P is available in the line, every named axis will be assumed to be zero,
and the calculated offset inserted into memory.

9 years agoMerge pull request #523 from wolfmanjm/feature/add-size-to-ls
Jim Morris [Sat, 4 Oct 2014 04:39:19 +0000 (21:39 -0700)]
Merge pull request #523 from wolfmanjm/feature/add-size-to-ls

add -s to ls comamnd to print the file size

9 years agoadd -s to ls comamnd to print the file size
Jim Morris [Sat, 4 Oct 2014 04:35:55 +0000 (21:35 -0700)]
add -s to ls comamnd to print the file size
added d_fsize to the dirent in mbed library to get fsize

9 years agoupdate the sample thermistor sample to point to wiki
Jim Morris [Sat, 4 Oct 2014 03:29:45 +0000 (20:29 -0700)]
update the sample thermistor sample to point to wiki
add example beta setting

9 years agou[date firmware.bin
Jim Morris [Fri, 3 Oct 2014 07:46:35 +0000 (00:46 -0700)]
u[date firmware.bin

9 years agoMerge pull request #521 from wolfmanjm/fix/issue-520
Jim Morris [Fri, 3 Oct 2014 07:37:43 +0000 (00:37 -0700)]
Merge pull request #521 from wolfmanjm/fix/issue-520

Fix/issue 520

9 years agoremove FIXME comment
Jim Morris [Fri, 3 Oct 2014 07:35:32 +0000 (00:35 -0700)]
remove FIXME comment

9 years agoImplement a workaround to the bug reported in issues #520
Jim Morris [Fri, 3 Oct 2014 07:32:16 +0000 (00:32 -0700)]
Implement a workaround to the bug reported in issues #520
where an absolute  move inbetween a G10 and G11 with zlift returns to the wrong Z

9 years agoupdate config sample
Jim Morris [Fri, 3 Oct 2014 05:42:37 +0000 (22:42 -0700)]
update config sample

9 years agoupdate firmware.bin
Jim Morris [Thu, 2 Oct 2014 22:30:11 +0000 (15:30 -0700)]
update firmware.bin

9 years agoMerge pull request #519 from wolfmanjm/upstreamedge
Jim Morris [Tue, 30 Sep 2014 22:12:17 +0000 (15:12 -0700)]
Merge pull request #519 from wolfmanjm/upstreamedge

fix race when external card is already inserted

9 years agofix race when external card is already inserted
Jim Morris [Tue, 30 Sep 2014 22:11:21 +0000 (15:11 -0700)]
fix race when external card is already inserted

9 years agoMerge branch 'edge' of https://github.com/Smoothieware/Smoothieware into edge
Arthur Wolf [Tue, 30 Sep 2014 12:21:35 +0000 (14:21 +0200)]
Merge branch 'edge' of https://github.com/Smoothieware/Smoothieware into edge

9 years agoadd CORS support for web interfaces
Arthur Wolf [Tue, 30 Sep 2014 12:20:57 +0000 (14:20 +0200)]
add CORS support for web interfaces

9 years agoMerge pull request #518 from wolfmanjm/add/external-sdcard
Jim Morris [Tue, 30 Sep 2014 05:17:18 +0000 (22:17 -0700)]
Merge pull request #518 from wolfmanjm/add/external-sdcard

Add/external sdcard

9 years agoMerge pull request #517 from wolfmanjm/add/viki2
Jim Morris [Tue, 30 Sep 2014 05:11:49 +0000 (22:11 -0700)]
Merge pull request #517 from wolfmanjm/add/viki2

Add/viki2

9 years agoupdate pins for viki2 on an azteeg X5 mini V2
Jim Morris [Tue, 30 Sep 2014 05:07:14 +0000 (22:07 -0700)]
update pins for viki2 on an azteeg X5 mini V2

9 years agofix white space changes
Jim Morris [Mon, 29 Sep 2014 00:29:03 +0000 (17:29 -0700)]
fix white space changes

9 years agofix a bug in readdir that casued stack overrun (fixed in upstream mbed already)
Jim Morris [Sun, 28 Sep 2014 23:28:28 +0000 (16:28 -0700)]
fix a bug in readdir that casued stack overrun (fixed in upstream mbed already)
move extern sdcard detect to panel
allow configure of where extern sdcard is plugged in
when extern sdcard is inserted jump to that directory in play screen
switch SDCard to use mbed::SPI as it remembers the frequency to use for each device

9 years agofix opendir bug for multiple FAT volumes
Jim Morris [Sun, 28 Sep 2014 08:12:17 +0000 (01:12 -0700)]
fix opendir bug for multiple FAT volumes
Add sd card insertion detection and mount exernal sd

9 years agospecify variant in ctor
Jim Morris [Sat, 27 Sep 2014 08:36:23 +0000 (01:36 -0700)]
specify variant in ctor
add mini_viki2 as it needs different contrast and encoder resolution

9 years agoadd a LED_HOT that gets set if the temp of hotend or bed is > 50C
Jim Morris [Sat, 27 Sep 2014 05:35:31 +0000 (22:35 -0700)]
add a LED_HOT that gets set if the temp of hotend or bed is > 50C
viki2 set red led if hot blue led if not

9 years agoadd buzz and red/blue leds for viki2 panel
Jim Morris [Fri, 26 Sep 2014 22:36:20 +0000 (15:36 -0700)]
add buzz and red/blue leds for viki2 panel
add example coinfig for viki2

9 years agoadd viki2 and miniviki2 panels
Jim Morris [Fri, 26 Sep 2014 21:30:53 +0000 (14:30 -0700)]
add viki2 and miniviki2 panels
allow configure menu items to be set as the encoder turns (be careful with use)
add set lcd contrast to Configure menu (needs to be set permanently in config)

9 years agoonly use 5th line in zprobe status if screen has more than 4 lines
Jim Morris [Wed, 24 Sep 2014 05:58:38 +0000 (22:58 -0700)]
only use 5th line in zprobe status if screen has more than 4 lines

9 years agoMerge pull request #516 from wolfmanjm/upstreamedge
Jim Morris [Wed, 24 Sep 2014 05:47:06 +0000 (22:47 -0700)]
Merge pull request #516 from wolfmanjm/upstreamedge

cap zprobe retract rate to zprobe fast feedrate

9 years agocap zprobe retract rate to zprobe fast feedrate
Jim Morris [Tue, 23 Sep 2014 21:17:51 +0000 (14:17 -0700)]
cap zprobe retract rate to zprobe fast feedrate

9 years agoupdate firmware.bin
Jim Morris [Wed, 17 Sep 2014 07:11:48 +0000 (00:11 -0700)]
update firmware.bin

9 years agoMerge pull request #514 from wolfmanjm/upstreamedge
Jim Morris [Tue, 16 Sep 2014 23:48:36 +0000 (16:48 -0700)]
Merge pull request #514 from wolfmanjm/upstreamedge

Force top level files to be directories

9 years agoForce top level files to be directories
Jim Morris [Tue, 16 Sep 2014 23:47:28 +0000 (16:47 -0700)]
Force top level files to be directories

9 years agoupdate firmware.bin
Jim Morris [Tue, 16 Sep 2014 10:21:16 +0000 (03:21 -0700)]
update firmware.bin

9 years agoMerge pull request #513 from Smoothieware/update/gcc4.8
Jim Morris [Tue, 16 Sep 2014 03:08:42 +0000 (20:08 -0700)]
Merge pull request #513 from Smoothieware/update/gcc4.8

Update/gcc4.8

9 years agoMerge remote-tracking branch 'upstream/edge' into update/gcc4.8
Jim Morris [Mon, 15 Sep 2014 23:08:20 +0000 (16:08 -0700)]
Merge remote-tracking branch 'upstream/edge' into update/gcc4.8

9 years agoMerge pull request #512 from wolfmanjm/upstreamedge
Jim Morris [Mon, 15 Sep 2014 23:07:58 +0000 (16:07 -0700)]
Merge pull request #512 from wolfmanjm/upstreamedge

add crnl to end of M503 to flush in some cases

9 years agoMerge branch 'upstreamedge' into update/gcc4.8
Jim Morris [Mon, 15 Sep 2014 23:06:38 +0000 (16:06 -0700)]
Merge branch 'upstreamedge' into update/gcc4.8

9 years agoadd crnl to end of M503 to flush in some cases
Jim Morris [Mon, 15 Sep 2014 23:05:18 +0000 (16:05 -0700)]
add crnl to end of M503 to flush in some cases
use puts in usbserial to output the banner

9 years agoadd / to directories displayed with ls
Jim Morris [Sun, 14 Sep 2014 23:42:44 +0000 (16:42 -0700)]
add / to directories displayed with ls
update firmware.bin

9 years agoAdd directory indicator to mbed dirent
Jim Morris [Sun, 14 Sep 2014 23:30:01 +0000 (16:30 -0700)]
Add directory indicator to mbed dirent
append / to directories in panel
speed up directory listing in panel

9 years agofix strange bug that happens with new compiler
Jim Morris [Sun, 14 Sep 2014 22:46:26 +0000 (15:46 -0700)]
fix strange bug that happens with new compiler

9 years agoupdate firmware.bin to binary built with new compiler
Jim Morris [Sun, 14 Sep 2014 07:31:34 +0000 (00:31 -0700)]
update firmware.bin to binary built with new compiler

9 years agoadamgr fix to win_install.cmd
Jim Morris [Sun, 14 Sep 2014 07:29:16 +0000 (00:29 -0700)]
adamgr fix to win_install.cmd

9 years agoMerge remote-tracking branch 'upstream/edge' into update/gcc4.8
Jim Morris [Sun, 14 Sep 2014 07:15:58 +0000 (00:15 -0700)]
Merge remote-tracking branch 'upstream/edge' into update/gcc4.8

9 years agoMerge pull request #509 from wolfmanjm/upstreamedge
Jim Morris [Sun, 14 Sep 2014 07:08:27 +0000 (00:08 -0700)]
Merge pull request #509 from wolfmanjm/upstreamedge

fix panel directory navigation

9 years agofix panel directory navigation
Jim Morris [Sun, 14 Sep 2014 07:06:28 +0000 (00:06 -0700)]
fix panel directory navigation

9 years agoUpdate to GCC4.8
Jim Morris [Sun, 14 Sep 2014 06:03:54 +0000 (23:03 -0700)]
Update to GCC4.8

9 years agoMerge pull request #508 from wolfmanjm/fix/allow-space-in-filename-filter-panel-files
Jim Morris [Sat, 13 Sep 2014 08:15:40 +0000 (01:15 -0700)]
Merge pull request #508 from wolfmanjm/fix/allow-space-in-filename-filter-panel-files

Fix/allow space in filename filter panel files

9 years agofix path bugs
Jim Morris [Sat, 13 Sep 2014 08:05:00 +0000 (01:05 -0700)]
fix path bugs

9 years agorefactor lc
Jim Morris [Sat, 13 Sep 2014 07:11:30 +0000 (00:11 -0700)]
refactor lc

9 years agofilter panel filenames that have .g in them
Jim Morris [Sat, 13 Sep 2014 06:41:48 +0000 (23:41 -0700)]
filter panel filenames that have .g in them
allow spaces in filenames in play command and from panel

9 years agoMerge pull request #506 from wolfmanjm/refactor/laser-to-be-code-compliant
Jim Morris [Tue, 9 Sep 2014 21:57:05 +0000 (14:57 -0700)]
Merge pull request #506 from wolfmanjm/refactor/laser-to-be-code-compliant

refactor laser module to follow coding guidelines as it is meant to be a...

9 years agorefactor laser module to follow coding guidelines as it is meant to be an example
Jim Morris [Tue, 9 Sep 2014 21:55:37 +0000 (14:55 -0700)]
refactor laser module to follow coding guidelines as it is meant to be an example

9 years agoupdate firmware.bin
Jim Morris [Sun, 7 Sep 2014 06:59:06 +0000 (23:59 -0700)]
update firmware.bin

9 years agoMerge pull request #487 from wolfmanjm/add/probe-screen
Jim Morris [Sat, 6 Sep 2014 07:39:34 +0000 (00:39 -0700)]
Merge pull request #487 from wolfmanjm/add/probe-screen

Add a probe screen to panel

9 years agoHave panels probe status refresh while selected
Jim Morris [Fri, 5 Sep 2014 22:39:39 +0000 (15:39 -0700)]
Have panels probe status refresh while selected

9 years agoMerge remote-tracking branch 'upstream/edge' into add/probe-screen
Jim Morris [Fri, 5 Sep 2014 22:07:34 +0000 (15:07 -0700)]
Merge remote-tracking branch 'upstream/edge' into add/probe-screen

9 years agoMerge pull request #505 from wolfmanjm/update/adjustZfnc-compensationTransform
Jim Morris [Tue, 2 Sep 2014 22:39:23 +0000 (15:39 -0700)]
Merge pull request #505 from wolfmanjm/update/adjustZfnc-compensationTransform

change bed compensation to allow a transform of XYZ not just a Zoffset

9 years agodo not hardcode maximum Zprobe distance use gamma_max*2
Jim Morris [Tue, 2 Sep 2014 21:42:01 +0000 (14:42 -0700)]
do not hardcode maximum Zprobe distance use gamma_max*2

9 years agochange bed compensation to allow a transform of XYZ not just a Zoffset
Jim Morris [Tue, 2 Sep 2014 20:17:34 +0000 (13:17 -0700)]
change bed compensation to allow a transform of XYZ not just a Zoffset
calculate distance travelled as 3D vector of compensated target

9 years agoMerge pull request #504 from RepRapMorgan/SCARAlimits
Jim Morris [Sat, 30 Aug 2014 20:25:40 +0000 (13:25 -0700)]
Merge pull request #504 from RepRapMorgan/SCARAlimits

Prevent undefined moves - C2 limits

9 years agoPrevent undefined moves - C2 limits
Quentin Harley [Sat, 30 Aug 2014 20:11:35 +0000 (22:11 +0200)]
Prevent undefined moves - C2 limits

9 years agoupdate firmware.bin
Jim Morris [Sat, 30 Aug 2014 13:49:32 +0000 (06:49 -0700)]
update firmware.bin

9 years agoMerge pull request #503 from wolfmanjm/upstreamedge
Jim Morris [Sat, 30 Aug 2014 06:40:29 +0000 (23:40 -0700)]
Merge pull request #503 from wolfmanjm/upstreamedge

make M119 return a lowercase string to keep pronterface happy

9 years agomake M119 return a lowercase string to keep pronterface happy
Jim Morris [Sat, 30 Aug 2014 06:39:36 +0000 (23:39 -0700)]
make M119 return a lowercase string to keep pronterface happy

9 years agoMerge pull request #502 from hogthrob/edge
Jim Morris [Fri, 29 Aug 2014 06:29:22 +0000 (23:29 -0700)]
Merge pull request #502 from hogthrob/edge

SDCard: Initial support for refreshing file list / exchange of SDCard

9 years agoFixed tab vs. space
hogthrob [Fri, 29 Aug 2014 06:11:01 +0000 (08:11 +0200)]
Fixed tab vs. space

9 years agoFixed tab vs. space
hogthrob [Fri, 29 Aug 2014 05:36:42 +0000 (07:36 +0200)]
Fixed tab vs. space

9 years agoFixed tab vs. space
hogthrob [Fri, 29 Aug 2014 05:34:48 +0000 (07:34 +0200)]
Fixed tab vs. space

9 years agoAdded M21 code to use remount
hogthrob [Fri, 29 Aug 2014 05:31:22 +0000 (07:31 +0200)]
Added M21 code to use remount

9 years agoFixed indentation
hogthrob [Thu, 28 Aug 2014 20:28:38 +0000 (22:28 +0200)]
Fixed indentation

9 years agoSynced changes
hogthrob [Thu, 28 Aug 2014 20:25:59 +0000 (22:25 +0200)]
Synced changes

9 years agoMerge remote-tracking branch 'upstream/edge' into edge
hogthrob [Thu, 28 Aug 2014 20:25:51 +0000 (22:25 +0200)]
Merge remote-tracking branch 'upstream/edge' into edge

9 years agoMerge pull request #501 from Smoothieware/update/tempcontrolswitch
Jim Morris [Thu, 28 Aug 2014 05:17:13 +0000 (22:17 -0700)]
Merge pull request #501 from Smoothieware/update/tempcontrolswitch

Update/tempcontrolswitch

9 years agooptimize readonly
Jim Morris [Thu, 28 Aug 2014 05:12:29 +0000 (22:12 -0700)]
optimize readonly
update configs

9 years agosome comments
Jim Morris [Wed, 27 Aug 2014 06:14:23 +0000 (23:14 -0700)]
some comments

9 years agorename the temperature switch config entrythat specifies the switch to use, this...
Jim Morris [Wed, 27 Aug 2014 05:32:54 +0000 (22:32 -0700)]
rename the temperature switch config entrythat specifies the switch to use, this avoids the confusion
it is backwards comptible

9 years agoallow readonly temperatire sensors, set by output pin set to nc
Jim Morris [Wed, 27 Aug 2014 05:05:56 +0000 (22:05 -0700)]
allow readonly temperatire sensors, set by output pin set to nc

9 years agoallow different emperature switch instances controlling different switches and readin...
Jim Morris [Wed, 27 Aug 2014 04:45:48 +0000 (21:45 -0700)]
allow different emperature switch instances controlling different switches and reading different temperatures