clinton/Smoothieware.git
9 years agoremove on_config_reload event
Jim Morris [Tue, 17 Jun 2014 08:24:15 +0000 (01:24 -0700)]
remove on_config_reload event

9 years agoMerge pull request #430 from wolfmanjm/upstreamedge
Jim Morris [Tue, 17 Jun 2014 06:11:41 +0000 (23:11 -0700)]
Merge pull request #430 from wolfmanjm/upstreamedge

fix race conditions in slowticker... thanks to raldrich for finding one ...

9 years agofix race conditions in slowticker... thanks to raldrich for finding one of them
Jim Morris [Tue, 17 Jun 2014 06:10:24 +0000 (23:10 -0700)]
fix race conditions in slowticker... thanks to raldrich for finding one of them

9 years agoUpdate config
Jim Morris [Mon, 16 Jun 2014 21:24:04 +0000 (14:24 -0700)]
Update config

9 years agoMerge pull request #429 from wolfmanjm/add/max-step-rate-check
Jim Morris [Mon, 16 Jun 2014 07:45:23 +0000 (00:45 -0700)]
Merge pull request #429 from wolfmanjm/add/max-step-rate-check

remove copies of steppermotor pointers in modules and use the ones in ro...

9 years agoremove comment field
Jim Morris [Mon, 16 Jun 2014 07:38:17 +0000 (00:38 -0700)]
remove comment field

9 years agoremove copies of steppermotor pointers in modules and use the ones in robot
Jim Morris [Mon, 16 Jun 2014 07:31:32 +0000 (00:31 -0700)]
remove copies of steppermotor pointers in modules and use the ones in robot
add sanity check for exceeding base step frequency with actutor max rate and steps/mm

9 years agoMerge pull request #428 from wolfmanjm/upstreamedge
Jim Morris [Mon, 16 Jun 2014 03:10:51 +0000 (20:10 -0700)]
Merge pull request #428 from wolfmanjm/upstreamedge

create an init() in main so stack is released

9 years agocreate an init() in main so stack is released
Jim Morris [Mon, 16 Jun 2014 03:08:52 +0000 (20:08 -0700)]
create an init() in main so stack is released

9 years agoMerge pull request #427 from Smoothieware/fix/makers-should-not-be-modules
Jim Morris [Mon, 16 Jun 2014 01:15:09 +0000 (18:15 -0700)]
Merge pull request #427 from Smoothieware/fix/makers-should-not-be-modules

these do not need to be modules

9 years agothese do not need to be modules
Jim Morris [Mon, 16 Jun 2014 01:02:30 +0000 (18:02 -0700)]
these do not need to be modules

9 years agoMerge pull request #426 from logxen/config_include
Logxen [Sun, 15 Jun 2014 16:39:36 +0000 (09:39 -0700)]
Merge pull request #426 from logxen/config_include

implemented config include directive

9 years agoimplemented config include directive
Logxen [Sun, 15 Jun 2014 16:31:40 +0000 (09:31 -0700)]
implemented config include directive

9 years agoMerge pull request #425 from klocs/edge
Jim Morris [Sun, 15 Jun 2014 00:39:52 +0000 (17:39 -0700)]
Merge pull request #425 from klocs/edge

Add a check that the zprobe is not already triggered before moving the motors

9 years agoremove debounce logic
Scott Foster [Sun, 15 Jun 2014 00:24:05 +0000 (17:24 -0700)]
remove debounce logic

9 years agoAdd the header file that I forgot to add for the last commit
Scott Foster [Sat, 14 Jun 2014 21:04:06 +0000 (14:04 -0700)]
Add the header file that I forgot to add for the last commit

9 years agoMerge pull request #423 from wolfmanjm/upstreamedge
Jim Morris [Sat, 14 Jun 2014 08:13:30 +0000 (01:13 -0700)]
Merge pull request #423 from wolfmanjm/upstreamedge

Public data does not need to be a module  or have an instance, it is jus...

9 years agoPublic data does not need to be a module or have an instance, it is just a library.
Jim Morris [Sat, 14 Jun 2014 08:11:53 +0000 (01:11 -0700)]
Public data does not need to be a module  or have an instance, it is just a library.

9 years agoUpdate Module.cpp
Jim Morris [Sat, 14 Jun 2014 07:57:13 +0000 (00:57 -0700)]
Update Module.cpp

9 years agoMerge pull request #422 from wolfmanjm/fix/module-event-arrays
Jim Morris [Sat, 14 Jun 2014 07:46:03 +0000 (00:46 -0700)]
Merge pull request #422 from wolfmanjm/fix/module-event-arrays

make the event callbacks and definitions more readable

9 years agoadd some comments
Jim Morris [Sat, 14 Jun 2014 07:43:01 +0000 (00:43 -0700)]
add some comments

9 years agojust expand events.h, leave the rest the same, just a readability issue
Jim Morris [Sat, 14 Jun 2014 07:24:28 +0000 (00:24 -0700)]
just expand events.h, leave the rest the same, just a readability issue

9 years agodon't use std::function as it uses a lot more memory than Module*
Jim Morris [Sat, 14 Jun 2014 06:56:40 +0000 (23:56 -0700)]
don't use std::function as it uses a lot more memory than Module*

9 years agoclean up the way events are handled and use std::function
Jim Morris [Sat, 14 Jun 2014 06:12:01 +0000 (23:12 -0700)]
clean up the way events are handled and use std::function

9 years agoMerge pull request #421 from wolfmanjm/upstreamedge
Jim Morris [Fri, 13 Jun 2014 22:04:54 +0000 (15:04 -0700)]
Merge pull request #421 from wolfmanjm/upstreamedge

cleanup modules cleaning up

9 years agoadd ability to disable play led in config
Jim Morris [Fri, 13 Jun 2014 22:02:10 +0000 (15:02 -0700)]
add ability to disable play led in config
clean up some modules cleaning themselves up if not enabled
remove vectors that are not being used

9 years agoAdd zprobe check before move code.
Scott Foster [Fri, 13 Jun 2014 03:56:38 +0000 (20:56 -0700)]
Add zprobe check before move code.

9 years agoMerge remote-tracking branch 'upstream/edge' into upstreamedge
Jim Morris [Tue, 10 Jun 2014 06:13:35 +0000 (23:13 -0700)]
Merge remote-tracking branch 'upstream/edge' into upstreamedge

9 years agoMerge pull request #418 from wolfmanjm/upstreamedge
Jim Morris [Tue, 10 Jun 2014 06:08:48 +0000 (23:08 -0700)]
Merge pull request #418 from wolfmanjm/upstreamedge

Fix extruder SOLO moves when in volumetric mode, so they remain mm and m...

9 years agoMerge remote-tracking branch 'upstream/edge' into upstreamedge
Jim Morris [Tue, 10 Jun 2014 06:06:47 +0000 (23:06 -0700)]
Merge remote-tracking branch 'upstream/edge' into upstreamedge

9 years agoFix extruder SOLO moves when in volumetric mode, so they remain mm and mm/min
Jim Morris [Tue, 10 Jun 2014 06:05:50 +0000 (23:05 -0700)]
Fix extruder SOLO moves when in volumetric mode, so they remain mm and mm/min

9 years agoMerge branch 'edge' of github.com:Smoothieware/Smoothieware into edge
Jim Morris [Mon, 9 Jun 2014 23:36:04 +0000 (16:36 -0700)]
Merge branch 'edge' of github.com:Smoothieware/Smoothieware into edge

9 years agoremove webif as it never worked and has been abandoned
Jim Morris [Mon, 9 Jun 2014 23:35:29 +0000 (16:35 -0700)]
remove webif as it never worked and has been abandoned

9 years agoMerge pull request #417 from wolfmanjm/upstreamedge
Jim Morris [Mon, 9 Jun 2014 04:13:52 +0000 (21:13 -0700)]
Merge pull request #417 from wolfmanjm/upstreamedge

clear AHB0 and AHB1 data sections

9 years agoclear AHB0 and AHB1 data sections
Jim Morris [Mon, 9 Jun 2014 04:01:35 +0000 (21:01 -0700)]
clear AHB0 and AHB1 data sections

9 years agoMerge pull request #416 from wolfmanjm/optimize/bss
Jim Morris [Sun, 8 Jun 2014 23:59:54 +0000 (16:59 -0700)]
Merge pull request #416 from wolfmanjm/optimize/bss

move big static data structures to USB and NET ram

9 years agomove big static data structures to USB and NET ram
Jim Morris [Sun, 8 Jun 2014 23:57:09 +0000 (16:57 -0700)]
move big static data structures to USB and NET ram

9 years agoMerge pull request #415 from wolfmanjm/optimize/public-data
Jim Morris [Sun, 8 Jun 2014 23:32:41 +0000 (16:32 -0700)]
Merge pull request #415 from wolfmanjm/optimize/public-data

save some ram by not making public data returns static data

9 years agosave some ram by not making public data returns static data
Jim Morris [Sun, 8 Jun 2014 23:30:17 +0000 (16:30 -0700)]
save some ram by not making public data returns static data
Combine some bools to bits

9 years agoset the minimum filament diameter to 0.01mm to prevent potential rounding issues
Logxen [Sun, 8 Jun 2014 22:35:43 +0000 (15:35 -0700)]
set the minimum filament diameter to 0.01mm to prevent potential rounding issues

9 years agoAdd filament diameter to panel settings
Jim Morris [Sun, 8 Jun 2014 22:00:36 +0000 (15:00 -0700)]
Add filament diameter to panel settings
M503 should return steps/mm setting

9 years agoextended volumetric settings into M92 and M500/M503
Logxen [Sun, 8 Jun 2014 21:14:23 +0000 (14:14 -0700)]
extended volumetric settings into M92 and M500/M503

9 years agoMerge pull request #414 from logxen/volumetric
Logxen [Sun, 8 Jun 2014 19:37:43 +0000 (12:37 -0700)]
Merge pull request #414 from logxen/volumetric

Volumetric extrusion

9 years agoadded M200 command to set volumetric/linear extrusion mode
Logxen [Sun, 8 Jun 2014 19:21:31 +0000 (12:21 -0700)]
added M200 command to set volumetric/linear extrusion mode

9 years agoremoved unnecessary members from Extruder
Logxen [Sun, 8 Jun 2014 18:59:48 +0000 (11:59 -0700)]
removed unnecessary members from Extruder

9 years agoadded filament_diameter config setting to Extruder to make volumetric extrusion easie...
Logxen [Sun, 8 Jun 2014 18:55:14 +0000 (11:55 -0700)]
added filament_diameter config setting to Extruder to make volumetric extrusion easier to enable
if filament_diameter is not set or is 0 (or less) then the steps_per_millimeter will be left unaltered

9 years agoMerge pull request #413 from logxen/pausecmd
Logxen [Sun, 8 Jun 2014 04:15:45 +0000 (21:15 -0700)]
Merge pull request #413 from logxen/pausecmd

added freeze and unfreeze commands to PauseButton

9 years agomoved freeze and unfreeze commands into PauseButton
Logxen [Sun, 8 Jun 2014 04:03:29 +0000 (21:03 -0700)]
moved freeze and unfreeze commands into PauseButton

9 years agoupdate firmware.bin
Jim Morris [Sun, 8 Jun 2014 03:40:20 +0000 (20:40 -0700)]
update firmware.bin

9 years agoUpdate config
Jim Morris [Sun, 8 Jun 2014 03:34:05 +0000 (20:34 -0700)]
Update config

9 years agoUpdate config
Jim Morris [Sun, 8 Jun 2014 03:33:22 +0000 (20:33 -0700)]
Update config

9 years agorenamed pause and resume commands to freeze and unfreeze
Logxen [Sun, 8 Jun 2014 03:07:25 +0000 (20:07 -0700)]
renamed pause and resume commands to freeze and unfreeze

9 years agoadded pause and resume commands to SimpleShell
Logxen [Sat, 7 Jun 2014 17:24:43 +0000 (10:24 -0700)]
added pause and resume commands to SimpleShell
this system enables a solution for active endstops demonstrated in the Smoothieboard ConfigSample
moved Pauser into Robot (implemented Modules should not be in libs)

9 years agoMerge pull request #412 from wolfmanjm/fix/multi-extruder-bed
Jim Morris [Sat, 7 Jun 2014 05:25:42 +0000 (22:25 -0700)]
Merge pull request #412 from wolfmanjm/fix/multi-extruder-bed

Fix/multi extruder bed

9 years agoneed to enable the extruder if it is the only one
Jim Morris [Sat, 7 Jun 2014 05:07:04 +0000 (22:07 -0700)]
need to enable the extruder if it is the only one

9 years agofix auto pid refactor bug
Jim Morris [Sat, 7 Jun 2014 04:32:32 +0000 (21:32 -0700)]
fix auto pid refactor bug

9 years agoFix bed temp setting when multi extruder is configured
Jim Morris [Sat, 7 Jun 2014 00:41:05 +0000 (17:41 -0700)]
Fix bed temp setting when multi extruder is configured
Refactor AutoPid, now handles M302 itself
Make tool manager ignore tools requests it does not manage

9 years agoMerge pull request #411 from wolfmanjm/upstreamedge
Jim Morris [Fri, 6 Jun 2014 06:31:07 +0000 (23:31 -0700)]
Merge pull request #411 from wolfmanjm/upstreamedge

fix panel value setting

9 years agofix panel value setting
Jim Morris [Fri, 6 Jun 2014 06:28:47 +0000 (23:28 -0700)]
fix panel value setting

10 years agoMerge branch 'fix/robot_use_powf' into edge
Michael Moon [Wed, 4 Jun 2014 03:44:51 +0000 (13:44 +1000)]
Merge branch 'fix/robot_use_powf' into edge

10 years agochanged pow to powf
0x23 [Fri, 30 May 2014 08:42:33 +0000 (10:42 +0200)]
changed pow to powf

10 years agoupdate firmware.bin
Jim Morris [Tue, 3 Jun 2014 21:38:24 +0000 (14:38 -0700)]
update firmware.bin

10 years agoMerge pull request #410 from wolfmanjm/upstreamedge
Jim Morris [Tue, 3 Jun 2014 20:44:07 +0000 (13:44 -0700)]
Merge pull request #410 from wolfmanjm/upstreamedge

fix panel wrap

10 years agofix panel wrap
Jim Morris [Tue, 3 Jun 2014 20:43:02 +0000 (13:43 -0700)]
fix panel wrap

10 years agoMerge pull request #409 from wolfmanjm/fix/rename-delta-arm-solutions
Jim Morris [Mon, 2 Jun 2014 20:22:38 +0000 (13:22 -0700)]
Merge pull request #409 from wolfmanjm/fix/rename-delta-arm-solutions

rename delta arm solutions

10 years agorename delta arm solutions
Jim Morris [Mon, 2 Jun 2014 20:20:46 +0000 (13:20 -0700)]
rename delta arm solutions

10 years agoupdate firmware.bin
Jim Morris [Mon, 2 Jun 2014 06:19:34 +0000 (23:19 -0700)]
update firmware.bin

10 years agoMerge pull request #408 from wolfmanjm/fix/dont_use_hash_for_simpleshell_commands
Jim Morris [Mon, 2 Jun 2014 06:10:21 +0000 (23:10 -0700)]
Merge pull request #408 from wolfmanjm/fix/dont_use_hash_for_simpleshell_commands

Fix/dont use hash for simpleshell commands

10 years agofix config get command
Jim Morris [Mon, 2 Jun 2014 06:09:28 +0000 (23:09 -0700)]
fix config get command

10 years agoRemove CHECKSUMMING of console commands to avoid unwanted duplicate hits.
Jim Morris [Mon, 2 Jun 2014 05:54:22 +0000 (22:54 -0700)]
Remove CHECKSUMMING of console commands to avoid unwanted duplicate hits.
Also moves the tables into FLASH out of RAM.

10 years agoMerge pull request #407 from wolfmanjm/panel/add-settings-and-temp
Jim Morris [Sat, 31 May 2014 07:22:45 +0000 (00:22 -0700)]
Merge pull request #407 from wolfmanjm/panel/add-settings-and-temp

add settings and temp to panel, refactor panel, minor refactor StepTicker

10 years agoEnumerate hotends for display in panel temperature settings
Jim Morris [Sat, 31 May 2014 07:00:53 +0000 (00:00 -0700)]
Enumerate hotends for display in panel temperature settings
refactor the panel to be a singleton saving having to store panel pointer in every screen
lazy load the configure screen

10 years agoadd z homing offset to settings
Jim Morris [Sat, 31 May 2014 00:21:00 +0000 (17:21 -0700)]
add z homing offset to settings

10 years agofix minor update bug after changing a value
Jim Morris [Fri, 30 May 2014 09:43:55 +0000 (02:43 -0700)]
fix minor update bug after changing a value

10 years agoAdded e steps for panel
Jim Morris [Fri, 30 May 2014 07:33:53 +0000 (00:33 -0700)]
Added e steps for panel

10 years agoInitial addition of settings and temperature control to Panel
Jim Morris [Fri, 30 May 2014 05:17:44 +0000 (22:17 -0700)]
Initial addition of settings and temperature control to Panel
made some fields private in stepper steppermotor stepticker

10 years agoMerge pull request #406 from wolfmanjm/upstreamedge
Jim Morris [Thu, 29 May 2014 08:37:43 +0000 (01:37 -0700)]
Merge pull request #406 from wolfmanjm/upstreamedge

Add 1 to recieved frame index to get length

10 years agoAdd 1 to recieved frame index to get length
Jim Morris [Thu, 29 May 2014 08:35:37 +0000 (01:35 -0700)]
Add 1 to recieved frame index to get length

10 years agoupdate firmware.bin
Jim Morris [Wed, 28 May 2014 22:55:48 +0000 (15:55 -0700)]
update firmware.bin

10 years agoMerge pull request #405 from wolfmanjm/upstreamedge
Jim Morris [Wed, 28 May 2014 20:30:59 +0000 (13:30 -0700)]
Merge pull request #405 from wolfmanjm/upstreamedge

Workaround driver sending 3 bytes more than packet size by adding 4 byte...

10 years agoWorkaround driver sending 3 bytes more than packet size by adding 4 bytes to uip...
Jim Morris [Wed, 28 May 2014 20:27:10 +0000 (13:27 -0700)]
Workaround driver sending 3 bytes more than packet size by adding 4 bytes to uip buffer size
Discard packets that are too big for uip buffer (UDP broadcasts usually)

10 years agoupdate firmware.bin
Jim Morris [Mon, 26 May 2014 04:24:53 +0000 (21:24 -0700)]
update firmware.bin

10 years agoMerge pull request #403 from wolfmanjm/upstreamedge
Jim Morris [Mon, 26 May 2014 04:08:34 +0000 (21:08 -0700)]
Merge pull request #403 from wolfmanjm/upstreamedge

fix bug in extruder which was introdcuded by multiextruder edits. F shou...

10 years agofix bug in extruder which was introdcuded by multiextruder edits. F should only be...
Jim Morris [Mon, 26 May 2014 04:07:05 +0000 (21:07 -0700)]
fix bug in extruder which was introdcuded by multiextruder edits. F should only be appied when a G0 or G1

10 years agoMerge pull request #402 from wolfmanjm/upstreamedge
Jim Morris [Sat, 24 May 2014 23:37:09 +0000 (16:37 -0700)]
Merge pull request #402 from wolfmanjm/upstreamedge

remove link_to_tool config as it is not needed

10 years agoremove link_to_tool, as it is not needed
Jim Morris [Sat, 24 May 2014 23:33:25 +0000 (16:33 -0700)]
remove link_to_tool, as it is not needed
update Sample configs

10 years agoMerge remote-tracking branch 'upstream/edge' into upstreamedge
Jim Morris [Sat, 24 May 2014 23:21:31 +0000 (16:21 -0700)]
Merge remote-tracking branch 'upstream/edge' into upstreamedge

Conflicts:
src/modules/robot/Conveyor.h

10 years agoMerge pull request #401 from wolfmanjm/fix/cleanup-private-fields
Jim Morris [Sat, 24 May 2014 23:20:30 +0000 (16:20 -0700)]
Merge pull request #401 from wolfmanjm/fix/cleanup-private-fields

Fix/cleanup private fields

10 years agoremove incorrect comment about queue size
Jim Morris [Sat, 24 May 2014 23:19:30 +0000 (16:19 -0700)]
remove incorrect comment about queue size

10 years agoremove incorrect comment about block queue size
Jim Morris [Sat, 24 May 2014 23:17:43 +0000 (16:17 -0700)]
remove incorrect comment about block queue size

10 years agocleanup a bunch of fields that should be private
Jim Morris [Sat, 24 May 2014 23:13:43 +0000 (16:13 -0700)]
cleanup a bunch of fields that should be private
add a few getters where the value is needed in many other classes

10 years agoupdate firmware.bin
Jim Morris [Sat, 24 May 2014 21:30:36 +0000 (14:30 -0700)]
update firmware.bin

10 years agoMerge pull request #400 from Smoothieware/multitool
Logxen [Sat, 24 May 2014 20:08:23 +0000 (13:08 -0700)]
Merge pull request #400 from Smoothieware/multitool

Multitool

10 years agoUpdate to latest binary
Jim Morris [Mon, 19 May 2014 08:44:13 +0000 (01:44 -0700)]
Update to latest binary

10 years agofix what was previously fixed in config but was broken again :)
Jim Morris [Mon, 19 May 2014 03:38:55 +0000 (20:38 -0700)]
fix what was previously fixed in config but was broken again :)

10 years agotry another approach to tool offset
Jim Morris [Sun, 18 May 2014 23:25:21 +0000 (16:25 -0700)]
try another approach to tool offset

10 years agoChange the way tool offset is handled in robot
Jim Morris [Sun, 18 May 2014 22:11:15 +0000 (15:11 -0700)]
Change the way tool offset is handled in robot

10 years agoFix tool offset handling, it should not be reflected in last_milestone
Jim Morris [Sun, 18 May 2014 20:11:29 +0000 (13:11 -0700)]
Fix tool offset handling, it should not be reflected in last_milestone

10 years agoFix M92 Ennn to set the steps/mm for current tool
Jim Morris [Sun, 18 May 2014 07:46:11 +0000 (00:46 -0700)]
Fix M92 Ennn to set the steps/mm for current tool
Fix M500 to save M92 properly

10 years agowhite space fixes only
Jim Morris [Sun, 18 May 2014 05:44:08 +0000 (22:44 -0700)]
white space fixes only