61de6ecd54
Added change to example Configuration.h's
11 years ago
2f0081bbb5
Compile error fix! Fix for merge artifacts.
11 years ago
0e6514e7bd
Bug fix! Missed putting z value back in right slot after zigzag mod.
11 years ago
ea10601406
Merge branch 'Development-Marlin' into Development
...
Conflicts:
Marlin/Configuration.h
Marlin/Marlin_main.cpp
11 years ago
cb02bc6db4
Merge pull request #1817 from AnHardt/dogm_looptest
...
Execute DOGM display-loop less often
11 years ago
f3597cf55a
Merge pull request #1818 from quillford/patch-1
...
Fixed scara directions
11 years ago
b02a55e60f
Fixed scara directions
...
Config said for a delta instead of for a scara
11 years ago
6c5f07c5cb
Merge pull request #1813 from thinkyhead/fixup_probing
...
Fix bad thermal runaway trigger
11 years ago
340d165a9c
Reduce display updates for dogm displays
...
In 'if (encoderPastThreshold || LCD_CLICKED)' lcdDrawUpdate was not set.
'lcd_status_update_delay'-loop was not effective in function
lcd_status_screen().
The loop prevented the update of the status screen but not the displays
update.
Shifted the loop into lcd_update().
11 years ago
418d22d7b3
Revert "Testloop cleanup"
...
This reverts commit 6361404b91
11 years ago
6361404b91
Testloop cleanup
...
Shifted condition should still be in.
11 years ago
6d4b3f0d6a
Move the condition before the loop
...
Result see: https://youtu.be/AEnBzdu9_tk
Dot is moving not so fast -> less executed loops.
11 years ago
4cb7dfc546
Move the 'alive dot' in every displayloop
...
Result see: https://www.youtube.com/watch?v=tdu7J0i-c4g
Loop is executed several times per display update.
11 years ago
b0f198c153
heater_index above its use
11 years ago
3d01492228
Update README.md
11 years ago
bf5dbb90c4
Update README.md
11 years ago
60f8e0386f
More thermal runaway states
11 years ago
f9dbd73652
Fix tr_target_temperature type - float!
11 years ago
c83faa9c5e
Merge pull request #1811 from thinkyhead/fixup_probing
...
Compare indices instead of floats for probe actions
11 years ago
cabd713610
Update README.md
11 years ago
f39e5988a3
Update README.md
11 years ago
20a047b8c5
Update README.md
11 years ago
a5e9263987
Update README.md
11 years ago
506a42338b
Update README.md
11 years ago
2f189be2e4
Update README.md
11 years ago
1836aa2615
Update README.md
11 years ago
61f8394361
Compare indices instead of floats for probe actions
11 years ago
a98183b463
Merge pull request #1809 from Wackerbarth/LanguageCleanup
...
Deferring default definition made #undef unnecessary
11 years ago
41ded7e996
Merge pull request #1805 from thinkyhead/fixup_probing
...
Optimize coordinate copying, fix EXTRUDER_RUNOUT_PREVENT
11 years ago
4119738e69
Deferring default definition made #undef unnecessary
11 years ago
6f06d33be5
Fix missing refresh_cmd_timeout function
11 years ago
2d099a2c70
Fix missing backslash in macro
11 years ago
0f9b29e6c5
Merge pull request #1803 from Natealus/Development
...
Z_PROBE_ENDSTOP Pin for Azteeg X3 Pro
11 years ago
0935084141
Fix manage_inactivity
...
- Document `manage_inactivity` function
- Allow `EXTRUDER_RUNOUT_PREVENT` to work with all extruders
- Use faster `memcpy` for copying coordinates
11 years ago
c065da52ec
Spacing and spelling
11 years ago
a3e129e091
Merge pull request #1801 from thinkyhead/fixup_probing
...
Minor optimizations
11 years ago
e8a711994a
Merge pull request #1802 from Natealus/Development
...
Compiling error temperature.cpp with multiple extruders defined
11 years ago
ab11f90da0
Z_PROBE_ENDSTOP Pin for Azteeg X3 Pro
...
Just a simple #ifdef Z_PROBE_ENDSTOP to define the pin for it. Also has
a couple commented lines for switching Z_MIN_PIN if needed.
11 years ago
8680b515b0
Fix missing tmp_extruder -> target_extruder
11 years ago
a6ba40ae48
Compiling error temperature.cpp with multiple extruders defined
...
It wouldn't compile because of this line in temperature.cpp it turns out
it was just a stray ( that didn't line up with the previous lines so I
just made it in line with the rest and it compiled fine.
11 years ago
fc3c76fc16
Fix #1800
11 years ago
c185912c19
Latest upstream commits, mostly
11 years ago
1e5c18bb14
Add code_value_short and SERIAL_CHAR
11 years ago
e0d4368cb5
Minor code cleanup, move NUM_AXIS out of config
11 years ago
4c7af484f8
Merge pull request #1787 from thinkyhead/fixup_tr
...
Fix: thermal_runaway_protection triggered by target temperature increase
11 years ago
c747becec1
Merge pull request #1796 from thinkyhead/pidbed_temp_eeprom
...
Add PIDTEMPBED to EEPROM
11 years ago
369a497300
Merge pull request #1797 from quillford/Development
...
Fixed README typos
11 years ago
84e4edaea7
Add M48 comment for #1794
11 years ago
9ba55baa5b
Track target temperature separately for each heater
11 years ago
528e32a1d4
Fix timeout in thermal_runaway when temperature is set higher
11 years ago
Edward Patel