f1d3d1524d
Merge branch 'optimize_menu_code' of https://github.com/thinkyhead/Marlin into beautify
Conflicts:
Marlin/dogm_lcd_implementation.h
solved merge conflict.
10 years ago
fa889cd6e1
Beautivy statusscreen
by shifting things some pixels around
10 years ago
7279e4f82f
Small code tweaks re lcd.print
10 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.
10 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
10 years ago
a547dc2148
Merge branch 'Development' into optimize_menu_code
Get upstream changes
10 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.
10 years ago
a534ac197a
Merge pull request #1621 from AnHardt/remove--6x9-font
Remove 6x9 font
10 years ago
80e0ee10ca
Merge pull request #1631 from AnHardt/iss1593
Decrease KILL_DELAY
10 years ago
4ce79920e5
Merge pull request #1635 from AnHardt/warnings1
Negative times are unlikly
10 years ago
76127b8a55
Merge pull request #1630 from Wurstnase/fix_g29
optional parameters must be named when ignoring order
10 years ago
be3f2dc1d9
Merge pull request #1636 from AnHardt/warning2
lcd_control_retract_menu() is conditional.
10 years ago
8d396584bf
Merge pull request #1637 from AnHardt/warning3
lcd_autostart_sd() has two conditions.
10 years ago
8664c6d465
Merge pull request #1638 from AnHardt/warning4
delta[3] not used when DELTA not defined.
10 years ago
10711ccc6a
Merge pull request #1639 from AnHardt/warning5
G4 could wait for an undefined time
10 years ago
4521f6655b
Restore "S" parameter of M204 for retrocompatibility.
10 years ago
5ddb8d94e2
Update Documentation related to M204
10 years ago
f8c4d43886
delta[3] is used with SCARA
Shoot in the dark.
10 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.
10 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.
10 years ago
5099b86ad4
lcd_autostart_sd() has two conditions.
got:
ultralcd.cpp:408: warning: 'void lcd_autostart_sd()' defined but not used
10 years ago
5d81c779cc
lcd_control_retract_menu() is conditional.
Got:
ultralcd.cpp:64: warning: 'void lcd_control_retract_menu()' declared 'static' but never defined
10 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.
10 years ago
d1658eebfc
Decrease KILL_DELAY
Users hat to press kill-button for unexpexted lon times.
See #1593
10 years ago
00adb2a6c1
optional parameters must be named when ignoring order
10 years ago
f5f99c4883
Merge pull request #1626 from Wurstnase/fix_backslash_macro
fix macro
10 years ago
05333f61b7
fix macro
10 years ago
be79235ef2
Add new (cleaner) Marlin font
with sources in /fonts
10 years ago
89fe77468d
Merge pull request #1586 from maverikou/delta_auto_bed_level
Delta auto bed level (Updated PR)
10 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.
10 years ago
e6cb8ee188
Remove 6x9 font
in dogm_lcd_implementation.h
by using standard font and
shifting down temperature displays by one pixel
Saves 2300 bytes.
10 years ago
e93eb3e8d3
Update test
10 years ago
b8ae3feb9e
Update test
10 years ago
3570447ded
Fix Z_RAISE_AFTER_PROBING
10 years ago
8a739b6fba
Merge branch 'Development' into delta_auto_bed_level
Conflicts:
Marlin/Marlin_main.cpp
10 years ago
cbe4496123
Merge pull request #1616 from thinkyhead/topo_map_origin
Move TOPO_ORIGIN define to Configuration.h
10 years ago
7629c4f05c
Cleanup for menu optimization
- Compare pr_char to space
- Fewer calls to lcd_strlen
10 years ago
3405f85a6a
Reduce size of menu code
- Get rid of _selected functions, passing selected state instead
10 years ago
a686c9878f
Move TOPO_ORIGIN define to Configuration.h
- Addressing issue #1608
10 years ago
d0d12962e0
Merge pull request #1615 from AnHardt/fix-1611
Fix #1611
10 years ago
3f34d9d44e
Merge pull request #1614 from AnHardt/fix-1612
Fix for #1612
10 years ago
f0dcea7e14
Fix #1611
Warning: suggest parentheses around comparison in operand of &
pretty much helped.
10 years ago
28b1c37dea
Fix for #1612
10 years ago
5efc798642
Merge pull request #1546 from apollo-ng/pr-felix
Added support for Felix 2.0/3.0 printers
10 years ago
b83e52e50f
Merge pull request #1467 from thinkyhead/marlin_configurator
Configurator utility
10 years ago
7bc77dc134
Merge pull request #1583 from galexander1/m404fix
M404 should not use 'N' address as parameter because 'N' is reserved
10 years ago
3aadaa7677
Merge pull request #1609 from thinkyhead/fix_fan_pin_issue
Fix controllerFan() code
10 years ago
b80ed51fcc
Fix controllerFan() code
- Add support for 4th extruder
- Fix parentheses matching
- Apply coding standards
- Address issue mentioned at #1575
10 years ago
4b50205f11
Merge branch 'Development' into marlin_configurator
Latest upstream changes
10 years ago
bb4cb1b15a
Merge pull request #1606 from thinkyhead/cleanup_stepper
Cleanup of stepper.cpp
10 years ago
AnHardt
Scott Lahteine
alexborro
Scott Lahteine
Wurstnase
maverikou