e0a42d3f9a
Merge pull request #1666 from maverikou/fix_1507
...
Fix 1507
10 years ago
15345cc249
Corrected Z_PROBE_ALLEN_KEY behaviour.
10 years ago
0f034dd97e
Clean up Z_RAISE_AFTER_PROBING to work the same in all code paths except Z_PROBE_SLED.
10 years ago
6c96f32069
Blind fix for #1507
10 years ago
379348487e
Removed malplaced comment.
10 years ago
8bd6e37b21
Merge pull request #1661 from thinkyhead/G92_no_offset
...
Don't add home offsets in G29
10 years ago
88ed5268d2
Merge pull request #1663 from thinkyhead/fix_dual_z_1659
...
Fix compile error with `*_DUAL_STEPPER_DRIVERS`
10 years ago
582cd780cd
Fix compile error with `*_DUAL_STEPPER_DRIVERS`
...
- Patch up macros in stepper.cpp
10 years ago
9b3462f73f
Refactor SCARA calibration. Save some lines of code and possibly ROM.
10 years ago
691e753cc3
Don't add home offsets in G29
...
- Address #1262 by leaving values as set
- Rename `add_homing` to `home_offset`
10 years ago
88e81a4804
Latest upstream commits, plus fixes
...
- Also add Manual Bed Leveling to the rest of the configs
10 years ago
15eb5d35a2
Merge branch 'Development' into config_testing
...
Latest upstream commits
10 years ago
19df90622b
Include Conditionals.h file in update
10 years ago
9b639b4135
Merge pull request #1619 from epatel/manual-bed-leveling+mesh-bed-level
...
Manual bed leveling + mesh bed leveling
10 years ago
2c9bd15625
Move LCD items to `Conditionals.h`
...
- `Conditionals.h` is included twice, setting LCD values the first time
10 years ago
a96bfee76a
Merge pull request #1660 from thinkyhead/fix_temperature_minmax
...
Fix temperature min/max test
10 years ago
63abeaff38
Merge branch 'Development' into config_testing
...
Latest upstream commits
10 years ago
3703694e30
Fix temperature min/max test
...
- Base tests on all thermistors/thermocouples, not just heater 0
10 years ago
3d0a060a7a
Added G29 command
10 years ago
c516747847
Merge branch 'Development' into manual-bed-leveling+mesh-bed-level
10 years ago
b5970492e2
Merge pull request #1656 from AnHardt/menufix
...
Fix for menus failing to scroll
10 years ago
af14c684b5
Minor optimizations to planner code
...
- Prefetch values used more than once
10 years ago
13fbf42d95
Cleanup of planner code
...
- Use named axis indexes, `X_AXIS` etc.
- Replace `block.steps_A` with block.steps[A]`
- Replace `A_segment_time` with `segment_time[A]`
- Add `A_AXIS`, `B_AXIS` for `COREXY` axes
- Conditional compile based on `EXTRUDERS`
- Add BLOCK_MOD macro for planner block indexes
- Apply coding standards to `planner.h` and `planner.cpp`
- Small optimizations of planner code
- Update `stepper.cpp` for new `block` struct
- Replace `memcpy` with loops, let the compiler unroll them
- Make `movesplanned` into an inline function
10 years ago
64e3d33893
Fix shrinked menucode
...
by updating 'encoderPosition' in END_MENU() line 1.
10 years ago
a7e89d4cfa
Merge branch 'Development' into manual-bed-leveling+mesh-bed-level
10 years ago
08856d9615
Merge branch 'tm2-utf-minus-kanji' into tm-utf-minus-kanji
...
Conflicts:
Marlin/ultralcd_implementation_hitachi_HD44780.h
Cleaned!
10 years ago
8c5bb38748
Removed now unneded FONT_STATUSMENU
10 years ago
0d869703ca
Merge pull request #1655 from thinkyhead/fix_count_direction_init
...
Fix count_direction initializer
10 years ago
2176a22d42
Fix count_direction initializer
...
- Addressing #1625
10 years ago
e72cb3e45d
Merge https://github.com/MarlinFirmware/Marlin into tm2-utf-minus-kanji
...
Conflicts:
Marlin/dogm_lcd_implementation.h
Marlin/ultralcd_implementation_hitachi_HD44780.h
Fix merge conflicts 2
10 years ago
cb6942d4a7
Merge branch 'Development' into config_testing
...
Get upstream commits
10 years ago
6bfccaf99e
Merge https://github.com/MarlinFirmware/Marlin into tm2-utf-minus-kanji
...
Conflicts:
Marlin/dogm_lcd_implementation.h
Marlin/ultralcd_implementation_hitachi_HD44780.h
Fixed conflicts 1
10 years ago
e3f04c876a
Merge pull request #1653 from thinkyhead/lcd_menu_hilite
...
Fix hiliting of edit items in LCD menus
10 years ago
5644ad6809
Fix hiliting of edit items
10 years ago
63d5d28085
Merge branch 'Development' into config_testing
...
Latest upstream changes
10 years ago
526a755a66
Merge pull request #1652 from AnHardt/PIDdebug
...
PID debug
10 years ago
a1c240b0a4
Delta supports some auto bed leveling options
10 years ago
5112cf8422
Added comment for the EEPROM storage
10 years ago
4619d80524
Merge branch 'Development' into manual-bed-leveling+mesh-bed-level
10 years ago
199151a4ed
Merge pull request #1650 from AnHardt/beautify
...
Beautivy statusscreen
10 years ago
2424713a8f
Merge pull request #1640 from AnHardt/warning6
...
codepos not used in gcode_M28()
10 years ago
b6d381f863
Divide up Conditionals to get LCD items early
10 years ago
e85061d20d
Added changes to the 'new' Configuration.h s
10 years ago
33c7c6e11d
Conditionals.h requires Arduino.h
10 years ago
8ade04b78e
Felix and Hephestos configs
...
- Not sure why these are showing as all new
10 years ago
670006b919
Remove invariant code from Configurations
...
- Add `Conditionals.h` with calculated configuration values
- Add `SanityCheck.h` with checks for configuration errors
- Remove equivalent code from all configurations
- Move error checks from some sources to `SanityCheck.h` also
- Fix initialization of count_direction in stepper.cpp
10 years ago
a61f679568
Merge branch 'Development' into manual-bed-leveling+mesh-bed-level
10 years ago
c87faa69ed
Shortened mesh_plan_buffer_line()
10 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>
10 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.
10 years ago
Scott Lahteine