3618 Commits (4e14e152fa8bf02ec60df44ba5f3acb8e7ecebc7)
 

Author SHA1 Message Date
monkeydave 21cc188272 Updated .travis.yml for ErikZalm branch pull request
10 years ago
monkeydave 86cc22d639 Readd .travis.yml, change build enviroment to use ino instead of gcc
10 years ago
monkeydave 3f9707aa33 Added .gitignore back into repo
10 years ago
Alexander Hirzel f36fd3ddec Merge branch 'Development' of https://github.com/ErikZalm/Marlin into Development
10 years ago
alexborro 912ed155c5 Merge pull request #1292 from thinkyhead/docs_and_scripts
10 years ago
Scott Lahteine b5e50cdd4e Move scripts and documentation to subfolders
10 years ago
Alexander Hirzel eed451e034 rework analogInputToDigitalPin definition
10 years ago
Alexander Hirzel f3209bba34 Merge branch 'Development' of https://github.com/alhirzel/Marlin into Development
10 years ago
Lane Roberts 1f520a5a8c Due to the fix for #1248, X and Y probe offsets must not be floats.
10 years ago
wgm4321 b32be2dc64 Fix syntax error caused by previous changes.
10 years ago
wgm4321 edac64e7d2 Add Filament menu and add Filament/Retract settings to config store.
10 years ago
Alexander Hirzel ecda6cdc0a Fix typo, PID_BED_POWER -> MAX_BED_POWER
10 years ago
David Forrest f3e503e725 temperature.cpp: Fix typo of PID_MAX to MAX_BED_POWER for the bed.
10 years ago
David Forrest 1d5d853c9a temperature.cpp: Fix typo of MAX_BED_PID to MAX_BED_POWER.
10 years ago
Bo Herrmannsen 63da6900b0 Merge pull request #1282 from vandarin/Development
10 years ago
Bo Herrmannsen a18b625534 Merge pull request #1261 from wgm4321/Development
10 years ago
alexborro 975810fb4a Merge pull request #1286 from alhirzel/Development
10 years ago
Alexander Hirzel ae12ad0d6c Fix typo, PID_BED_POWER -> MAX_BED_POWER
10 years ago
alexborro 80b17ab573 Merge pull request #1285 from drf5n/PID_CI_v2
10 years ago
David Forrest 625860f086 temperature.cpp: Fix typo of PID_MAX to MAX_BED_POWER for the bed.
10 years ago
David Forrest 6583bb781d temperature.cpp: Fix typo of MAX_BED_PID to MAX_BED_POWER.
10 years ago
Lane Roberts 2701dd8a17 Due to the fix for #1248, X and Y probe offsets must not be floats.
10 years ago
Bo Herrmannsen 217186d7bc Merge pull request #1281 from Grogyan/patch-2
10 years ago
Grogyan 6b82415c81 Update pins.h
10 years ago
Bo Herrmannsen 692a01b1c7 Merge pull request #1277 from thinkyhead/fix_regressions
10 years ago
Bo Herrmannsen 878b5557a1 Merge pull request #1276 from thinkyhead/lcd_z_reformat
10 years ago
Scott Lahteine 2ec2bf1564 Fix regressions affecting compilation
10 years ago
Scott Lahteine 6c591a97a1 Merge branch 'lcd_z_reformat' of https://github.com/thinkyhead/Marlin into lcd_z_reformat
10 years ago
Scott Lahteine e7db8ee9e5 ftostr32np > ftostr32sp
10 years ago
Scott Lahteine 10e1b6ef8b Least stack-usage self-contained ftostr32np()
10 years ago
Scott Lahteine d1f21d1189 As it should be
10 years ago
Scott Lahteine 449dad71f2 Least stack-usage self-contained ftostr32np()
10 years ago
Scott Lahteine a2109cb492 Patch to make Z look more like X and Y on UltraLCD
10 years ago
Bernhard Kubicek 3d1da45f3e Update Marlin.h
10 years ago
bkubicek d02daec08f fixed compilation
10 years ago
alexborro 0268c03a75 Merge pull request #1271 from RobotCaleb/DeltaCalMenu
10 years ago
Caleb Anderson 991a74b75b Move delta calibration menu to sample delta configuration.
10 years ago
Bo Herrmannsen 2bf6d804c4 Merge pull request #1269 from Wurstnase/Development
10 years ago
Wurstnase 9453bb13c2 Logic error correction
10 years ago
Bo Herrmannsen 67fd8f0727 Merge pull request #1267 from RobotCaleb/LanguageFix
10 years ago
Caleb Anderson 2309c9f43a Merge branch 'LanguageFix' of github.com:RobotCaleb/Marlin-Kossel_Clear into LanguageFix
10 years ago
Caleb Anderson 236db44669 Fix spacing
10 years ago
Caleb Anderson e6774fb7d2 Using the new language implementation wasn't behaving as expected.
10 years ago
Bo Herrmannsen f4ce235589 Merge pull request #1266 from RobotCaleb/DeltaCalMenu
10 years ago
Caleb Anderson cb047e9070 Actual menu change. Moved menu logic to not be shown unless not currently printing. (untested but straight-forward, printer in a bad state currently)
10 years ago
Caleb Anderson 5b336a4cdb Delta calibration menu based on http://minow.blogspot.com/index.html#4918805519571907051
10 years ago
Bernhard Kubicek 10ad9f1062 Addes servo0 pin ultimaker
10 years ago
Bernhard Kubicek f24c5d82e3 Update Marlin_main.cpp
10 years ago
Bernhard Kubicek 053b541de8 Merge pull request #1265 from Wurstnase/Development
10 years ago
Wurstnase 8a6f098cc6 Expand manage_inactivity #1264
10 years ago