35 Commits (e99f24ff2f3adcafe64be55598f4fb8d7cb46d68)

Author SHA1 Message Date
John Davis e99f24ff2f Update planner.h
Changed level and leveling to compensation.
10 years ago
Scott Lahteine 07c6b5ab71 Using axis constants 10 years ago
Justin Nesselrotte 07c0eeee99 Fixed a comment in the planner 11 years ago
Alex Borro 253dfc4bc1 Bed Auto Leveling feature
Check the Readme for instruction how to enable and configure the feature
11 years ago
Scott Lahteine 5dabc95409 Apply all changes from latest Marlin_V1
Diffed and merged, preserving my updates
12 years ago
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
12 years ago
Bernhard Kubicek 451f9cc6d1 Residual in the comments: there are no more mm/minutes but only mm/sec in the planner buffer. 13 years ago
Erik van der Zalm e056bf8081 Added E-Jerk 13 years ago
Erik van der Zalm aac7aa3bf0 Queued fan control. Issue #90 13 years ago
Daid 88d289caa1 Made plan_buffer_line arguments const, which optimizes better and fixes the RUNOUT_PREVENTION feature. 13 years ago
Erik van der Zalm a0a1f81913 various changes 13 years ago
Bernhard 57f9359a41 simplified the includes, makefile now works with arduino23 13 years ago
Bernhard 3c1a4aac2b header file simplification 13 years ago
Erik van der Zalm 84d9cf7339 merging 13 years ago
Bernhard 2bc5e7ec9e prevent too long extrudes, or too cold extrudes 13 years ago
Bernhard 61c943b4bf fixed the st_synchronize. it would have continued if there is only the last move of the buffer being stepped. 13 years ago
Denis B 4fd75dc813 Working version of multiple extruders (up to 3)
- The temperature control is pretty much complete
  (not sure what to do w/ autotemp though)
  Changed the pins assignment to clearly separate bed and extruder heaters
  and temp sensors, changed a bit how termistor tables are handled.
- The steppers control is rudimentary
  (only chanages what pins it uses depending on the active_extruder var,
   but that's enough for switching extruder in the start.gcode in the
   the profiles)
- Tested only w/ RAMPS 1.4
13 years ago
Erik van der Zalm 6b86f15686 More 2nd extruder implementation. (Not usable)
Advance (not tested)
13 years ago
Bernhard 0bc9daa4f7 make it compile with arduino 1.0 ; function is still untested. 13 years ago
Bernhard b0c3871750 more fixing of the sanguino math round problem 13 years ago
Bernhard 311627141b Merge branch 'smallopt' into Marlin_v1
Conflicts:
	Marlin/temperature.h
13 years ago
Erik van der Zalm f75f426dfa Removed interrupt nesting in the stepper ISR.
Add serial checkRx in stepper ISR.
Copied HardwareSerial to MarlinSerial (Needed for checkRx).
13 years ago
Bernhard 26a1de1e44 force inline 13 years ago
Bernhard f8e170a44b planner optimization by inline functions 13 years ago
Erik van der Zalm aad4b75b94 First parts 2nd extruder 13 years ago
Erik van der Zalm c0f8c9fd72 Seperate ENDSTOP_INVERTING for X Y and Z
Added simple endstop filter.
Corrected M114 count display.
13 years ago
Bernhard Kubicek 5535e51bf6 Yes, thats the beta. 13 years ago
Bernhard Kubicek 379ea642e1 make tuneing sub-menu. 13 years ago
Erik van der Zalm 915ef2d4a1 Added software endstops 13 years ago
Bernhard Kubicek 8a08b8e07e trying to get autotemp to work. 13 years ago
Bernhard Kubicek a9c7da06e3 and changed ultipanel to have the mm/sec and not mm/min
Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into Marlin_v1

Conflicts:
	Marlin/Marlin.pde
	Marlin/ultralcd.h
13 years ago
Bernhard Kubicek 36958ee305 minor changes and first not-well working version of autotemp 13 years ago
Bernhard Kubicek 1d171e9e52 reformating and some minor bugs/things found on the way. 13 years ago
Bernhard Kubicek 00674af3a8 merge from the branch bkubicek/Marlin/zalmmerge 13 years ago
Erik van der Zalm 094afe7c10 Merged Marlin, Marlin non gen6 and Ultimaker changes 13 years ago