melch
/
Marlin
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
15,367 Commits
2 Branches
0 Tags
2.0 GiB
x301
2.0.x
Branches Tags
${ item.name }
Create tag ${ searchTerm }
Create branch ${ searchTerm }
from '643f192515'
${ noResults }
Commit Graph

15367 Commits (643f1925150b8c2a72a3e6ffa19bc63f1255e20a)
 

Author SHA1 Message Date
daid303 ac52dcc174 Updated the card menu and watch messages to make it more informative. 12 years ago
daid 84920e9c58 Merge pull request #449 from Stefanowicz/Marlin_v1 
Fix: Build error when EEPROM_SETTINGS is defined and PIDTEMP is undefined
 12 years ago
Stefanowicz 31bb3fb297 Fix: Build error when EEPROM_SETTINGS is defined and PIDTEMP is undefined 12 years ago
daid303 c80a78bb70 Lower the default max E feedrate a bit. With the stepper fix this is much to high. 12 years ago
Simon Oliver 5d5909fc25 Fix failure to compile with heated bed: remove call to non-existant scaleBedPID(). 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
ErikZalm 1f74ef4157 Merge pull request #441 from bkpsu/Marlin_v1 
Fixed cardreader.h to resolve issue #440 (Pull Request  #425 missing file)
 12 years ago
Bart K 4fa2260a59 Fixed cardreader.h to resolve issue #440 (Pull Request #425 missing file) 12 years ago
Erik van der Zalm 038d405254 Corrected #endif in language.h 12 years ago
ErikZalm 2438b34df9 Merge pull request #439 from STB3/Marlin-language.h-repair 
Removed GIT fragments from language.h
 12 years ago
Dirk Eichel 443aaa30bf Removed GIT fragments 
Seems that there was something wrong while merging
 12 years ago
ErikZalm 7f622467fc Merge pull request #425 from kefir-/m928_logging 
M928 logging
 12 years ago
ErikZalm 86867928ac Merge pull request #434 from DDRBoxman/Marlin_v1 
Add support for M300: Play beep sound
 12 years ago
ErikZalm 9a38cad6f0 Merge pull request #430 from STB3/GLCD_128x64_dots 
Final task of the 128x64dots GLCD implementation
 12 years ago
ErikZalm 7a5c474d91 Update Configuration.h 12 years ago
Dirk Eichel 4e448b700a Merged fetched files from Marlin_v1 branch 
Pull requests: #414 #433 #432 #428
 12 years ago
Dirk Eichel fa58be3cb8 Merge remote-tracking branch 'upstream/Marlin_v1' into Marlin_v1 12 years ago
ErikZalm 9f2862ce48 Merge pull request #414 from whosawhatsis/Marlin_v1 
regenerated thermistor table 7
 12 years ago
ErikZalm 9fb8bd5685 Merge pull request #433 from whosawhatsis/bang-mode 
Separate PID_MAX from BANG_MAX
 12 years ago
ErikZalm aa816ee81c Merge pull request #432 from blddk/Marlin_v1 
HTML removed, Rumba added
 12 years ago
Colin Edwards 0d075378d5 Add LARGE_FLASH define and enable it for some of the beefier boards 
The LARGE_FLASH flag allows superfluous features to be excluded
on boards with less memory
 12 years ago
Colin Edwards 9a1c90471f Ignore unused beeper pins 12 years ago
Colin Edwards 1a0f889803 Add support for M300: Play beep sound 12 years ago
Robert F-C 9322c408c6 Updated for LiquidTWI2 library version 1.2.3 
The new version of the library means that PANELOLU no longer needs to be
defined in LiquidTWI.h (the library file can be used as is) and the new
version of the library also enables the buzzer on the Panucatt VIKI
panel.
 12 years ago
whosawhatsis fd5b7e0cec Separate PID_MAX from BANG_MAX 
This allows PID_FUNCTIONAL_RANGE to use a maximum duty cycle higher
than PID_MAX. This is useful for powerful heaters to heat quickly in
bang-bang mode, but use a lower duty cycle that is easier to stabilize
in PID mode.
 12 years ago
blddk e5a853a3d0 Added automated extruder fan function 12 years ago
blddk 72419f69a9 Added rumba 12 years ago
blddk 91bea43332 Added rumba pinout 12 years ago
blddk d2b00fe486 Removed html and added rumba 
Found some unwanted html at the bottom of the file which caused it to not be able to compile.
Also added rumba as machine.
 12 years ago
Dirk Eichel 6c66cae694 GLCD init screen cosmetics 12 years ago
Dirk Eichel f3e0e5184d Add include selector between char. LCD and GLCD 12 years ago
Dirk Eichel 5d3862f9d1 Modified u8glib logo on welcome screen 12 years ago
Dirk Eichel 0b320f75e9 Removed debug code, add some comments 12 years ago
Dirk Eichel 5f1cd70122 Add code to lcd_update() for GLCD 
This code selects between the routines for the GLCD or the char.
display.
 12 years ago
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.
 12 years ago
Dirk Eichel 26d8863111 Add library selection between GLCD and char. LCD 12 years ago
Dirk Eichel 4a141a694f Marlin code for GLCD display 
This contains the menues, status screen etc...
 12 years ago
Dirk Eichel 83c790a020 Add bitmap graphics for GLCD 
1. Marlin welcome screen
2. Status screen symbols 3 Extruders, heated bed, animated fan logo 1
3. Status screen symbols 3 Extruders, heated bed, animated fan logo 2
 12 years ago
Dirk Eichel c28e71a1bf Reduced u8glib SPI speed to fosc/8 
Makes the lib compatible with most LCDs
 12 years ago
Dirk Eichel ee8feb9dee Add Marlin (reprap) specific fonts 6x10, 6x9 
Font size 6x10 with feedrate symbol & Font size 6x9.
 12 years ago
Dirk Eichel c8e2f44087 Add u8glib library supporting dot matrix displays 
https://code.google.com/p/u8glib/
Universal Graphics Library for 8 Bit Embedded Systems
 12 years ago
Dirk Eichel 7417423691 Merge remote-tracking branch 'origin/Marlin_language_file_fix' into GLCD_128x64_dots 12 years ago
ErikZalm 590225be25 Merge pull request #428 from ryanturner/Marlin_v1 
Adding Maker's Tool Works heated bed thermistor
 12 years ago
Dirk Eichel a0e41c0970 Merge remote-tracking branch 'upstream/Marlin_v1' into Marlin_v1 12 years ago
Dirk Eichel 233df9cca0 Add missing LF at the end of the file 12 years ago
Dirk Eichel bb0de75a92 Removed umwanted HTML code ath the end of the file 
Sorry for that. This does not lead to compile errors. I removed the
unwanted code to make it clean.
 12 years ago
Ryan Turner 7c47e7162d Adding Maker's Tool Works heated bed thermistor 12 years ago
daid af78d0cbfa Merge pull request #1 from illuminarti/Fix_E_Speed 
Fix step rate bug (especially for retraction)
 12 years ago
Dirk Eichel 9a78f321a4 Add pins for Motherboard variant 64 
These definition contain also the definition for the graphics LCD.
 12 years ago
Dirk Eichel 5de25ccd20 Add Motherboard variant 64 - STB V1.1 
Definition for the graphic LCD are already in it, they will not harm the
configuration as they are only defined constants
 12 years ago