8bd6e37b21
Merge pull request #1661 from thinkyhead/G92_no_offset
...
Don't add home offsets in G29
9 years ago
88ed5268d2
Merge pull request #1663 from thinkyhead/fix_dual_z_1659
...
Fix compile error with `*_DUAL_STEPPER_DRIVERS`
9 years ago
582cd780cd
Fix compile error with `*_DUAL_STEPPER_DRIVERS`
...
- Patch up macros in stepper.cpp
9 years ago
691e753cc3
Don't add home offsets in G29
...
- Address #1262 by leaving values as set
- Rename `add_homing` to `home_offset`
9 years ago
9b639b4135
Merge pull request #1619 from epatel/manual-bed-leveling+mesh-bed-level
...
Manual bed leveling + mesh bed leveling
9 years ago
a96bfee76a
Merge pull request #1660 from thinkyhead/fix_temperature_minmax
...
Fix temperature min/max test
9 years ago
3703694e30
Fix temperature min/max test
...
- Base tests on all thermistors/thermocouples, not just heater 0
9 years ago
3d0a060a7a
Added G29 command
9 years ago
c516747847
Merge branch 'Development' into manual-bed-leveling+mesh-bed-level
9 years ago
b5970492e2
Merge pull request #1656 from AnHardt/menufix
...
Fix for menus failing to scroll
9 years ago
64e3d33893
Fix shrinked menucode
...
by updating 'encoderPosition' in END_MENU() line 1.
9 years ago
a7e89d4cfa
Merge branch 'Development' into manual-bed-leveling+mesh-bed-level
9 years ago
0d869703ca
Merge pull request #1655 from thinkyhead/fix_count_direction_init
...
Fix count_direction initializer
9 years ago
2176a22d42
Fix count_direction initializer
...
- Addressing #1625
9 years ago
e3f04c876a
Merge pull request #1653 from thinkyhead/lcd_menu_hilite
...
Fix hiliting of edit items in LCD menus
9 years ago
5644ad6809
Fix hiliting of edit items
9 years ago
526a755a66
Merge pull request #1652 from AnHardt/PIDdebug
...
PID debug
9 years ago
5112cf8422
Added comment for the EEPROM storage
9 years ago
4619d80524
Merge branch 'Development' into manual-bed-leveling+mesh-bed-level
9 years ago
199151a4ed
Merge pull request #1650 from AnHardt/beautify
...
Beautivy statusscreen
9 years ago
2424713a8f
Merge pull request #1640 from AnHardt/warning6
...
codepos not used in gcode_M28()
9 years ago
e85061d20d
Added changes to the 'new' Configuration.h s
9 years ago
a61f679568
Merge branch 'Development' into manual-bed-leveling+mesh-bed-level
9 years ago
c87faa69ed
Shortened mesh_plan_buffer_line()
9 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>
9 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.
9 years ago
0858fba192
Merge pull request #1620 from thinkyhead/optimize_menu_code
...
Reduce size of menu code
9 years ago
fa889cd6e1
Beautivy statusscreen
...
by shifting things some pixels around
9 years ago
7279e4f82f
Small code tweaks re lcd.print
9 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.
9 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
9 years ago
a547dc2148
Merge branch 'Development' into optimize_menu_code
...
Get upstream changes
9 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.
9 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.
9 years ago
a534ac197a
Merge pull request #1621 from AnHardt/remove--6x9-font
...
Remove 6x9 font
9 years ago
80e0ee10ca
Merge pull request #1631 from AnHardt/iss1593
...
Decrease KILL_DELAY
9 years ago
4ce79920e5
Merge pull request #1635 from AnHardt/warnings1
...
Negative times are unlikly
9 years ago
76127b8a55
Merge pull request #1630 from Wurstnase/fix_g29
...
optional parameters must be named when ignoring order
9 years ago
be3f2dc1d9
Merge pull request #1636 from AnHardt/warning2
...
lcd_control_retract_menu() is conditional.
9 years ago
8d396584bf
Merge pull request #1637 from AnHardt/warning3
...
lcd_autostart_sd() has two conditions.
9 years ago
8664c6d465
Merge pull request #1638 from AnHardt/warning4
...
delta[3] not used when DELTA not defined.
9 years ago
10711ccc6a
Merge pull request #1639 from AnHardt/warning5
...
G4 could wait for an undefined time
9 years ago
28c91deb5c
EEPROM saving of z_values.
...
Tried to make it a little intelligent.
9 years ago
240b5cfe04
Merge branch 'Development' into manual-bed-leveling+mesh-bed-level
9 years ago
4521f6655b
Restore "S" parameter of M204 for retrocompatibility.
9 years ago
5ddb8d94e2
Update Documentation related to M204
9 years ago
f8c4d43886
delta[3] is used with SCARA
...
Shoot in the dark.
9 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.
9 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.
9 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.
9 years ago
Scott Lahteine