clinton/Smoothieware.git
10 years agoconvert playing counts to unsigne dlong
Jim Morris [Thu, 3 Oct 2013 19:52:21 +0000 (12:52 -0700)]
convert playing counts to unsigne dlong

10 years agoMerge pull request #234 from TopherMan/feature/M26
Jim Morris [Thu, 3 Oct 2013 19:50:41 +0000 (12:50 -0700)]
Merge pull request #234 from TopherMan/feature/M26

Feature/m26

10 years agoadd comments to M204
Jim Morris [Mon, 30 Sep 2013 00:12:56 +0000 (17:12 -0700)]
add comments to M204

10 years agoMerge pull request #242 from wolfmanjm/upstreamedge
Jim Morris [Sun, 29 Sep 2013 21:46:33 +0000 (14:46 -0700)]
Merge pull request #242 from wolfmanjm/upstreamedge

Upstreamedge

10 years agodisable M204- change acceleration for now as it needs to be put in the block queue...
Jim Morris [Sun, 29 Sep 2013 21:44:05 +0000 (14:44 -0700)]
disable M204- change acceleration for now as it needs to be put in the block queue and slic3r abuses it.

10 years agoMerge pull request #240 from wolfmanjm/upstreamedge
Jim Morris [Tue, 24 Sep 2013 06:35:40 +0000 (23:35 -0700)]
Merge pull request #240 from wolfmanjm/upstreamedge

Upstreamedge

10 years agoadd M117 to add an arbitrary LCD message
Jim Morris [Tue, 24 Sep 2013 06:32:49 +0000 (23:32 -0700)]
add M117 to add an arbitrary LCD message

10 years agoMerge pull request #238 from wolfmanjm/upstreamedge
Jim Morris [Sun, 22 Sep 2013 23:19:00 +0000 (16:19 -0700)]
Merge pull request #238 from wolfmanjm/upstreamedge

Upstreamedge

10 years agoAdded Adams Heapwalk to determine amount of unallocated malloc memory
Jim Morris [Sun, 22 Sep 2013 23:13:50 +0000 (16:13 -0700)]
Added Adams Heapwalk to determine amount of unallocated malloc memory

Conflicts:

src/modules/utils/simpleshell/SimpleShell.cpp

10 years agoMerge pull request #237 from wolfmanjm/upstreamedge
Jim Morris [Sun, 22 Sep 2013 21:50:50 +0000 (14:50 -0700)]
Merge pull request #237 from wolfmanjm/upstreamedge

Clear config cache just before main loop starts

10 years agoClear the config cache just before the main loop starts, after all setup is done
Jim Morris [Sun, 22 Sep 2013 21:48:08 +0000 (14:48 -0700)]
Clear the config cache just before the main loop starts, after all setup is done

10 years agoMerge pull request #236 from wolfmanjm/upstreamedge
Jim Morris [Sun, 22 Sep 2013 21:00:35 +0000 (14:00 -0700)]
Merge pull request #236 from wolfmanjm/upstreamedge

Upstreamedge

10 years agoadd mem command to see free ram
Jim Morris [Sun, 22 Sep 2013 20:50:36 +0000 (13:50 -0700)]
add mem command to see free ram

Conflicts:

src/modules/utils/simpleshell/SimpleShell.cpp

10 years agoMerge pull request #235 from TopherMan/feature/extruder_disable
Jim Morris [Sun, 22 Sep 2013 20:20:13 +0000 (13:20 -0700)]
Merge pull request #235 from TopherMan/feature/extruder_disable

Feature/extruder disable

10 years agoM18 and M84 now accept E to disable only the extruder, not the steppers.
Chris George [Sun, 22 Sep 2013 20:01:20 +0000 (16:01 -0400)]
M18 and M84 now accept E to disable only the extruder, not the steppers.

10 years agoMade M17 and M18 apply to extruder as well as steppers.
Chris George [Sun, 22 Sep 2013 19:49:49 +0000 (15:49 -0400)]
Made M17 and M18 apply to extruder as well as steppers.

10 years agoPut gcodes in Player.cpp in the right order.
Chris George [Thu, 19 Sep 2013 00:00:29 +0000 (20:00 -0400)]
Put gcodes in Player.cpp in the right order.

10 years agoAdded M26 to abort print and then reload file.
Chris George [Wed, 18 Sep 2013 23:21:54 +0000 (19:21 -0400)]
Added M26 to abort print and then reload file.

10 years agoMake filename a private variable.
Chris George [Wed, 18 Sep 2013 21:01:22 +0000 (17:01 -0400)]
Make filename a private variable.

10 years agoMerge pull request #232 from wuflnor/edge
Jim Morris [Wed, 18 Sep 2013 00:10:31 +0000 (17:10 -0700)]
Merge pull request #232 from wuflnor/edge

add st7565 support

10 years agofix glyph display
wuflnor [Wed, 18 Sep 2013 00:08:20 +0000 (02:08 +0200)]
fix glyph display

10 years agoadd selection of st7565
wuflnor [Tue, 17 Sep 2013 23:55:35 +0000 (01:55 +0200)]
add selection of st7565

10 years agoadd st7565 support
wuflnor [Tue, 17 Sep 2013 23:33:46 +0000 (01:33 +0200)]
add st7565 support

10 years agoMerge pull request #231 from TopherMan/fix/M23
Jim Morris [Tue, 17 Sep 2013 03:31:41 +0000 (20:31 -0700)]
Merge pull request #231 from TopherMan/fix/M23

Fix/m23

10 years agoAdded dummy M21 so OctoPrint will play nice.
Chris George [Tue, 17 Sep 2013 03:09:46 +0000 (23:09 -0400)]
Added dummy M21 so OctoPrint will play nice.

10 years agoAdjust M23/M24 so that size is calculated and reported correctly.
Chris George [Tue, 17 Sep 2013 01:18:54 +0000 (21:18 -0400)]
Adjust M23/M24 so that size is calculated and reported correctly.

10 years agoMerge pull request #230 from TopherMan/feature/M27more
Jim Morris [Fri, 13 Sep 2013 19:30:15 +0000 (12:30 -0700)]
Merge pull request #230 from TopherMan/feature/M27more

Feature/m27more

10 years agoRookie mistake. Forgot carriage return/newline.
Chris George [Fri, 13 Sep 2013 19:19:13 +0000 (15:19 -0400)]
Rookie mistake. Forgot carriage return/newline.

10 years agoAdded -b switch to progress to report bytes, and made M27 use this switch. Makes...
Chris George [Fri, 13 Sep 2013 18:00:17 +0000 (14:00 -0400)]
Added -b switch to progress to report bytes, and made M27 use this switch. Makes M27 compatible with Marlin and the rest.

10 years agoMerge pull request #229 from wolfmanjm/upstreamedge
Jim Morris [Fri, 13 Sep 2013 06:41:10 +0000 (23:41 -0700)]
Merge pull request #229 from wolfmanjm/upstreamedge

Upstreamedge

10 years agoFix speed changing via panel, just donlt swicth away from watch screen until the...
Jim Morris [Fri, 13 Sep 2013 06:32:58 +0000 (23:32 -0700)]
Fix speed changing via panel, just donlt swicth away from watch screen until the gcode has executed

Conflicts:

src/modules/utils/panel/screens/WatchScreen.cpp

10 years agoMerge pull request #228 from TopherMan/feature/M27
Jim Morris [Thu, 12 Sep 2013 20:22:38 +0000 (13:22 -0700)]
Merge pull request #228 from TopherMan/feature/M27

Feature/m27

10 years agoAdded M27. Identical to progress.
Chris George [Thu, 12 Sep 2013 20:07:37 +0000 (16:07 -0400)]
Added M27. Identical to progress.

10 years agoMerge pull request #227 from wolfmanjm/upstreamedge
Jim Morris [Thu, 12 Sep 2013 19:53:12 +0000 (12:53 -0700)]
Merge pull request #227 from wolfmanjm/upstreamedge

Upstreamedge

10 years agofix potential rounding issues wth COREXY arm solution
Jim Morris [Thu, 12 Sep 2013 19:50:16 +0000 (12:50 -0700)]
fix potential rounding issues wth COREXY arm solution

10 years agoMerge pull request #226 from wolfmanjm/add/m-commands-for-sd
Jim Morris [Thu, 12 Sep 2013 07:47:59 +0000 (00:47 -0700)]
Merge pull request #226 from wolfmanjm/add/m-commands-for-sd

Add/m commands for sd

10 years agoAdded M23, M24, M25, M32 and M20 which allow pronterface to play SD files.
Jim Morris [Thu, 12 Sep 2013 07:43:36 +0000 (00:43 -0700)]
Added M23, M24, M25, M32 and M20 which allow pronterface to play SD files.

10 years agoMerge pull request #224 from wolfmanjm/upstreamedge
Jim Morris [Sun, 1 Sep 2013 20:28:15 +0000 (13:28 -0700)]
Merge pull request #224 from wolfmanjm/upstreamedge

Upstreamedge

10 years agoAdd delta_homing config to forace all towers to home regardless
Jim Morris [Sun, 1 Sep 2013 00:36:38 +0000 (17:36 -0700)]
Add delta_homing config to forace all towers to home regardless
Add an example kossel config

10 years agoMerge pull request #223 from wolfmanjm/upstreamedge
Jim Morris [Fri, 30 Aug 2013 22:41:12 +0000 (15:41 -0700)]
Merge pull request #223 from wolfmanjm/upstreamedge

Upstreamedge

10 years agotruncate characters that woudl wrap on glcd
Jim Morris [Fri, 30 Aug 2013 22:38:44 +0000 (15:38 -0700)]
truncate characters that woudl wrap on glcd

10 years agoMerge pull request #222 from wolfmanjm/upstreamedge
Jim Morris [Thu, 29 Aug 2013 08:04:01 +0000 (01:04 -0700)]
Merge pull request #222 from wolfmanjm/upstreamedge

Upstreamedge

10 years agoMake M303 parameters auto pid tune compliant with other firmwares
Jim Morris [Thu, 29 Aug 2013 08:01:03 +0000 (01:01 -0700)]
Make M303 parameters auto pid tune compliant with other firmwares

10 years agoMerge pull request #221 from wolfmanjm/upstreamedge
Jim Morris [Wed, 28 Aug 2013 03:59:39 +0000 (20:59 -0700)]
Merge pull request #221 from wolfmanjm/upstreamedge

Upstreamedge

10 years agoadd example pid control settings
Jim Morris [Wed, 28 Aug 2013 03:57:51 +0000 (20:57 -0700)]
add example pid control settings

10 years agoMerge pull request #219 from wolfmanjm/fix/pid2
Jim Morris [Tue, 27 Aug 2013 10:34:11 +0000 (03:34 -0700)]
Merge pull request #219 from wolfmanjm/fix/pid2

Fix/pid2

10 years agoAllow auto pid to use full power
Jim Morris [Tue, 27 Aug 2013 09:55:45 +0000 (02:55 -0700)]
Allow auto pid to use full power

10 years agoMake PID work like arduino pid library and more like Marlin
Jim Morris [Tue, 27 Aug 2013 07:43:22 +0000 (00:43 -0700)]
Make PID work like arduino pid library and more like Marlin
Fix Clear watch screen on glcd

10 years agoFix mbed build on Windows machines with Cygwin
Adam Green [Sun, 18 Aug 2013 19:39:47 +0000 (12:39 -0700)]
Fix mbed build on Windows machines with Cygwin

I had fixed this awhile ago in the core gcc4mbed makefiles but it
somehow got missed in the makefile used specifically for building the
mbed SDK library in Smoothie.  This fix makes sure that GNU make uses
the Windows Command Prompt instead of the Cygwin bash shell.  Without
this change, you could see errors like:
    /usr/bin/sh: copy: command not found
when building on a Windows machine.

10 years agoMerge pull request #216 from wolfmanjm/fix/pid
Jim Morris [Tue, 13 Aug 2013 08:39:11 +0000 (01:39 -0700)]
Merge pull request #216 from wolfmanjm/fix/pid

Fix/pid

10 years agoSetting the I and D values needs to be scaled by the sample time.
Jim Morris [Tue, 13 Aug 2013 06:04:09 +0000 (23:04 -0700)]
Setting the I and D values needs to be scaled by the sample time.
Whenever I and D are set they are now scaled appropriately

10 years agomake pwm frequency configurable in temperaturecontrol ( allows for SSR heated beds )
Arthur Wolf [Fri, 9 Aug 2013 15:33:39 +0000 (17:33 +0200)]
make pwm frequency configurable in temperaturecontrol ( allows for SSR heated beds )

10 years agoMerge pull request #215 from wolfmanjm/upstreamedge
Jim Morris [Thu, 8 Aug 2013 07:50:50 +0000 (00:50 -0700)]
Merge pull request #215 from wolfmanjm/upstreamedge

Upstreamedge

10 years agomake minimum M220 speed 10% otherwise wierd things happen
Jim Morris [Thu, 8 Aug 2013 07:47:36 +0000 (00:47 -0700)]
make minimum M220 speed 10% otherwise wierd things happen
make module destructor virtual so modules can be deleted without warning
clean up touchprobe if not enabled to save some RAM

10 years agoMerge pull request #214 from wolfmanjm/upstreamedge
Jim Morris [Wed, 7 Aug 2013 11:58:48 +0000 (04:58 -0700)]
Merge pull request #214 from wolfmanjm/upstreamedge

Use ahbmalloc() to dynamically allocate usb ram for the frame buffer

10 years agoUse ahbmalloc() to dynamically allocate usb ram for the frame buffer
Jim Morris [Wed, 7 Aug 2013 11:55:30 +0000 (04:55 -0700)]
Use ahbmalloc() to dynamically allocate usb ram for the frame buffer

10 years agoMerge pull request #213 from wolfmanjm/upstreamedge
Jim Morris [Wed, 7 Aug 2013 11:31:03 +0000 (04:31 -0700)]
Merge pull request #213 from wolfmanjm/upstreamedge

Upstreamedge

10 years agotemporarily ifdef out the ethernet stuff
Jim Morris [Wed, 7 Aug 2013 11:28:04 +0000 (04:28 -0700)]
temporarily ifdef out the ethernet stuff
use ETH_RAM for the glcd frame buffer

10 years agoMerge pull request #212 from wolfmanjm/fix/glcd-frambuffer
Jim Morris [Wed, 7 Aug 2013 09:00:35 +0000 (02:00 -0700)]
Merge pull request #212 from wolfmanjm/fix/glcd-frambuffer

Fix/glcd frambuffer

10 years agomove glcd framebuffer into USB RAM as there is not enough free ram otherwise
Jim Morris [Wed, 7 Aug 2013 08:56:34 +0000 (01:56 -0700)]
move glcd framebuffer into USB RAM as there is not enough free ram otherwise

10 years agoUpdate ReprapDiscountGLCD.cpp
Jim Morris [Wed, 7 Aug 2013 08:05:12 +0000 (01:05 -0700)]
Update ReprapDiscountGLCD.cpp

10 years agoMerge pull request #211 from wolfmanjm/upstreamedge
Jim Morris [Wed, 7 Aug 2013 06:39:52 +0000 (23:39 -0700)]
Merge pull request #211 from wolfmanjm/upstreamedge

Upstreamedge

10 years agochange config trim values sign to match that set in M206
Jim Morris [Wed, 7 Aug 2013 06:38:14 +0000 (23:38 -0700)]
change config trim values sign to match that set in M206

10 years agoMerge pull request #210 from wolfmanjm/feature/hbot-homing
Jim Morris [Tue, 6 Aug 2013 23:19:51 +0000 (16:19 -0700)]
Merge pull request #210 from wolfmanjm/feature/hbot-homing

Feature/hbot homing

10 years agoremove last debug printf from homing
Jim Morris [Tue, 6 Aug 2013 22:53:13 +0000 (15:53 -0700)]
remove last debug printf from homing

10 years agocheck both corexy motors for stop
Jim Morris [Tue, 6 Aug 2013 11:40:20 +0000 (04:40 -0700)]
check both corexy motors for stop

10 years agoturn off both motors when endstop is hit for corexy
Jim Morris [Tue, 6 Aug 2013 11:36:53 +0000 (04:36 -0700)]
turn off both motors when endstop is hit for corexy

10 years agoudate delta config for homing
Jim Morris [Tue, 6 Aug 2013 10:32:46 +0000 (03:32 -0700)]
udate delta config for homing

10 years agoadd corexy_homing to sample config
Jim Morris [Tue, 6 Aug 2013 10:28:51 +0000 (03:28 -0700)]
add corexy_homing to sample config

10 years agoConvert the endstop/homing configs to mm and mm/sec
Jim Morris [Tue, 6 Aug 2013 10:25:30 +0000 (03:25 -0700)]
Convert the endstop/homing configs to mm and mm/sec
update sample configs
Old config values in steps and steps/sec will still be accepted

10 years agoadded hbot/corexy homing
Jim Morris [Tue, 6 Aug 2013 08:11:27 +0000 (01:11 -0700)]
added hbot/corexy homing

10 years agoOnly show endstops that are used (either min or max)
Jim Morris [Tue, 6 Aug 2013 06:23:51 +0000 (23:23 -0700)]
Only show endstops that are used (either min or max)
Negate trim depending on homing direction so + trim homes away from home

10 years agoAllow trim values to be negative to trim up
Jim Morris [Tue, 6 Aug 2013 05:39:19 +0000 (22:39 -0700)]
Allow trim values to be negative to trim up
Fix home_direction to be bool in all cases, lucky it worked using it as int
Add M206 to adjust trim values (in mm) on the fly

10 years agoIncrease glcd refresh rate to 10Hz
Jim Morris [Tue, 6 Aug 2013 03:42:29 +0000 (20:42 -0700)]
Increase glcd refresh rate to 10Hz

10 years agoMerge pull request #209 from wolfmanjm/upstreamedge
Jim Morris [Sun, 4 Aug 2013 03:50:08 +0000 (20:50 -0700)]
Merge pull request #209 from wolfmanjm/upstreamedge

Upstreamedge

10 years agomake bitmap const so it goes into flash
Jim Morris [Sun, 4 Aug 2013 03:48:47 +0000 (20:48 -0700)]
make bitmap const so it goes into flash

10 years agoMerge pull request #208 from wolfmanjm/optimize/glcd-bitmaps
Jim Morris [Sun, 4 Aug 2013 03:43:29 +0000 (20:43 -0700)]
Merge pull request #208 from wolfmanjm/optimize/glcd-bitmaps

add open hardware logo on startup screen for glcd

10 years agoadd open hardware logo on startup screen for glcd
Jim Morris [Sun, 4 Aug 2013 00:44:02 +0000 (17:44 -0700)]
add open hardware logo on startup screen for glcd
optimize bitblt operation for bitmaps

10 years agoMerge pull request #207 from wolfmanjm/optimize/glcd-fonts
Jim Morris [Sat, 3 Aug 2013 07:18:15 +0000 (00:18 -0700)]
Merge pull request #207 from wolfmanjm/optimize/glcd-fonts

Optimize/glcd fonts

10 years agoOptimize graphic font rendering for glc, using x aligned font table
Jim Morris [Sat, 3 Aug 2013 07:14:12 +0000 (00:14 -0700)]
Optimize graphic font rendering for glc, using x aligned font table

10 years agoadded kill/pause button config for panels
Jim Morris [Fri, 2 Aug 2013 22:27:10 +0000 (15:27 -0700)]
added kill/pause button config for panels

10 years agomove the encoder pins used for the panels
Jim Morris [Fri, 2 Aug 2013 22:16:35 +0000 (15:16 -0700)]
move the encoder pins used for the panels

10 years agoAdd RRD GLCD comments
Jim Morris [Fri, 2 Aug 2013 21:41:22 +0000 (14:41 -0700)]
Add RRD GLCD comments

10 years agoMerge pull request #206 from Extent421/edge
Arthur Wolf [Fri, 2 Aug 2013 09:41:08 +0000 (02:41 -0700)]
Merge pull request #206 from Extent421/edge

extruder fix

10 years agocleaned up unused members, added a few comments
Mark Medrano [Fri, 2 Aug 2013 09:03:49 +0000 (02:03 -0700)]
cleaned up unused members, added a few comments

10 years agoadded endstop soft trim in preparation for deltabot auto-calibrate
Mark Medrano [Fri, 2 Aug 2013 08:17:06 +0000 (01:17 -0700)]
added endstop soft trim in preparation for deltabot auto-calibrate

10 years agokeep track of remainder amount from distance->step conversion to prevent sub-step...
Mark Medrano [Fri, 2 Aug 2013 07:49:10 +0000 (00:49 -0700)]
keep track of remainder amount from distance->step conversion to prevent sub-step errors from compounding over the course of a print and allow slow extrusions that cross multiple blocks

10 years agoMerge pull request #205 from wolfmanjm/feature/add-icons
Jim Morris [Fri, 2 Aug 2013 07:28:29 +0000 (00:28 -0700)]
Merge pull request #205 from wolfmanjm/feature/add-icons

Feature/add icons

10 years agoadd glyph blit operatin to gcld
Jim Morris [Fri, 2 Aug 2013 07:23:40 +0000 (00:23 -0700)]
add glyph blit operatin to gcld
add hotend, bed and fan icons to watch screen for graphical controllers

10 years agoMerge pull request #204 from wolfmanjm/feature/rrd-glcd
Jim Morris [Thu, 1 Aug 2013 08:53:57 +0000 (01:53 -0700)]
Merge pull request #204 from wolfmanjm/feature/rrd-glcd

Feature/rrd glcd

10 years agochane speed changes via panel to issue M220 to avoid skipping issues
Jim Morris [Thu, 1 Aug 2013 07:31:48 +0000 (00:31 -0700)]
chane speed changes via panel to issue M220 to avoid skipping issues
clean up gcode sending and rename command sending

Conflicts:

src/modules/utils/panel/screens/WatchScreen.cpp

10 years agocap speed override to not less than 1%
Jim Morris [Thu, 1 Aug 2013 06:59:16 +0000 (23:59 -0700)]
cap speed override to not less than 1%
sync watch screen with speed override changed via M220

10 years agoonly refresh framebuffer if it is dirty
Jim Morris [Wed, 31 Jul 2013 23:00:13 +0000 (16:00 -0700)]
only refresh framebuffer if it is dirty

10 years agooptimize panel to display lines not characters
Jim Morris [Wed, 31 Jul 2013 22:48:49 +0000 (15:48 -0700)]
optimize panel to display lines not characters
fix startup screen
optimize glcd

10 years agoupdate config
Jim Morris [Wed, 31 Jul 2013 10:04:34 +0000 (03:04 -0700)]
update config

10 years agoswitch to graphic fonts
Jim Morris [Wed, 31 Jul 2013 10:02:25 +0000 (03:02 -0700)]
switch to graphic fonts
make 20x8 screen

10 years agoreprap discount panel working in character mode.
Jim Morris [Tue, 30 Jul 2013 08:23:22 +0000 (01:23 -0700)]
reprap discount panel working in character mode.
Only has 16 character lines though.

10 years agoUpdate config
Jim Morris [Sat, 27 Jul 2013 23:00:50 +0000 (16:00 -0700)]
Update config

10 years agoUpdate config
Jim Morris [Sat, 27 Jul 2013 22:59:38 +0000 (15:59 -0700)]
Update config

10 years agoFix endstop configuration
Jim Morris [Sat, 27 Jul 2013 22:49:13 +0000 (15:49 -0700)]
Fix endstop configuration