CMS/Marlin
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
3,510 Commits 1 Branch 0 Tags 107 MiB
bb44fe17cf
Commit Graph

3510 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Edward Patel
a61f679568 Merge branch 'Development' into manual-bed-leveling+mesh-bed-level 2015-03-20 02:28:35 +01:00
Edward Patel
c87faa69ed Shortened mesh_plan_buffer_line() 2015-03-20 02:18:49 +01:00
AnHardt
47c1ea72af Merge https://github.com/kieranc/Marlin into PIDdebug 
Conflicts:
	Marlin/temperature.cpp

Cleaned merge conflict.

Codeposition had changed.
Variable pid_input had vanished.

Signed-off-by: AnHardt <github@kitelab.de>
 2015-03-20 00:07:36 +01:00
AnHardt
f1d3d1524d Merge branch 'optimize_menu_code' of https://github.com/thinkyhead/Marlin into beautify 
Conflicts:
	Marlin/dogm_lcd_implementation.h

solved merge conflict.
 2015-03-19 22:51:22 +01:00
Scott Lahteine
0858fba192 Merge pull request #1620 from thinkyhead/optimize_menu_code 
Reduce size of menu code
 2015-03-19 14:35:26 -07:00
AnHardt
fa889cd6e1 Beautivy statusscreen 
by shifting things some pixels around
 2015-03-19 22:13:37 +01:00
Scott Lahteine
7279e4f82f Small code tweaks re lcd.print 2015-03-19 14:01:33 -07:00
Scott Lahteine
90ba61b9b8 Include indicator for new drawmenu_generic 
In the new method we pass the character that should be used for
selected state, not the character to print always.
 2015-03-19 13:49:06 -07:00
Scott Lahteine
15d29efad5 Pass sel to lcd_implementation_mark_as_selected 
- Pass selected state directly to lcd_implementation_mark_as_selected
- Rename sel function parameter
- Include a minor fix for SdBaseFile.h
 2015-03-19 13:40:36 -07:00
Scott Lahteine
a547dc2148 Merge branch 'Development' into optimize_menu_code 
Get upstream changes
 2015-03-19 13:31:37 -07:00
CONSULitAS
9c1f6e7ac7 Merge remote-tracking branch 'upstream/Development' into Development 2015-03-19 18:49:34 +01:00
alexborro
e650d4044e Fix "Stop Print" function in the LCD menu 
When one hit "Stop Print" option in LCD menu, the command buffer was not
cleared. The printer keep moving until the buffer has been emptied.
Actually I could not clear the command buffer as well.. I don't know
why, it doesnt work as expected.
I need to implement a routine inside Stepper ISR to handle such
situation.
 2015-03-19 14:16:18 -03:00
AnHardt
eff6a2bd2e Clean out a warning 
in ultralcd_implementation_hitachi_HD44780.h lcd_print( about array index.
 2015-03-19 12:58:43 +01:00
AnHardt
e917477fec Merge https://github.com/MarlinFirmware/Marlin into tm-utf-minus-kanji 
Conflicts:
	Marlin/dogm_lcd_implementation.h
	Marlin/fonts/make_fonts.bat

Claerd conflicts with my own #1621. (His was easy. :-) )

corrected typo in fonts/README.fonts

Applied changes to the new delta-configurations
 and deletet there some extra whitespace at the line-endings.
 2015-03-19 12:35:43 +01:00
AnHardt
ae01a6b5f2 Make use of codepos. 
Saves one addition.
Needs one pointer on the stack.

Don't know if this is a go trade.
 2015-03-19 09:45:16 +01:00
Scott Lahteine
a534ac197a Merge pull request #1621 from AnHardt/remove--6x9-font 
Remove 6x9 font
 2015-03-18 23:10:42 -07:00
Scott Lahteine
80e0ee10ca Merge pull request #1631 from AnHardt/iss1593 
Decrease KILL_DELAY
 2015-03-18 19:10:38 -07:00
Scott Lahteine
4ce79920e5 Merge pull request #1635 from AnHardt/warnings1 
Negative times are unlikly
 2015-03-18 19:10:12 -07:00
Scott Lahteine
76127b8a55 Merge pull request #1630 from Wurstnase/fix_g29 
optional parameters must be named when ignoring order
 2015-03-18 19:09:40 -07:00
Scott Lahteine
be3f2dc1d9 Merge pull request #1636 from AnHardt/warning2 
lcd_control_retract_menu() is conditional.
 2015-03-18 19:09:05 -07:00
Scott Lahteine
8d396584bf Merge pull request #1637 from AnHardt/warning3 
lcd_autostart_sd() has two conditions.
 2015-03-18 19:08:33 -07:00
Scott Lahteine
8664c6d465 Merge pull request #1638 from AnHardt/warning4 
delta[3] not used when DELTA not defined.
 2015-03-18 19:07:55 -07:00
Scott Lahteine
10711ccc6a Merge pull request #1639 from AnHardt/warning5 
G4 could wait for an undefined time
 2015-03-18 19:07:14 -07:00
Edward Patel
28c91deb5c EEPROM saving of z_values. 
Tried to make it a little intelligent.
 2015-03-18 21:07:07 +01:00
Edward Patel
240b5cfe04 Merge branch 'Development' into manual-bed-leveling+mesh-bed-level 2015-03-18 19:19:46 +01:00
alexborro
4521f6655b Restore "S" parameter of M204 for retrocompatibility. 2015-03-18 12:19:30 -03:00
alexborro
5ddb8d94e2 Update Documentation related to M204 2015-03-18 11:09:10 -03:00
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