Jim Morris [Wed, 31 Jul 2013 23:00:13 +0000 (16:00 -0700)]
only refresh framebuffer if it is dirty
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
Jim Morris [Wed, 31 Jul 2013 10:04:34 +0000 (03:04 -0700)]
update config
Jim Morris [Wed, 31 Jul 2013 10:02:25 +0000 (03:02 -0700)]
switch to graphic fonts
make 20x8 screen
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.
Jim Morris [Sat, 27 Jul 2013 23:00:50 +0000 (16:00 -0700)]
Update config
Jim Morris [Sat, 27 Jul 2013 22:59:38 +0000 (15:59 -0700)]
Update config
Jim Morris [Sat, 27 Jul 2013 22:49:13 +0000 (15:49 -0700)]
Fix endstop configuration
Logxen [Thu, 18 Jul 2013 19:12:55 +0000 (12:12 -0700)]
Merge remote-tracking branch 'upstream/stable-edge' into edge
Logxen [Thu, 18 Jul 2013 19:10:41 +0000 (12:10 -0700)]
revert to pre-actuator state
Jim Morris [Tue, 9 Jul 2013 07:08:03 +0000 (00:08 -0700)]
Add hack to detect i2c timeout, and reset Viki LCD when detected
Arthur Wolf [Sun, 7 Jul 2013 21:46:31 +0000 (23:46 +0200)]
adding virtuals to Actuator
Arthur Wolf [Sat, 6 Jul 2013 15:24:55 +0000 (17:24 +0200)]
moving all modules to use Actuator instead of StepperMotor ( but still instantiate StepperMotor )
Arthur Wolf [Sat, 6 Jul 2013 14:46:33 +0000 (16:46 +0200)]
forgot Actuator.h
Arthur Wolf [Sat, 6 Jul 2013 13:10:54 +0000 (15:10 +0200)]
Stepticker now inherits Actuator
Arthur Wolf [Sat, 6 Jul 2013 12:40:10 +0000 (14:40 +0200)]
moving StepperMotor.h to actuators/
Jim Morris [Sat, 6 Jul 2013 05:47:49 +0000 (22:47 -0700)]
Add new panel examples
Jim Morris [Sat, 6 Jul 2013 05:42:35 +0000 (22:42 -0700)]
Merge pull request #201 from wolfmanjm/upstreamedge
add Panelolu2 (which is virtually identical to viki)
Jim Morris [Sat, 6 Jul 2013 05:39:30 +0000 (22:39 -0700)]
add Panelolu2 (which is virtually identical to viki)
Jim Morris [Sat, 6 Jul 2013 04:20:24 +0000 (21:20 -0700)]
Fix potential race condition in panel startup
Jim Morris [Fri, 5 Jul 2013 04:55:32 +0000 (21:55 -0700)]
Merge pull request #200 from wolfmanjm/upstreamedge
Upstreamedge
Jim Morris [Fri, 5 Jul 2013 04:44:31 +0000 (21:44 -0700)]
add button_pause to button mask
Jim Morris [Fri, 5 Jul 2013 04:39:22 +0000 (21:39 -0700)]
rip out pause code from viki as it is now in panel
Logxen [Wed, 3 Jul 2013 17:48:23 +0000 (10:48 -0700)]
added pause to Panel and added led support for a button/led wing on smoothiepanel port0
Logxen [Wed, 3 Jul 2013 03:28:12 +0000 (20:28 -0700)]
enabled second mcp4451 digipot for 5driver Smoothieboard
Jim Morris [Tue, 2 Jul 2013 08:13:26 +0000 (01:13 -0700)]
Merge pull request #199 from wolfmanjm/upstreamedge
Add motors off to prepare screen
Jim Morris [Tue, 2 Jul 2013 08:09:53 +0000 (01:09 -0700)]
Add motors off to prepare screen
Allow for panel to change the numerb of screen lines available, default is still 4
Logxen [Mon, 1 Jul 2013 23:24:30 +0000 (16:24 -0700)]
better color support for Smoothiepanel
Logxen [Mon, 1 Jul 2013 21:20:23 +0000 (14:20 -0700)]
added color settings to Smoothiepanel and a cycling rainbow on the encoder
Jim Morris [Mon, 1 Jul 2013 19:18:33 +0000 (12:18 -0700)]
Merge pull request #198 from wolfmanjm/upstreamedge
change select button to press rather than release
Jim Morris [Mon, 1 Jul 2013 19:16:55 +0000 (12:16 -0700)]
change select button to press rather than release
Jim Morris [Mon, 1 Jul 2013 19:00:30 +0000 (12:00 -0700)]
Merge pull request #197 from wolfmanjm/feature/panel-updates
Feature/panel updates
Jim Morris [Mon, 1 Jul 2013 18:58:00 +0000 (11:58 -0700)]
Fix up down buttons incrementing decrementing values
Jim Morris [Mon, 1 Jul 2013 00:32:51 +0000 (17:32 -0700)]
add configurable i2c pins and frequency for viki
Logxen [Mon, 1 Jul 2013 10:05:21 +0000 (03:05 -0700)]
Integrated Wii Nunchuck and Classic Controller functionality into Smoothiepanel
Logxen [Sun, 30 Jun 2013 14:44:20 +0000 (07:44 -0700)]
Switch should now init with the correct analog and digital defaults
Logxen [Sun, 30 Jun 2013 14:36:57 +0000 (07:36 -0700)]
fixed small bug concerning startup_state in Switch init
Ben Gamari [Sat, 29 Jun 2013 05:56:22 +0000 (22:56 -0700)]
Merge pull request #196 from bgamari/edge
This fixes the brokenness in Switch since its merge with Button.
Ben Gamari [Sat, 29 Jun 2013 05:19:48 +0000 (01:19 -0400)]
Switch: Fix usage of std::string::compare
Ben Gamari [Sat, 29 Jun 2013 04:55:39 +0000 (00:55 -0400)]
Switch: Set switch_value default according to max_pwm of output
Previously the output was modulated with a very low duty cycle due to a
hard-coded default value of 1. Fixes #195.
Jim Morris [Thu, 27 Jun 2013 08:03:48 +0000 (01:03 -0700)]
Merge pull request #194 from wolfmanjm/fix/encoder-resolution
Fix encoder resolution
Jim Morris [Thu, 27 Jun 2013 07:56:34 +0000 (00:56 -0700)]
Fix encoder resolution
add config option to set menu_offset
Logxen [Thu, 27 Jun 2013 03:12:26 +0000 (20:12 -0700)]
Merge pull request #193 from logxen/smoothiepanel
Smoothiepanel lives! :D
Logxen [Thu, 27 Jun 2013 03:08:08 +0000 (20:08 -0700)]
Merge branch 'edge' into smoothiepanel
Logxen [Thu, 27 Jun 2013 03:06:15 +0000 (20:06 -0700)]
SMOOTHIEPANEL LIVES! :D
Jim Morris [Wed, 26 Jun 2013 23:05:35 +0000 (16:05 -0700)]
Merge pull request #192 from wolfmanjm/feature/change-panel-led-api
Feature/change panel led api
Jim Morris [Wed, 26 Jun 2013 23:01:18 +0000 (16:01 -0700)]
change the led api
add specific led function definitions
set bed and hotend leds on or off for viki
Jim Morris [Wed, 26 Jun 2013 22:04:44 +0000 (15:04 -0700)]
initial refactor of led
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 10:00:23 +0000 (03:00 -0700)]
Merge pull request #191 from wolfmanjm/fix/m17-m18
Fix M17/M18/M84
Jim Morris [Wed, 26 Jun 2013 09:58:00 +0000 (02:58 -0700)]
Fix M17/M18/M84
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