c686069ccd
Revert "Remove 6x9 font"
This reverts commit e6cb8ee188
10 years ago
b00a531df8
Revert "Removed now unneded FONT_STATUSMENU"
This reverts commit 8c5bb38748
10 years ago
9d589cbb2a
Merge https://github.com/MarlinFirmware/Marlin into tm3-utf-minus-kanji
Conflicts:
Marlin/example_configurations/delta/generic/Configuration.h
Marlin/example_configurations/delta/kossel_mini/Configuration.h
Marlin/language.h
Conflicts solved
10 years ago
512a0056a9
Merge pull request #1658 from thinkyhead/planner_oh_planner
Cleanup of planner code
10 years ago
8db4fd7177
Merge branch 'Development' into planner_oh_planner
Latest upstream commits
10 years ago
c6df5f4d85
small text correction
10 years ago
8dd94ccf58
Initial list from perusing the commit logs
10 years ago
4afe50b920
Merge pull request #1651 from thinkyhead/config_testing
Configuration sanity-checking
10 years ago
0d81abe1c9
Merge branch 'Development' into config_testing
Latest upstream commits
10 years ago
01740fd9c6
Merge branch 'Development' into planner_oh_planner
Latest upstream commits
10 years ago
e2576b1ac5
Merge pull request #1674 from thinkyhead/fix_temperature_minmax
Cleanup temperature code
10 years ago
8b004d26c1
Merge pull request #1681 from thinkyhead/marlin_configurator
A logo for the Marlin wiki
10 years ago
fc53e43de6
Don't test raw temp for MAX6675
- Remove test of raw temp for thermistor 0 when using MAX6675
- Longer `raw_temp_value` array for `TEMP_SENSOR_1_AS_REDUNDANT`
10 years ago
03fa9fae9f
Merge branch 'Development' into fix_temperature_minmax
Latest upstream commits
10 years ago
b1a7f74ee4
A logo for the Marlin wiki
10 years ago
2606da9e81
Merge pull request #1678 from Nutz95/Development
Report changes from previous PR (#1670 ) from old code base including :
10 years ago
1fac388664
Revert measurement loop
10 years ago
703f3b38c4
Merge remote-tracking branch 'upstream/Development' into Development
10 years ago
37cde8a191
Report changes from previous PR from old code base including :
I've updated the minimum values from the LCD.
It has been a while that i want to at least fix this.
I have an inductive probe and often i need to set my zOffset to something lower than 0.5.
With the current implementation, the default LCD value is set to 0.5 for some reason.
On my case i need to be able to set it down to 0.0 as my inductive probe can be lower than 0.5.
Before with the LCD we couldn't change this value below 0.5. We had to flash the firmware every time which was painful.
Now we are able to change this value down to 0.0 if needed.
I've also changed the minimum value for Z min acceleration.
In the default configuration it's set to 25 but on the LCD the minimum was 100 which is not coherent.
I've changes the minimum to 10. On this axis, depending on the mechanics/motor drivers we might require very low acceleration, so i guess 10 is somehow realistic.
10 years ago
b26a3ea02c
Merge pull request #1662 from josla972/refactor_scara
Refactor SCARA calibration. Save some lines of code and possibly ROM.
10 years ago
36474be8eb
Merge pull request #1675 from Wurstnase/Development
fix bad insertion config again
10 years ago
e6f6c6e3a1
fix bad insertion config again
10 years ago
6bdee87be3
Cleanup temperature code
- Get rid of unused temp states in the ISR, resulting in more frequent
temperature reading with fewer sensors
- Shrink code slightly in min/max testing
10 years ago
34a41648ab
Merge branch 'Development' into planner_oh_planner
Latest upstream commits
10 years ago
4fbb80567e
Get upstream commits
10 years ago
f65f61fa72
Merge pull request #1672 from thinkyhead/fix_probeaction
Fix mangled probe_pt calls
10 years ago
7717e1ce33
Fix bad insert in configuration
10 years ago
146501215f
Fix mangled probe_pt calls
- Address issue #1669
- Remove the TOPO_ORIGIN configuration setting
10 years ago
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
AnHardt
Scott Lahteine
Scott Lahteine
CONSULitAS
nicolas-rambaud
wurstnase
maverikou
Josef Larsson
Edward Patel