bissen21/Marlin_Firmware
1
0
Fork 0
Code Issues Pull Requests Projects Releases 4 Wiki Activity
14,218 Commits 1 Branch 4 Tags
1f55986ed2aeb9db30b2438b125aa8ce64a5f09f
Commit Graph

14218 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Scott Lahteine
89fe77468d Merge pull request #1586 from maverikou/delta_auto_bed_level 
Delta auto bed level (Updated PR)
 2015-03-16 18:17:11 -07:00
CONSULitAS
2b1ddc0413 Merge remote-tracking branch 'upstream/Development' into Development 2015-03-16 22:12:17 +01:00
alexborro
cb676cdf39 Fix CoreXY homing bug introduced by PR #1606 
The Check Endstop logic must be:

if (current_block->steps_x != current_block->steps_y || (TEST(out_bits,
X_AXIS) == TEST(out_bits, Y_AXIS)))
if (TEST(out_bits, X_HEAD))

not

if (TEST(out_bits, X_HEAD) && (current_block->steps_x !=
current_block->steps_y || (TEST(out_bits, X_AXIS) == TEST(out_bits,
Y_AXIS))))

Same applies for Y axis.
 2015-03-16 16:31:25 -03:00
AnHardt
8a29dd4839 Cleaned typo in dogm_lcd_implementation.h 2015-03-16 20:18:48 +01:00
AnHardt
7e69f72db6 Moved font directory. Updated README.fonts 2015-03-16 17:27:27 +01:00
AnHardt
00b162a993 Merge remote-tracking branch 'origin/utf-kanji' into tm-utf-minus-kanji 
Conflicts:
	Marlin/language.h
Conflict cleaned
 2015-03-16 17:13:49 +01:00
AnHardt
e38dd5f030 Merge remote-tracking branch 'origin/utf' into utf-kanji 2015-03-16 17:00:54 +01:00
AnHardt
08e4651ece Corrected cyrillic font again 
Thank you @Nprod.
 2015-03-16 16:59:14 +01:00
Wurstnase
752c804677 remove offset, add minimum scan area 2015-03-16 15:13:16 +01:00
Wurstnase
14f0250853 allow negative values 
and some more comments
 2015-03-16 14:26:59 +01:00
AnHardt
e6cb8ee188 Remove 6x9 font 
in dogm_lcd_implementation.h
by using standard font and
shifting down temperature displays by one pixel
Saves 2300 bytes.
 2015-03-16 11:18:27 +01:00
maverikou
e93eb3e8d3 Update test 2015-03-16 09:16:00 +02:00
maverikou
b8ae3feb9e Update test 2015-03-16 09:03:15 +02:00
maverikou
3570447ded Fix Z_RAISE_AFTER_PROBING 2015-03-16 08:35:49 +02:00
maverikou
8a739b6fba Merge branch 'Development' into delta_auto_bed_level 
Conflicts:
	Marlin/Marlin_main.cpp
 2015-03-16 08:24:26 +02:00
Scott Lahteine
cbe4496123 Merge pull request #1616 from thinkyhead/topo_map_origin 
Move TOPO_ORIGIN define to Configuration.h
 2015-03-15 22:55:54 -07:00
Scott Lahteine
7629c4f05c Cleanup for menu optimization 
- Compare pr_char to space
- Fewer calls to lcd_strlen
 2015-03-15 22:54:54 -07:00
Scott Lahteine
3405f85a6a Reduce size of menu code 
- Get rid of _selected functions, passing selected state instead
 2015-03-15 22:02:33 -07:00
Edward Patel
e983a5ab92 Disable option. Enable for use/test. 2015-03-16 02:50:11 +01:00
Edward Patel
f34b9c83d1 Added comment about MESH_NUM axis points. 2015-03-16 01:48:46 +01:00
Scott Lahteine
a686c9878f Move TOPO_ORIGIN define to Configuration.h 
- Addressing issue #1608
 2015-03-15 15:49:36 -07:00
Edward Patel
8005d22c81 Added menu option for bed leveling. 2015-03-15 23:24:32 +01:00
Edward Patel
0e51e53813 WIP. Adding bed leveling code. 2015-03-15 23:24:32 +01:00
Scott Lahteine
d0d12962e0 Merge pull request #1615 from AnHardt/fix-1611 
Fix #1611
 2015-03-15 15:19:02 -07:00
Scott Lahteine
3f34d9d44e Merge pull request #1614 from AnHardt/fix-1612 
Fix for #1612
 2015-03-15 15:18:24 -07:00
AnHardt
f0dcea7e14 Fix #1611 
Warning: suggest parentheses around comparison in operand of &

pretty much helped.
 2015-03-15 22:52:50 +01:00
AnHardt
28b1c37dea Fix for #1612 2015-03-15 21:35:33 +01:00
CONSULitAS
a8c1bdabd2 Update: readme.md for K8200 example 
* readme.md: updated typo and URLs
 2015-03-15 17:25:31 +01:00
AnHardt
2f374f1465 Removed Kanji. 2015-03-15 16:44:37 +01:00
Scott Lahteine
5efc798642 Merge pull request #1546 from apollo-ng/pr-felix 
Added support for Felix 2.0/3.0 printers
 2015-03-15 07:52:22 -07:00
Scott Lahteine
b83e52e50f Merge pull request #1467 from thinkyhead/marlin_configurator 
Configurator utility
 2015-03-15 07:49:19 -07:00
Scott Lahteine
7bc77dc134 Merge pull request #1583 from galexander1/m404fix 
M404 should not use 'N' address as parameter because 'N' is reserved
 2015-03-15 07:47:30 -07:00
Scott Lahteine
3aadaa7677 Merge pull request #1609 from thinkyhead/fix_fan_pin_issue 
Fix controllerFan() code
 2015-03-15 07:33:34 -07:00
Scott Lahteine
b80ed51fcc Fix controllerFan() code 
- Add support for 4th extruder
- Fix parentheses matching
- Apply coding standards
- Address issue mentioned at #1575
 2015-03-15 06:55:31 -07:00
Scott Lahteine
4b50205f11 Merge branch 'Development' into marlin_configurator 
Latest upstream changes
 2015-03-15 06:37:32 -07:00
Scott Lahteine
bb4cb1b15a Merge pull request #1606 from thinkyhead/cleanup_stepper 
Cleanup of stepper.cpp
 2015-03-15 06:05:08 -07:00
Scott Lahteine
63f41f56f8 Merge pull request #1607 from chris-bo/Development 
Update ultralcd_st7920_u8glib_rrd.h
 2015-03-15 01:04:40 -07:00
Scott Lahteine
4eabd80025 Fix babystep for extruder_duplication 2015-03-14 18:31:25 -07:00
alexborro
d3259d0dba Merge pull request #1581 from msutas/Development 
Filament Runout Sensor Feature
 2015-03-14 18:35:20 -03:00
AnHardt
25c4f17e5d Corrected Cyrillic fonts. Round II. 2015-03-14 15:10:45 +01:00
chris-bo
b73ba26b23 Update ultralcd_st7920_u8glib_rrd.h 2015-03-14 14:31:00 +01:00
Scott Lahteine
901c3c5392 Merge pull request #1603 from thinkyhead/issue_1523_compiler_error 
Simplify manage_heater
 2015-03-14 05:20:18 -07:00
Scott Lahteine
c37f7d15c9 - Rename WRITE_E_STEP for consistency 
- Add BIT and TEST macros
- Add _APPLY_ macros to stepper.cpp to help with consolidation
- Consolidate code in stepper.cpp using macros
- Apply standards in stepper.cpp
- Use >= 0 instead of > -1 as a better semantic
- Replace DUAL_Y_CARRIAGE with Y_DUAL_STEPPER_DRIVERS
 2015-03-14 04:28:22 -07:00
AnHardt
44a205d9d9 Corrected Cyrillic fonts. 
Cleaned typo in language_test.h Cyrillic part.
 2015-03-14 12:27:47 +01:00
chrono
4d878b9bac Fixed path typos in README 2015-03-14 10:18:12 +00:00
chrono
12ec557a75 Added DEFAULT_TRAVEL_ACCELERATION 2015-03-14 10:14:13 +00:00
chrono
1d25d510bc Upstream Merge Fixes 2015-03-14 09:48:30 +00:00
chrono
a89d690b77 Merge remote-tracking branch 'upstream/Development' into pr-felix 2015-03-14 09:25:43 +00:00
Scott Lahteine
cb57fc727d Declare pid_output for PIDBEDTEMP 2015-03-13 20:19:51 -07:00
Scott Lahteine
3d6deb9bdf Simplify manage_heater 
- Make separate get_pid_output(e) and get_pid_output_bed() function
- Reduce size of manage_heater function
- Hopefully work around linker errors
 2015-03-13 19:49:41 -07:00