Commit graph

23 commits

Author SHA1 Message Date
lajos
b519af4f05 fixed another !defined(PIDTEMP) compile in ultralcd.cpp 2013-06-15 20:49:18 -04:00
lajos
7d03c52511 fixed compile error in ultralcd.cpp when PIDTEMP undefined 2013-06-15 18:09:52 -04:00
Scott Lahteine
5dabc95409 Apply all changes from latest Marlin_V1
Diffed and merged, preserving my updates
2013-06-06 15:49:25 -07:00
Simon Oliver
93f0463b21 Allow Edit menu to call fn after edit; Fix PID Ki and Kd display in menus; Actually use changed PID and Max Accel values
Add new 'callback' edit-menu types that call a function after the edit is done. Use this to display and edit Ki and Kd correctly (removing the scaling first and reapplying it after). Also use it to reset maximum stepwise acceleration rates, after updating mm/s^2 rates via menus. (Previously, changes did nothing to affect planner unless saved back to EEPROM, and the machine reset).

Add calls to updatePID() so that PID loop uses updated values whether set by gcode (it already did this), or by restoring defaults, or loading from EEPROM (it didn't do those last two). Similarly, update the maximum step/s^2 accel rates when the mm/s^2 values are changed - whether by menu edits, restore defaults, or EEPROM read.

Refactor the acceleration rate update logic, and the PID scaling logic, into new functions that can be called from wherever, including the callbacks.

Add menu items to allow the z jerk and e jerk to be viewed/edited in the Control->Motion menu, as per xy jerk.

Conflicts:
	Marlin/language.h
2013-04-12 13:31:30 +02:00
Dirk Eichel
f3e0e5184d Add include selector between char. LCD and GLCD 2013-03-19 20:59:21 +01:00
Dirk Eichel
5f1cd70122 Add code to lcd_update() for GLCD
This code selects between the routines for the GLCD or the char.
display.
2013-03-19 20:19:16 +01:00
Dirk Eichel
a49c09a776 Add variable for animated fan, add float conversion w/o sign
A new variable was introduced to allow fan animation on the GLCD.
Add additional float to string conversion routine without sign
character. This is used for the coordinates visualisation on the GLCD.
2013-03-19 20:13:23 +01:00
daid303
de3dec7215 Also show the tune menu when USB printing. 2013-02-20 00:54:44 +01:00
Dirk Eichel
c8f1fbd9d8 Add SD-Card change and SD-Card init.
Add SD-Card change and SD-Card init. for reprap electronics without
SD-Chard change detect pin.
2013-02-12 17:35:46 +01:00
Marius Kintel
f24f02e212 compile fix: quickStop() needs stepper.h 2013-01-31 10:43:03 -05:00
Bernhard
1d06b10962 Added a feature to have filament change by gcode or display trigger.
[default off for now]
syntax: M600  X[pos] Y[pos] Z[relative lift] E[initial retract] L[later retract distance for removal]

if enabled, after a M600, the printer will retract by E, lift by Z, move to XY, retract even more filament.
Oh, and it will display "remove filament" and beep like crazy.

You are then supposed to insert a new filament (other color, e.g.) and click the display to continue.
After having the nozzle cleaned manually, aided by the disabled e-steppers.
After clicking, the printer will then go back the whole shebang, and continue printing with a fancy new color.
2013-01-27 13:21:34 +01:00
Kevin O'Connor
3f2f94ef28 Be consistent in setting of the fan PWM.
Always set the FAN PWM value in check_axes_activity() and always use
the value of the active move if a move is active.
2013-01-08 18:49:18 -05:00
daid303
921273baa0 Added optional feature to stop printing when an endstop is hit. Made the Z display on the LCD in 3.2 format instead of 3.1. Added LCD message when and endstop is hit. 2013-01-08 11:53:18 +01:00
daid303
01aac2a142 Small changes on the LCD panel, let the speed control work better, line up the parameter edit the same as the menu, remove some unused defines, and remove the Z from the 10mm move menu. 2012-12-21 16:14:47 +01:00
daid303
a95dcd74e7 Fix some of the duplicated PSTRs, saving 500bytes of flash with LCD on. 2012-12-17 11:09:09 +01:00
daid303
047d037f8c #ifdef fix for #326 2012-12-13 09:04:41 +01:00
daid303
1a8f54cea1 The big LCD code update. This splits the display and menu implementation. Paving the way for future different displays. It also makes it easier to modify the menu structures while keeping everything consistant. Note that this most likely breaks the translations, which need to be updated. 2012-12-12 11:47:03 +01:00
daid303
6a9bee27cc Changed the naming of some LCD functions, so the names match better what the function does. Also moved around some prototypes for general cleanup. 2012-12-03 12:52:00 +01:00
daid303
a2032afa3a Fixed #303 2012-11-12 21:04:07 +01:00
daid303
f4a89ec776 SDCARDINSERTED is always defined, and thus we do not need the #ifdefs. 2012-11-12 09:16:27 +01:00
daid303
12a4d60e18 Fix the EEPROM storage, no longer inline it at multiple locations, and remove the template. 2012-11-07 10:02:45 +01:00
daid303
f6ff0ab767 signed/unsigned fixes. 2012-11-06 15:33:49 +01:00
daid303
06b58a9c4f First cleanup. Moved all code to cpp files, so there are no dependencies on pde files. And no more odd requirement to cat files together. (Still need to fix the Makefile). Also cleaned up some defines and made defines upper case as by C coding conventions. 2012-11-06 12:06:41 +01:00
Renamed from Marlin/ultralcd.pde (Browse further)