Logxen [Thu, 27 Jun 2013 03:06:15 +0000 (20:06 -0700)]
SMOOTHIEPANEL LIVES! :D
Logxen [Wed, 26 Jun 2013 20:19:56 +0000 (13:19 -0700)]
started integrating Smoothiepanel code into Smoothieware, can write to lcd, no input
Jim Morris [Wed, 26 Jun 2013 00:10:47 +0000 (17:10 -0700)]
Merge pull request #190 from wolfmanjm/add/panel-pause-status
Show paused status if paused
Jim Morris [Wed, 26 Jun 2013 00:05:26 +0000 (17:05 -0700)]
Show paused status if paused
Jim Morris [Tue, 25 Jun 2013 22:51:14 +0000 (16:51 -0600)]
Update TemperatureControl.cpp
Add mark as taken for M105
Jim Morris [Tue, 25 Jun 2013 08:58:56 +0000 (01:58 -0700)]
Merge pull request #188 from wolfmanjm/add/extruder-screen
Add Extruder screen to panel
Jim Morris [Tue, 25 Jun 2013 08:55:55 +0000 (01:55 -0700)]
Add Extruder screen to panel
Jim Morris [Tue, 25 Jun 2013 07:13:12 +0000 (00:13 -0700)]
Merge pull request #187 from wolfmanjm/fix/get_checksum
Fix get_checksum to take a const char* as well as string so Debug mode d...
Jim Morris [Tue, 25 Jun 2013 07:10:22 +0000 (00:10 -0700)]
Fix get_checksum to take a const char* as well as string so Debug mode doesn't barf
Jim Morris [Mon, 24 Jun 2013 22:43:53 +0000 (15:43 -0700)]
Merge pull request #186 from wolfmanjm/upstreamedge
allow for watchscreen to handle temperature being disabled.
Jim Morris [Mon, 24 Jun 2013 22:41:52 +0000 (15:41 -0700)]
allow for watchscreen to handle temperature being disabled.
Jim Morris [Mon, 24 Jun 2013 07:47:22 +0000 (00:47 -0700)]
Merge pull request #185 from wolfmanjm/fix/panel-play
Fix watch screen update when file played from console
Jim Morris [Mon, 24 Jun 2013 07:42:35 +0000 (00:42 -0700)]
Fix watch screen update when file played from console
Only display filename part on LCD when play from LCD
Jim Morris [Mon, 24 Jun 2013 05:54:12 +0000 (22:54 -0700)]
Merge pull request #184 from wolfmanjm/update/panel
Update/panel
Jim Morris [Mon, 24 Jun 2013 05:52:43 +0000 (22:52 -0700)]
add default preheat config entries to config sample
Jim Morris [Mon, 24 Jun 2013 05:45:34 +0000 (22:45 -0700)]
implement preheat and cooldown
add config for the preheat values
comment out yet to be implented menu items
Jim Morris [Sun, 23 Jun 2013 09:51:03 +0000 (02:51 -0700)]
Merge pull request #183 from wolfmanjm/add/panel
Add/panel
Jim Morris [Sun, 23 Jun 2013 09:48:19 +0000 (02:48 -0700)]
fix tab to space
Jim Morris [Sun, 23 Jun 2013 09:34:29 +0000 (02:34 -0700)]
Added new Panel stuff
Arthur Wolf [Sun, 23 Jun 2013 07:57:31 +0000 (09:57 +0200)]
adding a new thermistor
Jim Morris [Sat, 22 Jun 2013 03:55:56 +0000 (20:55 -0700)]
Merge pull request #182 from wolfmanjm/add/johann-kossel-arm-solution
add Johanns Marlin solution to the arm solutions, basically the same as ...
Jim Morris [Sat, 22 Jun 2013 03:53:05 +0000 (20:53 -0700)]
add Johanns Marlin solution to the arm solutions, basically the same as RostockSolution just done differently
Plus the XYZ motors as specified on Kossel will match up with Alpha Beta Gamma motors.
Logxen [Fri, 21 Jun 2013 16:39:21 +0000 (09:39 -0700)]
fixed PlayLed functionality as per arthur's recomendation
Jim Morris [Wed, 19 Jun 2013 19:25:38 +0000 (12:25 -0700)]
Merge pull request #179 from mitchese/fix/mintemp-error
Fixed MINTEMP error message to start with Error:
Jim Morris [Wed, 19 Jun 2013 08:30:43 +0000 (02:30 -0600)]
add break to M 204
Jim Morris [Wed, 19 Jun 2013 08:22:39 +0000 (01:22 -0700)]
Merge pull request #180 from wolfmanjm/feature/m206
add M206 Snnn to change acceleration on the fly as slic3r does
Jim Morris [Wed, 19 Jun 2013 08:20:24 +0000 (01:20 -0700)]
add M206 Snnn to change acceleration on the fly as slic3r does
Sean Mitchell [Thu, 13 Jun 2013 22:29:23 +0000 (00:29 +0200)]
Fixed MINTEMP error message to start with Error:
Jim Morris [Thu, 13 Jun 2013 09:55:50 +0000 (02:55 -0700)]
Merge pull request #175 from wolfmanjm/feature/allow-different-digipots
Feature/allow different digipots
Jim Morris [Thu, 13 Jun 2013 09:52:29 +0000 (02:52 -0700)]
fix whitespace tabs -> spaces
Jim Morris [Thu, 13 Jun 2013 09:48:49 +0000 (02:48 -0700)]
added ad5206 implemente by Wulfnor
Jim Morris [Wed, 12 Jun 2013 07:12:13 +0000 (00:12 -0700)]
Move digipot to currentl control module
add config to select digipot chip to use
add example ad5206.h chip skeleton
rename digipot to mcp4451.h
Jim Morris [Wed, 12 Jun 2013 00:12:41 +0000 (17:12 -0700)]
Merge pull request #174 from wolfmanjm/fix/version-makefile
Fix/version makefile
Jim Morris [Wed, 12 Jun 2013 00:07:54 +0000 (17:07 -0700)]
Merge branch 'upstreamedge' into fix/version-makefile
Jim Morris [Tue, 11 Jun 2013 23:59:41 +0000 (16:59 -0700)]
Merge pull request #172 from wolfmanjm/feature/get_public_value_event
Feature/get public value event
THEKERNEL singleton
Motion Tested on hbot
Jim Morris [Sun, 9 Jun 2013 04:57:40 +0000 (21:57 -0700)]
Add THEKERNEL which accesses the Kernel Singleton from anywhere
Jim Morris [Sat, 8 Jun 2013 11:06:02 +0000 (04:06 -0700)]
whitespace conversion tab -> space
Jim Morris [Sat, 8 Jun 2013 11:04:00 +0000 (04:04 -0700)]
Add public data access to robot for current override speed and current position
allow setting of current override speed via public data access
Jim Morris [Fri, 7 Jun 2013 23:01:17 +0000 (16:01 -0700)]
cleanup white space tabs -> spaces
Jim Morris [Fri, 7 Jun 2013 22:57:39 +0000 (15:57 -0700)]
added set_temp to console commands
tests the set_public_data event
Jim Morris [Fri, 7 Jun 2013 22:33:51 +0000 (15:33 -0700)]
Merge remote-tracking branch 'upstream/edge' into feature/get_public_value_event
Jim Morris [Fri, 7 Jun 2013 09:42:54 +0000 (02:42 -0700)]
Use adam greens suggestion to simplify the way the git version string is generated
Jim Morris [Fri, 7 Jun 2013 08:11:16 +0000 (01:11 -0700)]
Merge pull request #173 from wolfmanjm/fix/version-makefile
Fix makefile so src/version.cpp is copied if on win32
add src/version.cpp to .gitignore
Jim Morris [Fri, 7 Jun 2013 07:59:23 +0000 (00:59 -0700)]
Fix makefile so src/version.cpp is copied if on win32
Add src/version.cpp to .gitignore so it doesn't get checked in
Jim Morris [Fri, 7 Jun 2013 07:37:15 +0000 (00:37 -0700)]
clean up white space tabs vs spaces
Jim Morris [Fri, 7 Jun 2013 05:45:54 +0000 (22:45 -0700)]
Use a struct to return public data requests, see example in temerature control
Jim Morris [Fri, 7 Jun 2013 05:28:09 +0000 (22:28 -0700)]
Move where the checksums are defined for public access
Check if the public access was accepeted and return true/false in get_value
Jim Morris [Fri, 7 Jun 2013 04:26:24 +0000 (21:26 -0700)]
update .gitignore
Jim Morris [Fri, 7 Jun 2013 00:15:19 +0000 (17:15 -0700)]
Added a new event GET_PUBLIC_DATA used to retrieve (or set) data from other modules
example of handling the data request is in TemperatureControl.cpp
example of retrieving the data is in SimpleShell.cpp get_temp command
Do not merge this yet!!
Logxen [Thu, 6 Jun 2013 20:11:17 +0000 (13:11 -0700)]
added sample config values for Laser module
Logxen [Thu, 6 Jun 2013 20:03:35 +0000 (13:03 -0700)]
finally made Laser's pin configable
Logxen [Wed, 5 Jun 2013 21:15:15 +0000 (14:15 -0700)]
Merge remote-tracking branch 'upstream/edge' into edge
Logxen [Wed, 5 Jun 2013 21:10:03 +0000 (14:10 -0700)]
moved gcode execute out of interrupt context and improved analog support
Jim Morris [Wed, 5 Jun 2013 20:53:19 +0000 (14:53 -0600)]
Update makefile
make generate_version.sh execute from current directory
arthurwolf [Wed, 5 Jun 2013 09:18:05 +0000 (02:18 -0700)]
Merge pull request #168 from wolfmanjm/feature/add-version-command
Add a version command to simpleshell
arthurwolf [Wed, 5 Jun 2013 09:17:45 +0000 (02:17 -0700)]
Merge pull request #170 from wolfmanjm/feature/add-string-after-ok
add GCode::txt_after_ok so test can be appended to the ok message to conf...
Jim Morris [Wed, 5 Jun 2013 09:09:35 +0000 (02:09 -0700)]
add GCode::txt_after_ok so test can be appnded to the ok message to conform with pronterface standards
Use this in M105 so temperatures are displayed in pronterface
Logxen [Sat, 1 Jun 2013 20:36:49 +0000 (13:36 -0700)]
properly muxed outputs
Logxen [Sat, 1 Jun 2013 19:32:39 +0000 (12:32 -0700)]
Merge remote-tracking branch 'upstream/edge' into edge
Logxen [Sat, 1 Jun 2013 19:30:31 +0000 (12:30 -0700)]
updated ConfigSamples for new switch system
arthurwolf [Sat, 1 Jun 2013 19:28:10 +0000 (12:28 -0700)]
Merge pull request #169 from logxen/switch
Switch / Button Merge
Logxen [Sat, 1 Jun 2013 19:17:08 +0000 (12:17 -0700)]
put docs/ConfigSamples back the way they were
Logxen [Sat, 1 Jun 2013 19:15:28 +0000 (12:15 -0700)]
merged button into switch to generally reduce naming confusion and to allow greater muxing options
Logxen [Fri, 31 May 2013 20:17:44 +0000 (13:17 -0700)]
changed docs organization to better allow for documenting modules and added a doc for the Button module.
Logxen [Fri, 31 May 2013 18:22:50 +0000 (11:22 -0700)]
fixed bug in Pin declaration and usage in Button module
Jim Morris [Wed, 29 May 2013 11:34:26 +0000 (04:34 -0700)]
add placeholder for git info
Jim Morris [Wed, 29 May 2013 11:31:29 +0000 (04:31 -0700)]
add graceful fail for windows
Jim Morris [Wed, 29 May 2013 11:02:12 +0000 (04:02 -0700)]
Add a version command to simpleshell
Print out version and build date on startup
makfile generates a new src/version.cpp with current git branch and hash and build date time
arthurwolf [Sat, 25 May 2013 11:55:17 +0000 (04:55 -0700)]
Merge pull request #167 from powertomato/feature/touchprobe
Feature/touchprobe
Thanks !
Stefan Krulj [Sat, 25 May 2013 11:43:42 +0000 (13:43 +0200)]
Fix a wrong merge I made
Stefan Krulj [Sat, 25 May 2013 11:40:38 +0000 (13:40 +0200)]
fix a pseudo change
Stefan Krulj [Sat, 25 May 2013 11:29:29 +0000 (13:29 +0200)]
Code cleanup and comments
Stefan Krulj [Thu, 23 May 2013 01:29:55 +0000 (03:29 +0200)]
Fixed a bug regarding absolute/relative movment during a G31
Logging finally works!
Stefan Krulj [Wed, 22 May 2013 01:48:38 +0000 (03:48 +0200)]
Rewritten Touchprobe module to use Stepper-objects directly
The code works now but only for carthesian robots, logs doesn't work (fflush is broken!)
Stefan Krulj [Tue, 21 May 2013 19:14:29 +0000 (21:14 +0200)]
Completely moved the motion part of G31 to Robot, still no movement
after first touch
Stefan Krulj [Tue, 21 May 2013 18:24:57 +0000 (20:24 +0200)]
Replaced fake G-code with actual Robot calls (requires chainging the visibilty) still only works for one touch
Stefan Krulj [Tue, 21 May 2013 13:10:09 +0000 (15:10 +0200)]
Touchprobe-Module first commit. G31 forwards a fake G1 to Robot,
a touch stops the movement, but then moving will stop working
no position correction yet
Stefan Krulj [Sat, 18 May 2013 01:10:37 +0000 (03:10 +0200)]
Merge branch 'edge' of git://github.com/arthurwolf/Smoothie into feature/post_play_gcode
Michael Moon [Mon, 13 May 2013 09:01:12 +0000 (19:01 +1000)]
Merge remote-tracking branch 'fix/USBMSD' into edge
Michael Moon [Mon, 13 May 2013 08:38:40 +0000 (01:38 -0700)]
Merge pull request #166 from ennobler/edge
Allow endstop pull up/down configuration to be set via new config flags- do not force pull-up configuration
Ali [Mon, 13 May 2013 00:07:53 +0000 (19:07 -0500)]
change the default config to pull up end stop pins. *IF YOU WERE USING END STOPS BEFORE YOU NEED TO DO THIS*.
Ali [Sun, 12 May 2013 23:43:02 +0000 (18:43 -0500)]
Don't always pull up the endstop pins. Let the user configure it with the Pin configuration (e.g. pull down instead of pull up).
Michael Moon [Sun, 12 May 2013 02:01:10 +0000 (12:01 +1000)]
USBSerial: allow CR to terminate lines
Michael Moon [Sat, 11 May 2013 15:28:01 +0000 (01:28 +1000)]
Module: register_for_event no longer virtual to remove an entry from the vtable and save some ram
Michael Moon [Wed, 8 May 2013 15:46:08 +0000 (01:46 +1000)]
strip utf8 nbsp from comments
Michael Moon [Wed, 8 May 2013 07:00:00 +0000 (00:00 -0700)]
Merge pull request #165 from dandumit/edge
report error message when a command is not claimed
Daniel Dumitru [Wed, 8 May 2013 06:16:43 +0000 (09:16 +0300)]
report soft error on command unhandled
implemented suggestions from Arthur and Triffid
Michael Moon [Tue, 7 May 2013 13:46:04 +0000 (23:46 +1000)]
Robot & Extruder: enable pins are no longer open drain. If you need open drain enables, put an 'o' after the pindef in your config ala Jim Morris' recent 947ae5 commit
Michael Moon [Tue, 7 May 2013 08:05:49 +0000 (18:05 +1000)]
Pin::from_string: change nested loops for condition in case default to allow & ignore whitespace
Michael Moon [Tue, 7 May 2013 07:26:08 +0000 (00:26 -0700)]
Merge pull request #164 from wolfmanjm/feature/add-open-collector-pins
added new pin modifiers to from_string...
Jim Morris [Tue, 7 May 2013 06:20:00 +0000 (23:20 -0700)]
added repeater mode
added - to set no pullup
added @ to set repeater mode
Jim Morris [Tue, 7 May 2013 05:41:28 +0000 (22:41 -0700)]
Set no pullup the default for open drain outputs
Jim Morris [Tue, 7 May 2013 03:27:47 +0000 (20:27 -0700)]
added new pin modifiers to from_string...
! = invert pin
o = set pin to open drain
^ = set pin to pull up
v = set pin to pull down
Daniel Dumitru [Sat, 4 May 2013 07:52:47 +0000 (10:52 +0300)]
report error message when a command was not taken
adds a method to GCode object to flag when object was taken by a module
Stefan Krulj [Thu, 2 May 2013 22:49:47 +0000 (00:49 +0200)]
Added post-play-gcode
Michael Moon [Wed, 1 May 2013 10:11:21 +0000 (20:11 +1000)]
Player: give on_boot_* class variables same name as config options for clarity
Michael Moon [Wed, 1 May 2013 10:08:02 +0000 (20:08 +1000)]
Player: Don't show 'Playing' message if gcode is not found
Michael Moon [Wed, 1 May 2013 10:06:58 +0000 (20:06 +1000)]
Merge branch 'powertomato-edge' into edge
Stefan Krulj [Wed, 1 May 2013 08:19:04 +0000 (10:19 +0200)]
On boot gcode is now default, commented the "skip"-message if it was set to false
Stefan Krulj [Tue, 30 Apr 2013 21:28:14 +0000 (23:28 +0200)]
Player ignored 'on_boot_gcode_enable' setting: fixed!