melch/Marlin
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
3,565 Commits 2 Branches 0 Tags 2 GiB
7456710a1f
Commit Graph

3565 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Edward Patel
61de6ecd54 Added change to example Configuration.h's 2015-04-05 04:26:35 +02:00
Edward Patel
2f0081bbb5 Compile error fix! Fix for merge artifacts. 2015-04-05 04:16:16 +02:00
Edward Patel
0e6514e7bd Bug fix! Missed putting z value back in right slot after zigzag mod. 2015-04-05 04:13:34 +02:00
Edward Patel
ea10601406 Merge branch 'Development-Marlin' into Development 
Conflicts:
	Marlin/Configuration.h
	Marlin/Marlin_main.cpp
 2015-04-05 04:06:02 +02:00
Scott Lahteine
cb02bc6db4 Merge pull request #1817 from AnHardt/dogm_looptest 
Execute DOGM display-loop less often
 2015-04-04 17:29:56 -07:00
Scott Lahteine
f3597cf55a Merge pull request #1818 from quillford/patch-1 
Fixed scara directions
 2015-04-04 16:27:33 -07:00
quillford
b02a55e60f Fixed scara directions 
Config said for a delta instead of for a scara
 2015-04-04 15:26:35 -07:00
Scott Lahteine
6c5f07c5cb Merge pull request #1813 from thinkyhead/fixup_probing 
Fix bad thermal runaway trigger
 2015-04-04 14:41:43 -07:00
AnHardt
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().
 2015-04-04 22:02:24 +02:00
AnHardt
418d22d7b3 Revert "Testloop cleanup" 
This reverts commit 6361404b91.
 2015-04-04 18:33:36 +02:00
AnHardt
6361404b91 Testloop cleanup 
Shifted condition should still be in.
 2015-04-04 17:56:13 +02:00
AnHardt
6d4b3f0d6a Move the condition before the loop 
Result see: https://youtu.be/AEnBzdu9_tk
Dot is moving not so fast -> less executed loops.
 2015-04-04 17:49:39 +02:00
AnHardt
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.
 2015-04-04 17:34:28 +02:00
Scott Lahteine
b0f198c153 heater_index above its use 2015-04-04 06:18:08 -07:00
Bo Herrmannsen
3d01492228 Update README.md 2015-04-04 15:07:36 +02:00
Bo Herrmannsen
bf5dbb90c4 Update README.md 2015-04-04 15:06:13 +02:00
Scott Lahteine
60f8e0386f More thermal runaway states 2015-04-04 05:45:36 -07:00
Scott Lahteine
f9dbd73652 Fix tr_target_temperature type - float! 2015-04-04 05:25:53 -07:00
Scott Lahteine
c83faa9c5e Merge pull request #1811 from thinkyhead/fixup_probing 
Compare indices instead of floats for probe actions
 2015-04-04 05:14:59 -07:00
Bo Herrmannsen
cabd713610 Update README.md 2015-04-04 14:12:36 +02:00
Bo Herrmannsen
f39e5988a3 Update README.md 2015-04-04 14:09:59 +02:00
Bo Herrmannsen
20a047b8c5 Update README.md 2015-04-04 14:09:39 +02:00
Bo Herrmannsen
a5e9263987 Update README.md 2015-04-04 14:08:30 +02:00
Bo Herrmannsen
506a42338b Update README.md 2015-04-04 14:07:59 +02:00
Bo Herrmannsen
2f189be2e4 Update README.md 2015-04-04 14:07:20 +02:00
Bo Herrmannsen
1836aa2615 Update README.md 2015-04-04 14:02:58 +02:00
Scott Lahteine
61f8394361 Compare indices instead of floats for probe actions 2015-04-04 05:01:16 -07:00
Scott Lahteine
a98183b463 Merge pull request #1809 from Wackerbarth/LanguageCleanup 
Deferring default definition made #undef unnecessary
 2015-04-04 04:37:20 -07:00
Scott Lahteine
41ded7e996 Merge pull request #1805 from thinkyhead/fixup_probing 
Optimize coordinate copying, fix EXTRUDER_RUNOUT_PREVENT
 2015-04-04 03:49:54 -07:00
Richard Wackerbarth
4119738e69 Deferring default definition made #undef unnecessary 2015-04-04 05:48:07 -05:00
Scott Lahteine
6f06d33be5 Fix missing refresh_cmd_timeout function 2015-04-04 03:47:25 -07:00
Scott Lahteine
2d099a2c70 Fix missing backslash in macro 2015-04-04 03:35:16 -07:00
Scott Lahteine
0f9b29e6c5 Merge pull request #1803 from Natealus/Development 
Z_PROBE_ENDSTOP Pin for Azteeg X3 Pro
 2015-04-03 23:45:05 -07:00
Scott Lahteine
0935084141 Fix manage_inactivity 
- Document `manage_inactivity` function
- Allow `EXTRUDER_RUNOUT_PREVENT` to work with all extruders
- Use faster `memcpy` for copying coordinates
 2015-04-03 23:42:50 -07:00
Scott Lahteine
c065da52ec Spacing and spelling 2015-04-03 22:54:48 -07:00
Scott Lahteine
a3e129e091 Merge pull request #1801 from thinkyhead/fixup_probing 
Minor optimizations
 2015-04-03 22:30:01 -07:00
Scott Lahteine
e8a711994a Merge pull request #1802 from Natealus/Development 
Compiling error temperature.cpp with multiple extruders defined
 2015-04-03 22:14:12 -07:00
Natealus
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.
 2015-04-03 23:14:03 -06:00
Scott Lahteine
8680b515b0 Fix missing tmp_extruder -> target_extruder 2015-04-03 22:12:49 -07:00
Natealus
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.
 2015-04-03 23:09:31 -06:00
Scott Lahteine
fc3c76fc16 Fix #1800 2015-04-03 22:04:42 -07:00
Scott Lahteine
c185912c19 Latest upstream commits, mostly 2015-04-03 21:58:48 -07:00
Scott Lahteine
1e5c18bb14 Add code_value_short and SERIAL_CHAR 2015-04-03 21:43:30 -07:00
Scott Lahteine
e0d4368cb5 Minor code cleanup, move NUM_AXIS out of config 2015-04-03 20:45:24 -07:00
Scott Lahteine
4c7af484f8 Merge pull request #1787 from thinkyhead/fixup_tr 
Fix: thermal_runaway_protection triggered by target temperature increase
 2015-04-03 20:06:56 -07:00
Scott Lahteine
c747becec1 Merge pull request #1796 from thinkyhead/pidbed_temp_eeprom 
Add PIDTEMPBED to EEPROM
 2015-04-03 20:03:38 -07:00
Scott Lahteine
369a497300 Merge pull request #1797 from quillford/Development 
Fixed README typos
 2015-04-03 19:58:09 -07:00
Scott Lahteine
84e4edaea7 Add M48 comment for #1794 2015-04-03 19:52:00 -07:00
Scott Lahteine
9ba55baa5b Track target temperature separately for each heater 2015-04-03 19:42:40 -07:00
Scott Lahteine
528e32a1d4 Fix timeout in thermal_runaway when temperature is set higher 2015-04-03 19:34:55 -07:00