CONSULitAS
703f3b38c4
Merge remote-tracking branch 'upstream/Development' into Development
2015-03-23 17:40:49 +01:00
Scott Lahteine
b26a3ea02c
Merge pull request #1662 from josla972/refactor_scara
...
Refactor SCARA calibration. Save some lines of code and possibly ROM.
2015-03-23 00:51:18 -07:00
Scott Lahteine
36474be8eb
Merge pull request #1675 from Wurstnase/Development
...
fix bad insertion config again
2015-03-23 00:33:56 -07:00
wurstnase
e6f6c6e3a1
fix bad insertion config again
2015-03-23 08:32:48 +01:00
Scott Lahteine
f65f61fa72
Merge pull request #1672 from thinkyhead/fix_probeaction
...
Fix mangled probe_pt calls
2015-03-22 22:40:52 -07:00
Scott Lahteine
7717e1ce33
Fix bad insert in configuration
2015-03-22 21:48:46 -07:00
Scott Lahteine
146501215f
Fix mangled probe_pt calls
...
- Address issue #1669
- Remove the TOPO_ORIGIN configuration setting
2015-03-22 21:45:20 -07:00
Scott Lahteine
e0a42d3f9a
Merge pull request #1666 from maverikou/fix_1507
...
Fix 1507
2015-03-22 21:25:05 -07:00
maverikou
15345cc249
Corrected Z_PROBE_ALLEN_KEY behaviour.
2015-03-22 13:54:51 +02:00
maverikou
0f034dd97e
Clean up Z_RAISE_AFTER_PROBING to work the same in all code paths except Z_PROBE_SLED.
2015-03-22 13:54:45 +02:00
maverikou
6c96f32069
Blind fix for #1507
2015-03-22 13:54:21 +02:00
Josef Larsson
379348487e
Removed malplaced comment.
2015-03-22 12:21:31 +01:00
Scott Lahteine
8bd6e37b21
Merge pull request #1661 from thinkyhead/G92_no_offset
...
Don't add home offsets in G29
2015-03-21 16:49:06 -07:00
Scott Lahteine
88ed5268d2
Merge pull request #1663 from thinkyhead/fix_dual_z_1659
...
Fix compile error with `*_DUAL_STEPPER_DRIVERS`
2015-03-21 16:48:08 -07:00
Scott Lahteine
582cd780cd
Fix compile error with *_DUAL_STEPPER_DRIVERS
...
- Patch up macros in stepper.cpp
2015-03-21 16:43:47 -07:00
Josef Larsson
9b3462f73f
Refactor SCARA calibration. Save some lines of code and possibly ROM.
2015-03-22 00:37:24 +01:00
Scott Lahteine
691e753cc3
Don't add home offsets in G29
...
- Address #1262 by leaving values as set
- Rename `add_homing` to `home_offset`
2015-03-21 16:30:02 -07:00
Scott Lahteine
9b639b4135
Merge pull request #1619 from epatel/manual-bed-leveling+mesh-bed-level
...
Manual bed leveling + mesh bed leveling
2015-03-21 15:39:42 -07:00
Scott Lahteine
a96bfee76a
Merge pull request #1660 from thinkyhead/fix_temperature_minmax
...
Fix temperature min/max test
2015-03-21 15:04:42 -07:00
Scott Lahteine
3703694e30
Fix temperature min/max test
...
- Base tests on all thermistors/thermocouples, not just heater 0
2015-03-21 14:23:43 -07:00
Edward Patel
3d0a060a7a
Added G29 command
2015-03-21 14:50:47 +01:00
Edward Patel
c516747847
Merge branch 'Development' into manual-bed-leveling+mesh-bed-level
2015-03-21 14:49:52 +01:00
Scott Lahteine
b5970492e2
Merge pull request #1656 from AnHardt/menufix
...
Fix for menus failing to scroll
2015-03-20 21:09:26 -07:00
AnHardt
64e3d33893
Fix shrinked menucode
...
by updating 'encoderPosition' in END_MENU() line 1.
2015-03-20 23:36:14 +01:00
Edward Patel
a7e89d4cfa
Merge branch 'Development' into manual-bed-leveling+mesh-bed-level
2015-03-20 15:46:01 +01:00
Scott Lahteine
0d869703ca
Merge pull request #1655 from thinkyhead/fix_count_direction_init
...
Fix count_direction initializer
2015-03-20 05:45:33 -07:00
Scott Lahteine
2176a22d42
Fix count_direction initializer
...
- Addressing #1625
2015-03-20 05:45:05 -07:00
Scott Lahteine
e3f04c876a
Merge pull request #1653 from thinkyhead/lcd_menu_hilite
...
Fix hiliting of edit items in LCD menus
2015-03-20 04:37:20 -07:00
Scott Lahteine
5644ad6809
Fix hiliting of edit items
2015-03-20 04:29:35 -07:00
Scott Lahteine
526a755a66
Merge pull request #1652 from AnHardt/PIDdebug
...
PID debug
2015-03-20 04:14:08 -07:00
Edward Patel
5112cf8422
Added comment for the EEPROM storage
2015-03-20 11:46:47 +01:00
Edward Patel
4619d80524
Merge branch 'Development' into manual-bed-leveling+mesh-bed-level
2015-03-20 11:45:06 +01:00
Scott Lahteine
199151a4ed
Merge pull request #1650 from AnHardt/beautify
...
Beautivy statusscreen
2015-03-20 03:38:02 -07:00
Scott Lahteine
2424713a8f
Merge pull request #1640 from AnHardt/warning6
...
codepos not used in gcode_M28()
2015-03-20 02:58:00 -07:00
AnHardt
e85061d20d
Added changes to the 'new' Configuration.h s
2015-03-20 10:36:29 +01:00
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
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
