zaubentrucker/muele-marlin
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity
864 commits 1 branch 0 tags 156 MiB
Commit graph

768 commits

Author SHA1 Message Date
kiyoshigawa 4b19c8552e Fixing changed Configuration.h settings to be default values per ErikZalm Request. 2013-06-04 12:01:55 -06:00
Tim Anderson 594193c908 Merge remote-tracking branch 'upstream/Marlin_v1' into Marlin_v1 2013-05-06 23:29:38 -06:00
Tim Anderson 1fa61c297e Turning off Control Panel by Default and Updating the link to the LiquidCrystal_I2C library to avoid confusion. 2013-05-06 23:23:54 -06:00
kiyoshigawa b27a59f41e Added support for Elefu RA Board and Elefu Control Panel 2013-05-06 08:44:38 -06:00
midopple a65a26d6b4 If CORE_XY is in use X and Y Axis had to be activated at the same time 2013-05-05 19:23:59 +02:00
midopple db2f157a22 Replace the <= to < in the Command M907, M350 and M351. 
The for loop for Axis count over the Array.
Add a break after M907
 2013-05-05 19:19:55 +02:00
Arnoud fc4ab05157 Solved minor bug in controllerFan() 
Extruder 2 was checked where extruder 1 should be checked.
 2013-05-03 21:32:34 +02:00
Martin Renold 1a397825f9 fix DEFAULT_AXIS_STEPS_PER_UNIT minor Z rounding error 2013-05-01 08:30:24 +02:00
Lukasz Stefanowicz d71f1e9bf6 Add (as an option) slower SD transfer mode 2013-04-24 10:50:57 +02:00
ErikZalm db5bb8546d Merge pull request #452 from MStohn/Marlin_v1 
128x64 RepRapDiscount Full Graphic Smart Controller support
 2013-04-23 09:43:37 -07:00
daid 4b2ece159b Merge pull request #453 from brackendawson/Marlin_v1 
Make Gen7 1.4+ heater temp sensort pins match silkscreen.
 2013-04-16 10:12:25 -07:00
Bracken Dawson d5ee2a5a62 Make Gen7 1.4 heater pins match silkscreen 2013-04-16 17:37:38 +01:00
MaikStohn 7ac6d7f78e FIX: Speedup - no explicit display clear needed in u8glib 2013-04-16 14:22:24 +02:00
MaikStohn 13596e8722 Added RepRapDiscount FULL GRAPHIC Smart Controller 2013-04-16 14:21:39 +02:00
MaikStohn 3a6abe1d6e Removed STB custom font hack from u8glib library and moved to marlin project 2013-04-16 13:54:39 +02:00
MaikStohn 16afbf9bfa FIX: adopted latest changes from hitachi implementation 2013-04-16 13:51:48 +02:00
daid303 34bca48b98 Merge branch 'Marlin_v1' of github.com:ErikZalm/Marlin into Marlin_v1 2013-04-15 15:11:38 +02:00
daid303 ac52dcc174 Updated the card menu and watch messages to make it more informative. 2013-04-15 15:11:22 +02:00
Stefanowicz 31bb3fb297 Fix: Build error when EEPROM_SETTINGS is defined and PIDTEMP is undefined 2013-04-12 18:04:32 +02:00
daid303 c80a78bb70 Lower the default max E feedrate a bit. With the stepper fix this is much to high. 2013-04-12 13:54:38 +02:00
Simon Oliver 5d5909fc25 Fix failure to compile with heated bed: remove call to non-existant scaleBedPID(). 2013-04-12 13:32:47 +02: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
Bart K 4fa2260a59 Fixed cardreader.h to resolve issue #440 (Pull Request #425 missing file) 2013-03-31 19:59:16 -04:00
Erik van der Zalm 038d405254 Corrected #endif in language.h 2013-03-31 20:28:29 +02:00
Dirk Eichel 443aaa30bf Removed GIT fragments 
Seems that there was something wrong while merging
 2013-03-30 23:26:42 +01:00
ErikZalm 7f622467fc Merge pull request #425 from kefir-/m928_logging 
M928 logging
 2013-03-30 08:50:34 -07:00
ErikZalm 86867928ac Merge pull request #434 from DDRBoxman/Marlin_v1 
Add support for M300: Play beep sound
 2013-03-30 08:49:54 -07:00
ErikZalm 9a38cad6f0 Merge pull request #430 from STB3/GLCD_128x64_dots 
Final task of the 128x64dots GLCD implementation
 2013-03-30 08:49:14 -07:00
ErikZalm 7a5c474d91 Update Configuration.h 2013-03-28 21:27:50 +01:00
Dirk Eichel 4e448b700a Merged fetched files from Marlin_v1 branch 
Pull requests: #414 #433 #432 #428
 2013-03-26 21:43:04 +01:00
ErikZalm 9f2862ce48 Merge pull request #414 from whosawhatsis/Marlin_v1 
regenerated thermistor table 7
 2013-03-25 13:14:49 -07:00
ErikZalm 9fb8bd5685 Merge pull request #433 from whosawhatsis/bang-mode 
Separate PID_MAX from BANG_MAX
 2013-03-25 13:11:34 -07:00
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
 2013-03-25 10:42:27 -05:00
Colin Edwards 9a1c90471f Ignore unused beeper pins 2013-03-25 10:28:15 -05:00
Colin Edwards 1a0f889803 Add support for M300: Play beep sound 2013-03-24 23:35:05 -05:00
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.
 2013-03-22 18:16:26 -07:00
blddk e5a853a3d0 Added automated extruder fan function 2013-03-22 18:49:05 +01:00
blddk 72419f69a9 Added rumba 2013-03-22 18:41:54 +01:00
blddk 91bea43332 Added rumba pinout 2013-03-22 18:29:47 +01:00
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.
 2013-03-22 18:28:16 +01:00
Dirk Eichel 6c66cae694 GLCD init screen cosmetics 2013-03-19 21:25:11 +01:00
Dirk Eichel f3e0e5184d Add include selector between char. LCD and GLCD 2013-03-19 20:59:21 +01:00
Dirk Eichel 5d3862f9d1 Modified u8glib logo on welcome screen 2013-03-19 20:32:23 +01:00
Dirk Eichel 0b320f75e9 Removed debug code, add some comments 2013-03-19 20:29:25 +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
Dirk Eichel 26d8863111 Add library selection between GLCD and char. LCD 2013-03-19 20:03:47 +01:00
Dirk Eichel 4a141a694f Marlin code for GLCD display 
This contains the menues, status screen etc...
 2013-03-19 19:59:56 +01:00
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
 2013-03-19 19:57:35 +01:00
Dirk Eichel 233df9cca0 Add missing LF at the end of the file 2013-03-19 19:12:33 +01:00