a61f679568
Merge branch 'Development' into manual-bed-leveling+mesh-bed-level
11 years ago
c87faa69ed
Shortened mesh_plan_buffer_line()
11 years ago
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>
11 years ago
f1d3d1524d
Merge branch 'optimize_menu_code' of https://github.com/thinkyhead/Marlin into beautify
...
Conflicts:
Marlin/dogm_lcd_implementation.h
solved merge conflict.
11 years ago
0858fba192
Merge pull request #1620 from thinkyhead/optimize_menu_code
...
Reduce size of menu code
11 years ago
fa889cd6e1
Beautivy statusscreen
...
by shifting things some pixels around
11 years ago
7279e4f82f
Small code tweaks re lcd.print
11 years ago
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.
11 years ago
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
11 years ago
a547dc2148
Merge branch 'Development' into optimize_menu_code
...
Get upstream changes
11 years ago
9c1f6e7ac7
Merge remote-tracking branch 'upstream/Development' into Development
11 years ago
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.
11 years ago
eff6a2bd2e
Clean out a warning
...
in ultralcd_implementation_hitachi_HD44780.h lcd_print( about array index.
11 years ago
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.
11 years ago
ae01a6b5f2
Make use of codepos.
...
Saves one addition.
Needs one pointer on the stack.
Don't know if this is a go trade.
11 years ago
a534ac197a
Merge pull request #1621 from AnHardt/remove--6x9-font
...
Remove 6x9 font
11 years ago
80e0ee10ca
Merge pull request #1631 from AnHardt/iss1593
...
Decrease KILL_DELAY
11 years ago
4ce79920e5
Merge pull request #1635 from AnHardt/warnings1
...
Negative times are unlikly
11 years ago
76127b8a55
Merge pull request #1630 from Wurstnase/fix_g29
...
optional parameters must be named when ignoring order
11 years ago
be3f2dc1d9
Merge pull request #1636 from AnHardt/warning2
...
lcd_control_retract_menu() is conditional.
11 years ago
8d396584bf
Merge pull request #1637 from AnHardt/warning3
...
lcd_autostart_sd() has two conditions.
11 years ago
8664c6d465
Merge pull request #1638 from AnHardt/warning4
...
delta[3] not used when DELTA not defined.
11 years ago
10711ccc6a
Merge pull request #1639 from AnHardt/warning5
...
G4 could wait for an undefined time
11 years ago
28c91deb5c
EEPROM saving of z_values.
...
Tried to make it a little intelligent.
11 years ago
240b5cfe04
Merge branch 'Development' into manual-bed-leveling+mesh-bed-level
11 years ago
4521f6655b
Restore "S" parameter of M204 for retrocompatibility.
11 years ago
5ddb8d94e2
Update Documentation related to M204
11 years ago
f8c4d43886
delta[3] is used with SCARA
...
Shoot in the dark.
11 years ago
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.
11 years ago
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.
11 years ago
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.
11 years ago
5099b86ad4
lcd_autostart_sd() has two conditions.
...
got:
ultralcd.cpp:408: warning: 'void lcd_autostart_sd()' defined but not used
11 years ago
5d81c779cc
lcd_control_retract_menu() is conditional.
...
Got:
ultralcd.cpp:64: warning: 'void lcd_control_retract_menu()' declared 'static' but never defined
11 years ago
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.
11 years ago
d1658eebfc
Decrease KILL_DELAY
...
Users hat to press kill-button for unexpexted lon times.
See #1593
11 years ago
00adb2a6c1
optional parameters must be named when ignoring order
11 years ago
0d43898a22
Remove of mesh_plan_buffer_line parameter reference (e)
11 years ago
8067a985ce
Merge branch 'Development' into manual-bed-leveling+mesh-bed-level
...
Fixed conflicts:
Marlin/planner.h
11 years ago
f5f99c4883
Merge pull request #1626 from Wurstnase/fix_backslash_macro
...
fix macro
11 years ago
05333f61b7
fix macro
11 years ago
1883e1bb60
Applied thinkyheads corrections from 2015-03-17
11 years ago
be79235ef2
Add new (cleaner) Marlin font
...
with sources in /fonts
11 years ago
89fe77468d
Merge pull request #1586 from maverikou/delta_auto_bed_level
...
Delta auto bed level (Updated PR)
11 years ago
2b1ddc0413
Merge remote-tracking branch 'upstream/Development' into Development
11 years ago
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.
11 years ago
8a29dd4839
Cleaned typo in dogm_lcd_implementation.h
11 years ago
7e69f72db6
Moved font directory. Updated README.fonts
11 years ago
00b162a993
Merge remote-tracking branch 'origin/utf-kanji' into tm-utf-minus-kanji
...
Conflicts:
Marlin/language.h
Conflict cleaned
11 years ago
e38dd5f030
Merge remote-tracking branch 'origin/utf' into utf-kanji
11 years ago
08e4651ece
Corrected cyrillic font again
...
Thank you @Nprod.
11 years ago
Edward Patel