c7a97e18b7
Merge branch 'Development' into cleanup_ultralcd
Latest upstream changes
10 years ago
6d5c13df74
Merge pull request #1520 from thinkyhead/fixup_temperature
Fix typos in checkExtruderAutoFans
10 years ago
5b9e341222
Merge pull request #1516 from thinkyhead/fixup_ramps
Cleanup ramps boards
10 years ago
57bc28b42c
Cleanup and fix ultralcd.cpp
- Fix bug in lcd_control_temperature_menu
- Remove test menu-item left in from multi-line command feature
- Replace literals with translatable strings
- Reduce lcd_preheat code redundancy
- Reduce menu macro redundancy
- Clean up formatting
10 years ago
4fcd4b444e
Merge pull request #1519 from thinkyhead/fix_recent_issues
Fix implementation of PID menu items
10 years ago
9c35ed149d
Merge pull request #1508 from AnHardt/iss1492
Fix iss#1492
10 years ago
430c4b6538
Replace missing backslash
10 years ago
a8939eec28
Readability of MENU_MULTIPLIER_ITEM
Last commit before bed.
10 years ago
09e09b308e
Tweaky spacing adjustments
10 years ago
e3fd3e8fa4
Fix typos in checkExtruderAutoFans
10 years ago
c610471b0c
Add PID_PARAMS_PER_EXTRUDER conditional
10 years ago
2d6fa9ce80
Proper implementation of PID menu items
- Make this work per #1344
10 years ago
b8e79dce89
Fix compilation errors when encoder multiplier is disabled
10 years ago
65e1fc71be
Add encoder rate multiplier
10 years ago
c9465c33cf
Merge branch 'thinkyhead-fixup_ramps_boards' into Development
Merge resolving conflicts
10 years ago
623119619c
Merge branch 'fixup_ramps_boards' of https://github.com/thinkyhead/Marlin into thinkyhead-fixup_ramps_boards
Merge commit
10 years ago
859c8d3fef
Azteeg X3 overrides too
10 years ago
7891eacf21
Merge branch 'Development' into fixup_ramps_boards
- Also apply cleanup for #1514
10 years ago
b12cd1f841
Merge pull request #1514 from 2PrintBeta/Development
Initial definitions for the Boards BAM&DICE + BAM&DICE Due
10 years ago
15b73386b5
Add pin definitions for the Boards BAM&DICE + BAM&DICE Due
10 years ago
08c236059e
Merge pull request #1505 from thinkyhead/issue_1499
Bed leveling probe behavior issue?
10 years ago
ab419795b3
Merge pull request #1511 from MagoKimbra/Reset_Alert_message_M600
Reset Alert message when finish M600 command
10 years ago
159196d1e9
Reset Alert message when finish M600 command
10 years ago
266ff227cf
Merge pull request #1510 from docdawning/Development
Trivial spelling correction
10 years ago
dfd4e74a5c
Trivial spelling correction
10 years ago
6cdcd6c6d1
Fix iss#1492
Introduced lcd_strlen() and lcd_strlen_P().
Replaced the old functions where necessary.
Reworked language_ru.h.
Speeded up test for zero length string in cardreader.cpp
10 years ago
63a5ff7ab9
Merge pull request #1489 from tommil/Development
Updated Finnish language file
10 years ago
efb0491d40
Merge branch 'Development' into issue_1499
Merging latest upstream changes
10 years ago
961998cf91
Merge pull request #1496 from thinkyhead/issue_1493
Megatronics 3 servo pins
10 years ago
59e92a2db4
Merge pull request #1506 from thinkyhead/issue_1504
Issue #1504 – K8200 Z_ENABLE_PIN
10 years ago
b71322e793
Issue #1504 – K8200 Z_ENABLE_PIN
- K8200 uses a non-standard RAMPS with Z_ENABLE=63 ??
- Assuming from previous input that 3DRAG is the same.
10 years ago
978d114c73
Bed leveling probe behavior issue?
The `float` keyword should not be on these vars because they conceal
the outer vars, preventing them from obtaining known values before
being passed in `set_bed_level_equation_3pts`. Possibly related to
`Z_RAISE_BETWEEN_PROBING` not functioning.
10 years ago
7c6236761a
Merge branch 'Development' into issue_1493
Merging latest upstream changes
10 years ago
d28f5b9e82
Support for simple customisable AutoZProbing area
When probing PCB´s I had the problem that i needed auto-leveling for specific areas (it´s never the same size).
Not much code, but very useful.
Now I use simply G29 L5 R55 F5 B35 P3 to probe a 4x6cm PCB before milling.
I used int for values... might be wrong...
I hope this time I got the right development tree. (tried first with https://github.com/MarlinFirmware/Marlin/pull/1130/commits )
10 years ago
3e6ae25481
Merge branch 'Development' of https://github.com/tommil/Marlin into Development
10 years ago
513ff94b89
Merge remote-tracking branch 'upstream/Development' into Development
10 years ago
07a9165ca2
Merge remote-tracking branch 'upstream/Development' into Development
10 years ago
afc737ca0c
Fix CoreXY Homing Routine.
Fixed how stepper ISR figure it out when the head (extruder) is going to
Min or Max direction.
Added Homing to Max Endstops.
10 years ago
7866fa161f
Merge pull request #1476 from Natealus/Development
Compiling errors with 4 Extruders defined and Viki 2 Implementation
10 years ago
8cfdd3e8a4
Merge pull request #1423 from MoonCactus/Development
Multi-line G-code commands
10 years ago
ea9e49b20d
ARRAY_BY_EXTRUDERS 4th hotend PID parameters
10 years ago
d0ad8a978c
Megatronics 3 servo pins
- Naive implementation, assuming the data sheet pin numbers correspond
to Arduino pin numbers.
10 years ago
622a531d9c
Fixed error in translation
10 years ago
290ab42d22
Updated Finnish translations
10 years ago
22a7985445
reverted to upstream
10 years ago
b3bda57ca2
reverted to upstream
10 years ago
9d75a56b56
Merge remote-tracking branch 'upstream/Development' into Development
Conflicts:
Marlin/Configuration.h
Marlin/Marlin_main.cpp
10 years ago
0a59fee763
Merge remote-tracking branch 'upstream/Development' into Development
10 years ago
d75cd69de4
Merge pull request #1488 from Wurstnase/Development
Bedleveling: X and Y must be Integers not Float!
10 years ago
eb5889b3da
Merge pull request #1479 from AnHardt/en_first
#include "language_en.h" before the national language in language.h
10 years ago
Scott Lahteine
Scott Lahteine
wgm4321
domonoky
MagoKimbra
daid
DocDawning
AnHardt
MarcelMo
Tommi Lamberg
alexborro
Natealus
Jérémie FRANCOIS