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

1138 Commits (d69822ed51cfe36ffcbba555b90d010e9685dd3e)
 

Author SHA1 Message Date
Scott Lahteine 0ef54f2f85 Make M303 silent when "S0" is sent 
If S is left out perhaps it should be silent, but check the spec for
this M code.
 12 years ago
Scott Lahteine a200521eab Added CUSTOM_MENDEL_NAME option to Configuration.h and language.h 
Also cosmetic comment changes and spelling corrections in printed
messages
 12 years ago
daid 727aa2a051 Merge pull request #459 from martinxyz/fix-rounding-error 
fix DEFAULT_AXIS_STEPS_PER_UNIT minor Z rounding error
 12 years ago
Martin Renold 1a397825f9 fix DEFAULT_AXIS_STEPS_PER_UNIT minor Z rounding error 12 years ago
Robert F-C 289c02eda4 Remove unnecessary pin initialization in stepper.cpp 
(duplicates initialization in Marlin_main.cpp)
 12 years ago
Robert F-C d5ad7a0814 Rework change to incorporate CONTROLLERFAN 
Also refactor extruder auto fan logic to simplify further and now only
check every 2.5 seconds
 12 years ago
Robert F-C c3cdaceab3 Merge remote-tracking branch 'upstream/Marlin_v1' into Marlin_v1 12 years ago
Robert F-C 1c127217df Make DOGLCD merge neater. 12 years ago
Robert F-C 7f57f28ccc Add lcd_buzz function to ultralcd.h so that non-LCD code can make use of lcd's buzzer. 
Argument order of lcd_buzz was set to mirror that on tone(). Change
default M300 frequency to something audible.
 12 years ago
Robert F-C 788d62bcc4 Merge remote-tracking branch 'upstream/Marlin_v1' into Marlin_v1 
Conflicts:
	Marlin/Marlin.pde
	Marlin/ultralcd.cpp
	Marlin/ultralcd_implementation_hitachi_HD44780.h
 12 years ago
ErikZalm 4f96ad5621 Merge pull request #456 from Stefanowicz/Marlin_v1 
Add (as an option) slower SD transfer mode
 12 years ago
Lukasz Stefanowicz d71f1e9bf6 Add (as an option) slower SD transfer mode 12 years ago
ErikZalm db5bb8546d Merge pull request #452 from MStohn/Marlin_v1 
128x64 RepRapDiscount Full Graphic Smart Controller support
 12 years ago
daid 4b2ece159b Merge pull request #453 from brackendawson/Marlin_v1 
Make Gen7 1.4+ heater temp sensort pins match silkscreen.
 12 years ago
Bracken Dawson d5ee2a5a62 Make Gen7 1.4 heater pins match silkscreen 12 years ago
MaikStohn 7ac6d7f78e FIX: Speedup - no explicit display clear needed in u8glib 12 years ago
MaikStohn 13596e8722 Added RepRapDiscount FULL GRAPHIC Smart Controller 12 years ago
MaikStohn 3a6abe1d6e Removed STB custom font hack from u8glib library and moved to marlin project 12 years ago
MaikStohn 16afbf9bfa FIX: adopted latest changes from hitachi implementation 12 years ago
MaikStohn c83863d5d6 add U8glib library to Arduino1.x includes 12 years ago
daid303 34bca48b98 Merge branch 'Marlin_v1' of github.com:ErikZalm/Marlin into Marlin_v1 12 years ago
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