This repository has been archived on 2022-01-28. You can view files and clone it, but cannot push or open issues or pull requests.
Marlin-Artillery-M600/Marlin
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
..
cardreader.cpp Add command M928 to enable logging to file of received gcode commands 2013-03-16 23:02:57 +01:00
cardreader.h Fixed cardreader.h to resolve issue #440 (Pull Request #425 missing file) 2013-03-31 19:59:16 -04:00
Configuration.h Update Configuration.h 2013-03-28 21:27:50 +01:00
Configuration_adv.h Added a feature to have filament change by gcode or display trigger. 2013-01-27 13:21:34 +01:00
ConfigurationStore.cpp Allow Edit menu to call fn after edit; Fix PID Ki and Kd display in menus; Actually use changed PID and Max Accel values 2013-04-12 13:31:30 +02:00
ConfigurationStore.h 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
COPYING first commit 2011-08-12 22:28:35 +02:00
create_speed_lookuptable.py Added 20MHz support. 2012-03-11 12:25:04 +01:00
createTemperatureLookupMarlin.py Added new temperature lookup table creation tool. This one uses stein hart-hart equations. 2012-11-16 23:51:05 +01:00
dogm_lcd_implementation.h GLCD init screen cosmetics 2013-03-19 21:25:11 +01:00
DOGMbitmaps.h Add bitmap graphics for GLCD 2013-03-19 19:57:35 +01:00
fastio.h Use the same fastio.h definition for AT90USB1286/7 and AT90USB646/7. 2012-12-08 15:16:38 -08:00
language.h Allow Edit menu to call fn after edit; Fix PID Ki and Kd display in menus; Actually use changed PID and Max Accel values 2013-04-12 13:31:30 +02:00
LCD Menu Tree.pdf Added PDF file containing Menu Tree for documentation purposes. Source xlsx document included. 2012-08-29 21:08:41 +01:00
LiquidCrystalRus.cpp 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
LiquidCrystalRus.h Enables support the Cyrillic alphabet for LCD 2012-10-12 19:06:43 +04:00
Makefile fixes for ramps compilation using installed arduino ide 2013-01-08 12:54:31 +01:00
Marlin.h Added libraries from Arduino 1.0.3 for sanguino build 2013-01-07 17:26:50 +01:00
Marlin.pde Add library selection between GLCD and char. LCD 2013-03-19 20:03:47 +01:00
Marlin_main.cpp Allow Edit menu to call fn after edit; Fix PID Ki and Kd display in menus; Actually use changed PID and Max Accel values 2013-04-12 13:31:30 +02:00
MarlinSerial.cpp Stop redefining MOTHERBOARD and #define AT90USB instead. Also put #ifndef AT90USB around the HardwareSerial_h trick, so now Printrboard / Brainwave support compiles on Arduino 1.0.2 as well. 2012-12-09 01:32:09 -08:00
MarlinSerial.h Stop redefining MOTHERBOARD and #define AT90USB instead. Also put #ifndef AT90USB around the HardwareSerial_h trick, so now Printrboard / Brainwave support compiles on Arduino 1.0.2 as well. 2012-12-09 01:32:09 -08:00
Menu Plans.xlsx Tidy up 2012-08-29 22:53:41 +01:00
motion_control.cpp software_endstops: use *_MIN_POS and *_MAX_POS for arcs 2012-08-10 19:36:30 +01:00
motion_control.h Removed interrupt nesting in the stepper ISR. 2011-11-27 21:12:55 +01:00
pins.h Merge pull request #434 from DDRBoxman/Marlin_v1 2013-03-30 08:49:54 -07:00
planner.cpp Allow Edit menu to call fn after edit; Fix PID Ki and Kd display in menus; Actually use changed PID and Max Accel values 2013-04-12 13:31:30 +02:00
planner.h Allow Edit menu to call fn after edit; Fix PID Ki and Kd display in menus; Actually use changed PID and Max Accel values 2013-04-12 13:31:30 +02:00
Sd2Card.cpp Fix for a few -Wextra warnings. 2012-11-12 15:35:28 +01:00
Sd2Card.h made sd code only compile with SDSUPPORT defined. safes 10k of codespace 2011-12-26 09:28:51 +01:00
Sd2PinMap.h made sd code only compile with SDSUPPORT defined. safes 10k of codespace 2011-12-26 09:28:51 +01:00
SdBaseFile.cpp Few simple fixes that save RAM, as static strings are stored in RAM by default. 2012-11-28 10:30:34 +01:00
SdBaseFile.h Added long filename support. 2012-08-22 14:49:57 +02:00
SdFatConfig.h Added long filename support. 2012-08-22 14:49:57 +02:00
SdFatStructs.h Added long filename support. 2012-08-22 14:49:57 +02:00
SdFatUtil.cpp Updated SERIAL define to MYSERIAL, because Arduino 1.0 defines SERIAL as 0. 2012-02-11 16:02:47 +01:00
SdFatUtil.h made sd code only compile with SDSUPPORT defined. safes 10k of codespace 2011-12-26 09:28:51 +01:00
SdFile.cpp 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
SdFile.h made sd code only compile with SDSUPPORT defined. safes 10k of codespace 2011-12-26 09:28:51 +01:00
SdInfo.h made sd code only compile with SDSUPPORT defined. safes 10k of codespace 2011-12-26 09:28:51 +01:00
SdVolume.cpp made sd code only compile with SDSUPPORT defined. safes 10k of codespace 2011-12-26 09:28:51 +01:00
SdVolume.h made sd code only compile with SDSUPPORT defined. safes 10k of codespace 2011-12-26 09:28:51 +01:00
speed_lookuptable.h Made the 2nd speed lookup table condition more explicit. 2012-11-11 12:02:48 +01:00
stepper.cpp Merge pull request #1 from illuminarti/Fix_E_Speed 2013-03-18 23:36:11 +01:00
stepper.h 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
temperature.cpp Allow Edit menu to call fn after edit; Fix PID Ki and Kd display in menus; Actually use changed PID and Max Accel values 2013-04-12 13:31:30 +02:00
temperature.h Allow Edit menu to call fn after edit; Fix PID Ki and Kd display in menus; Actually use changed PID and Max Accel values 2013-04-12 13:31:30 +02:00
thermistortables.h Merge pull request #414 from whosawhatsis/Marlin_v1 2013-03-25 13:14:49 -07:00
ultralcd.cpp Allow Edit menu to call fn after edit; Fix PID Ki and Kd display in menus; Actually use changed PID and Max Accel values 2013-04-12 13:31:30 +02:00
ultralcd.h Add variable for animated fan, add float conversion w/o sign 2013-03-19 20:13:23 +01:00
ultralcd_implementation_hitachi_HD44780.h Allow Edit menu to call fn after edit; Fix PID Ki and Kd display in menus; Actually use changed PID and Max Accel values 2013-04-12 13:31:30 +02:00
watchdog.cpp Fix compiling the watchdog error message when the manual reset watchdog is used. 2012-12-06 10:27:50 +01:00
watchdog.h 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