melch
/
Marlin
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
3,221 Commits
2 Branches
0 Tags
2.0 GiB
x301
2.0.x
Branches Tags
${ item.name }
Create tag ${ searchTerm }
Create branch ${ searchTerm }
from '6e5572228d'
${ noResults }
Commit Graph

3221 Commits (6e5572228db9a366719265e8a8f70760e579c477)
 

Author SHA1 Message Date
Scott Lahteine 03fa9fae9f Merge branch 'Development' into fix_temperature_minmax 
Latest upstream commits
 10 years ago
Scott Lahteine b1a7f74ee4 A logo for the Marlin wiki 10 years ago
Scott Lahteine 2606da9e81 Merge pull request #1678 from Nutz95/Development 
Report changes from previous PR (#1670) from old code base including :
 10 years ago
Scott Lahteine 1fac388664 Revert measurement loop 10 years ago
CONSULitAS 703f3b38c4 Merge remote-tracking branch 'upstream/Development' into Development 10 years ago
nicolas-rambaud 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
Scott Lahteine b26a3ea02c Merge pull request #1662 from josla972/refactor_scara 
Refactor SCARA calibration. Save some lines of code and possibly ROM.
 10 years ago
Scott Lahteine 36474be8eb Merge pull request #1675 from Wurstnase/Development 
fix bad insertion config again
 10 years ago
wurstnase e6f6c6e3a1 fix bad insertion config again 10 years ago
Scott Lahteine 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
Scott Lahteine 34a41648ab Merge branch 'Development' into planner_oh_planner 
Latest upstream commits
 10 years ago
Scott Lahteine 4fbb80567e Get upstream commits 10 years ago
Scott Lahteine f65f61fa72 Merge pull request #1672 from thinkyhead/fix_probeaction 
Fix mangled probe_pt calls
 10 years ago
Scott Lahteine 7717e1ce33 Fix bad insert in configuration 10 years ago
Scott Lahteine 146501215f Fix mangled probe_pt calls 
- Address issue #1669
- Remove the TOPO_ORIGIN configuration setting
 10 years ago
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
Josef Larsson 379348487e Removed malplaced comment. 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
Josef Larsson 9b3462f73f Refactor SCARA calibration. Save some lines of code and possibly ROM. 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 88e81a4804 Latest upstream commits, plus fixes 
- Also add Manual Bed Leveling to the rest of the configs
 10 years ago
Scott Lahteine 15eb5d35a2 Merge branch 'Development' into config_testing 
Latest upstream commits
 10 years ago
Scott Lahteine 19df90622b Include Conditionals.h file in update 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 2c9bd15625 Move LCD items to `Conditionals.h` 
- `Conditionals.h` is included twice, setting LCD values the first time
 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 63abeaff38 Merge branch 'Development' into config_testing 
Latest upstream commits
 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
Scott Lahteine af14c684b5 Minor optimizations to planner code 
- Prefetch values used more than once
 10 years ago
Scott Lahteine 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
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
AnHardt 08856d9615 Merge branch 'tm2-utf-minus-kanji' into tm-utf-minus-kanji 
Conflicts:
	Marlin/ultralcd_implementation_hitachi_HD44780.h

Cleaned!
 10 years ago
AnHardt 8c5bb38748 Removed now unneded FONT_STATUSMENU 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
AnHardt 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
Scott Lahteine cb6942d4a7 Merge branch 'Development' into config_testing 
Get upstream commits
 10 years ago
AnHardt 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
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 63d5d28085 Merge branch 'Development' into config_testing 
Latest upstream changes
 10 years ago