2490 Commits (e0a42d3f9afeea6f3e78782c8c744926fef6de77)
 

Author SHA1 Message Date
Scott Lahteine e0a42d3f9a Merge pull request #1666 from maverikou/fix_1507
Fix 1507
10 years ago
maverikou 15345cc249 Corrected Z_PROBE_ALLEN_KEY behaviour. 10 years ago
maverikou 0f034dd97e Clean up Z_RAISE_AFTER_PROBING to work the same in all code paths except Z_PROBE_SLED. 10 years ago
maverikou 6c96f32069 Blind fix for #1507 10 years ago
Scott Lahteine 8bd6e37b21 Merge pull request #1661 from thinkyhead/G92_no_offset
Don't add home offsets in G29
10 years ago
Scott Lahteine 88ed5268d2 Merge pull request #1663 from thinkyhead/fix_dual_z_1659
Fix compile error with `*_DUAL_STEPPER_DRIVERS`
10 years ago
Scott Lahteine 582cd780cd Fix compile error with `*_DUAL_STEPPER_DRIVERS`
- Patch up macros in stepper.cpp
10 years ago
Scott Lahteine 691e753cc3 Don't add home offsets in G29
- Address #1262 by leaving values as set
- Rename `add_homing` to `home_offset`
10 years ago
Scott Lahteine 9b639b4135 Merge pull request #1619 from epatel/manual-bed-leveling+mesh-bed-level
Manual bed leveling + mesh bed leveling
10 years ago
Scott Lahteine a96bfee76a Merge pull request #1660 from thinkyhead/fix_temperature_minmax
Fix temperature min/max test
10 years ago
Scott Lahteine 3703694e30 Fix temperature min/max test
- Base tests on all thermistors/thermocouples, not just heater 0
10 years ago
Edward Patel 3d0a060a7a Added G29 command 10 years ago
Edward Patel c516747847 Merge branch 'Development' into manual-bed-leveling+mesh-bed-level 10 years ago
Scott Lahteine b5970492e2 Merge pull request #1656 from AnHardt/menufix
Fix for menus failing to scroll
10 years ago
AnHardt 64e3d33893 Fix shrinked menucode
by updating 'encoderPosition' in END_MENU() line 1.
10 years ago
Edward Patel a7e89d4cfa Merge branch 'Development' into manual-bed-leveling+mesh-bed-level 10 years ago
Scott Lahteine 0d869703ca Merge pull request #1655 from thinkyhead/fix_count_direction_init
Fix count_direction initializer
10 years ago
Scott Lahteine 2176a22d42 Fix count_direction initializer
- Addressing #1625
10 years ago
Scott Lahteine e3f04c876a Merge pull request #1653 from thinkyhead/lcd_menu_hilite
Fix hiliting of edit items in LCD menus
10 years ago
Scott Lahteine 5644ad6809 Fix hiliting of edit items 10 years ago
Scott Lahteine 526a755a66 Merge pull request #1652 from AnHardt/PIDdebug
PID debug
10 years ago
Edward Patel 5112cf8422 Added comment for the EEPROM storage 10 years ago
Edward Patel 4619d80524 Merge branch 'Development' into manual-bed-leveling+mesh-bed-level 10 years ago
Scott Lahteine 199151a4ed Merge pull request #1650 from AnHardt/beautify
Beautivy statusscreen
10 years ago
Scott Lahteine 2424713a8f Merge pull request #1640 from AnHardt/warning6
codepos not used in gcode_M28()
10 years ago
AnHardt e85061d20d Added changes to the 'new' Configuration.h s 10 years ago
Edward Patel a61f679568 Merge branch 'Development' into manual-bed-leveling+mesh-bed-level 10 years ago
Edward Patel c87faa69ed Shortened mesh_plan_buffer_line() 10 years ago
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>
10 years ago
AnHardt 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
Scott Lahteine 0858fba192 Merge pull request #1620 from thinkyhead/optimize_menu_code
Reduce size of menu code
10 years ago
AnHardt fa889cd6e1 Beautivy statusscreen
by shifting things some pixels around
10 years ago
Scott Lahteine 7279e4f82f Small code tweaks re lcd.print 10 years ago
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.
10 years ago
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
10 years ago
Scott Lahteine a547dc2148 Merge branch 'Development' into optimize_menu_code
Get upstream changes
10 years ago
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.
10 years ago
AnHardt ae01a6b5f2 Make use of codepos.
Saves one addition.
Needs one pointer on the stack.

Don't know if this is a go trade.
10 years ago
Scott Lahteine a534ac197a Merge pull request #1621 from AnHardt/remove--6x9-font
Remove 6x9 font
10 years ago
Scott Lahteine 80e0ee10ca Merge pull request #1631 from AnHardt/iss1593
Decrease KILL_DELAY
10 years ago
Scott Lahteine 4ce79920e5 Merge pull request #1635 from AnHardt/warnings1
Negative times are unlikly
10 years ago
Scott Lahteine 76127b8a55 Merge pull request #1630 from Wurstnase/fix_g29
optional parameters must be named when ignoring order
10 years ago
Scott Lahteine be3f2dc1d9 Merge pull request #1636 from AnHardt/warning2
lcd_control_retract_menu() is conditional.
10 years ago
Scott Lahteine 8d396584bf Merge pull request #1637 from AnHardt/warning3
lcd_autostart_sd() has two conditions.
10 years ago
Scott Lahteine 8664c6d465 Merge pull request #1638 from AnHardt/warning4
delta[3] not used when DELTA not defined.
10 years ago
Scott Lahteine 10711ccc6a Merge pull request #1639 from AnHardt/warning5
G4 could wait for an undefined time
10 years ago
Edward Patel 28c91deb5c EEPROM saving of z_values.
Tried to make it a little intelligent.
10 years ago
Edward Patel 240b5cfe04 Merge branch 'Development' into manual-bed-leveling+mesh-bed-level 10 years ago
alexborro 4521f6655b Restore "S" parameter of M204 for retrocompatibility. 10 years ago
alexborro 5ddb8d94e2 Update Documentation related to M204 10 years ago