melch/Marlin
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
6,833 Commits 2 Branches 0 Tags 2 GiB
94ffb58da7
Commit Graph

6833 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
AnHardt
f8c4d43886 delta[3] is used with SCARA 
Shoot in the dark.
 2015-03-18 12:14:49 +01:00
AnHardt
72a9fed4fb codepos not used in gcode_M28() 
Got:
Marlin_main.cpp:2567: warning: unused variable 'codepos'

Needs revision.
Don't now how this should look like.
 2015-03-18 11:41:14 +01:00
AnHardt
b94dd33641 G4 could wait for an undefined time 
Got:
Marlin_main.cpp:1689: warning: 'codenum' may be used uninitialized in this function

And indeed codenum is undefined when no parameter is given.
 2015-03-18 11:23:41 +01:00
AnHardt
e90985a4e8 delta[3] not used when DELTA not defined. 
got:
Marlin_main.cpp:387: warning: 'delta' defined but not used

Compiles cleaner when definition is removed.
 2015-03-18 11:11:49 +01:00
AnHardt
5099b86ad4 lcd_autostart_sd() has two conditions. 
got:
ultralcd.cpp:408: warning: 'void lcd_autostart_sd()' defined but not used
 2015-03-18 10:51:13 +01:00
AnHardt
5d81c779cc lcd_control_retract_menu() is conditional. 
Got:
ultralcd.cpp:64: warning: 'void lcd_control_retract_menu()' declared 'static' but never defined
 2015-03-18 10:39:59 +01:00
AnHardt
450b89e63c Negative times are unlikly 
While bunting an other bug I stumbled across:
ultralcd.cpp:1250: warning: comparison between signed and unsigned
integer expressions
Changed to the type of lcd_next_update_millis.
 2015-03-18 10:31:34 +01:00
AnHardt
d1658eebfc Decrease KILL_DELAY 
Users hat to press kill-button for unexpexted lon times.
See #1593
 2015-03-18 01:45:42 +01:00
Wurstnase
00adb2a6c1 optional parameters must be named when ignoring order 2015-03-18 01:02:29 +01:00
Edward Patel
0d43898a22 Remove of mesh_plan_buffer_line parameter reference (e) 2015-03-17 22:55:29 +01:00
Edward Patel
8067a985ce Merge branch 'Development' into manual-bed-leveling+mesh-bed-level 
Fixed conflicts:
	Marlin/planner.h
 2015-03-17 22:48:08 +01:00
alexborro
f5f99c4883 Merge pull request #1626 from Wurstnase/fix_backslash_macro 
fix macro
 2015-03-17 18:34:05 -03:00
wurstnase
05333f61b7 fix macro 2015-03-17 12:50:44 +01:00
AnHardt
1883e1bb60 Applied thinkyheads corrections from 2015-03-17 2015-03-17 11:23:44 +01:00
AnHardt
be79235ef2 Add new (cleaner) Marlin font 
with sources in /fonts
 2015-03-17 10:33:02 +01:00
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