1203 Commits (d85411f13afe66be65ad78caf754a968ca56ca92)

Author SHA1 Message Date
ErikZalm fde8c2c310 Merge pull request #807 from Cylindric3D/typofixes_upstream5
Various typo fixes #5 - only in comments, no code changes.
11 years ago
Cylindric fdce91192e Various typo fixes - only in comments, no code changes. 11 years ago
Cylindric d819c55395 Various typo fixes - only in comments, no code changes. 11 years ago
ErikZalm fd4542f33a Merge pull request #805 from whosawhatsis/M200
autretract fix
11 years ago
ErikZalm e8291ed728 Merge pull request #802 from Makers-Tool-Works/Marlin_v1
Clarify which PID values to enter
11 years ago
ErikZalm 465b654d24 Merge pull request #797 from Cylindric3D/update_menu_plan
Update menu plan
11 years ago
ErikZalm 88506a80c3 Merge pull request #789 from smiler/Marlin_v1
Fixed typo.
11 years ago
ErikZalm b514d3c87f Merge pull request #781 from Cylindric3D/typofixes_upstream
Various typo fixes #3 - only in comments, no code changes.
11 years ago
whosawhatsis 77df0d689a autretract fix
I made these changes previously, but I can’t find the commit now. This
reapplies the changes to get auto retract working again.

Conflicts:
	Marlin/Configuration_adv.h
	Marlin/Marlin_main.cpp
11 years ago
ErikZalm cc5f1d475c Merge pull request #772 from ellensp/Marlin_v1
Updated gen3+ board pins names to current convention
11 years ago
Cylindric 91759dede6 Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into typofixes_upstream 11 years ago
Cylindric 557217fc05 Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into update_menu_plan 11 years ago
RoyOnWheels aee63afccd Clarify which PID values to enter
Users can be confused as to which values to enter after a PID tune. Updating the message to help clarity it.
New message: "PID Autotune finished! Put the last Kp, Ki and Kd constants from above into Configuration.h"

Old message: "PID Autotune finished! Put the Kp, Ki and Kd constants into Configuration.h"
11 years ago
Gabe Rosenhouse 99f6326544 Remove unnecessary dependency on time.h from qr_solve.cpp
Fixed compiler errors on Ubuntu using arduino-core
11 years ago
Cylindric ea669cb504 Fix some extra and some missing tabs, to make the file consistent. 11 years ago
Cylindric b46a1b6360 Update the menu plan document with the current menu as per ultralcd.cpp. 11 years ago
Cylindric 3cc7626d1f Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into update_menu_plan 11 years ago
Gabe Rosenhouse 174b8d99d5 Simplify 3-point probing using new code only 11 years ago
Gabe Rosenhouse 3b718b816c better documentation 11 years ago
Gabe Rosenhouse 34fd59c370 ABL at any points 11 years ago
Cylindric 541155ea87 Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into typofixes_upstream 11 years ago
alexborro 9fa328e5c8 Merge pull request #793 from MissionSt/use_axis_enums
Use constants instead of numeric literals
11 years ago
Gabe Rosenhouse f308a8af91 update comment 11 years ago
Gabe Rosenhouse 357e31270a Prevent G29 without first homing in X and Y
If position is unknown, then G29 can be dangerous.
11 years ago
Gabe Rosenhouse d2d7d186b5 Use descriptive constants, more 11 years ago
Gabe Rosenhouse 2ccdf4f36d Use descriptive constants instead of numeric literals 11 years ago
Christian Axelsson c00383f286 Fixed typo. 11 years ago
Cylindric 60f72a78a9 Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into typofixes_upstream 11 years ago
nothinman abba7a0003 Merge pull request #782 from marcovannoord/Marlin_v1
Added dutch to language.h
11 years ago
Cylindric b868d668fa Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into typofixes_upstream 11 years ago
Marco 8212d8d543 Revert "Fixed small typo that would prevent compiling"
This reverts commit 51ae4881ab.
11 years ago
daid 46bae30573 Merge pull request #776 from whosawhatsis/fwretract
Fwretract fixes, cleanup
11 years ago
Marco 51ae4881ab Fixed small typo that would prevent compiling 11 years ago
Marco 498d76fd79 Fixed some messages where the text shown on the screen was more than 17 characters 11 years ago
Jim Morris af9395ac2e Add M605 to dynamically set delta configuration
Save above configs in eeprom
fix docs in createTemperatureLookupMarlin.py
add missing azteegX3pro digipot settings in delta example config
11 years ago
nothinman fd42f0d226 Merge pull request #783 from MissionSt/fix/syntax-error
Fix compile error
11 years ago
nothinman 96217bf36a Merge pull request #777 from PxT/M114
Add whitespace to M114 output
11 years ago
Marco cf5c3b6610 Added dutch to language.h 11 years ago
Gabe Rosenhouse d1c64b9dc4 Fix syntax error introduced in 477b6fa1d 11 years ago
Cylindric 5d50819791 Various typo fixes - only in comments, no code changes. 11 years ago
nothinman 3f455889d0 Merge pull request #769 from Cylindric3D/typofixes_1
Various typo fixes - only in comments, no code changes.
11 years ago
nothinman 4ddedb3b27 Merge pull request #780 from Cylindric3D/typofixes_2
Various typo fixes #2 - only in comments, no code changes.
11 years ago
nothinman d4ba23bc28 Merge pull request #770 from josefpavlik/Marlin_v1
Marlin v1
11 years ago
nothinman bbb424bd2f Merge pull request #779 from MissionSt/makefile-fix-abl
Makefile fixes
11 years ago
Cylindric 8f0cee2a14 Various typo fixes - only in comments, no code changes. 11 years ago
Cylindric 08263ae66e Merge branch 'Marlin_v1' into typofixes_1 11 years ago
Gabe Rosenhouse 5bd09d26e2 Makefile works with auto bed leveling 11 years ago
Gabe Rosenhouse b45beeffd6 typo fix in Makefile 11 years ago
Paul Telford 306588925d Add whitespace to M114 output 11 years ago
whosawhatsis c43838bb1e disable auto retract by default
This should make it safe to enable FWRETRACT by default, with
autoretract (which should now be fixed) only enabled by M209. FWRETRACT
should probably now default to enabled (to make G10/G11 and M207-209
available, without changing functionality when they are not used), but
I’ll save that for another pull request/discussion.
11 years ago
whosawhatsis 99f0e44864 Move FWRETRACT defaults to configuration_adv.h 11 years ago
whosawhatsis 66e3869138 Fix autoretract
This takes the (now working) G10/G11 code and moves it to a function,
which is called by G10 and G11, and also called by G1 if autoretract is
enabled and a retract/recover move is detected.
11 years ago
whosawhatsis 2f2459c0db Fix G10/G11 Z-lift 11 years ago
Gabe Rosenhouse 8c5675c290 Use language.h instead of English literals for "bed" 11 years ago
Gabe Rosenhouse 0f7393a13e Refactor 'accurate' auto bed leveling to use probe_pt() 11 years ago
Gabe Rosenhouse c4fbb44d6d Refactor 3-point auto bed leveling to use probe_pt() 11 years ago
Gabe Rosenhouse ad2c6488c7 Add probe_pt(), useful for auto bed leveling 11 years ago
Peter c9c83a4560 Updated gen3+ board pins names to current convention 11 years ago
Mark Hanford ab0d3c4fb3 Various typo fixes - only in comments, no code changes. 11 years ago
Josef Pavlik 477b6fa1df move engaged from lcd console refreshes power off timeout 11 years ago
Josef Pavlik 831fc2a952 Pt100 and Pt1000 temperature sensors handling 11 years ago
nothinman 7dcd350941 A few changes to Russian, changed LCD strings to be <=17 characters. 11 years ago
daid c31bb2b7ad Only show the ZProbe offset when auto-bed-leveling is enabled. 11 years ago
daid 46f5bea19f Add configurable beep for UltiPanel. 11 years ago
daid d16a770855 Ultimainboard 2.x does not has a PS_ON pin. 11 years ago
daid 71bb3a8133 Add comments for Ultimainboard 2.0 configuration. 11 years ago
daid 9b7d87e885 Remove duplicate contrast define. 11 years ago
daid 816f0a678a Merge pull request #768 from whosawhatsis/Marlin_v1
multiple FWretract fixes
11 years ago
whosawhatsis 6e43398509 G10/G11 bugfixes
Previous version was broken by using G92 E0 between retract and recover.
11 years ago
whosawhatsis d6c5c503d4 correct feedrate units in comments for M207/M208 11 years ago
nothinman 15d6116188 Merge pull request #689 from cajun-rat/tidy
Use C++ initialization list
11 years ago
Martin Lukasik 0b9ecf3824 Language cleanup, part 1. 11 years ago
whosawhatsis b5ba5c1465 Merge branch 'Marlin_v1' of https://github.com/whosawhatsis/Marlin into Marlin_v1 11 years ago
whosawhatsis 78e7654601 Keep FWRETRACT values in terms of millimeters when using M200
for volumetric E units
11 years ago
whosawhatsis 3f6d44d40b Keep FWRETRACT values in terms of millimeters when using M200 for volumetric E units 11 years ago
Cylindric 363dc2f0e8 Merge branch 'Marlin_v1' into update_menu_plan 11 years ago
nothinman 5f797ca29f Updated Polish, changed default firmware URL to Marlin. 11 years ago
Mark Hanford 0778f5f028 Add missing entries to the new Aragonian language. 11 years ago
Mark Hanford 54bab3e0d0 Merge branch 'Marlin_v1' into localisation
Conflicts:
	Marlin/language.h
11 years ago
Mark Hanford bdd0211aeb Move strings in ultralcd.cpp into language.h. 11 years ago
Daniel Martinez c8e5a82d49 keep English as default lang. 11 years ago
Daniel Martinez f64592e362 Add Aragonese translation 11 years ago
ErikZalm ac74f45dc0 Merge pull request #752 from MatixYo/patch-3
Update language.h
11 years ago
MatixYo 36086d3ca4 Update language.h
Updated Polish translations.
11 years ago
Cylindric 1781031f2d Update LCD Menu Tree with current options, based on ultralcd.cpp and language.h. 11 years ago
Jim Morris d485988bec fix typo 11 years ago
Jim Morris 8a1fd25363 Default is to not define digipot_i2c 11 years ago
Jim Morris 5097c57d3a Added pins for Azteeg X3 Pro under motherboard 68 11 years ago
Jim Morris b819fc53ca Add Azteeg X3 Pro as motherboard 68
Add digipot i2c control for MCP4451
Allow M907 to set i2c digipot currents in amps
Fix Makefile to allow Azteeg motherboards
Fix Makefile to allow Wire libraries only
Add beeper pin for Azteeg X3 Pro
11 years ago
ErikZalm e1ae7952eb Merge pull request #743 from Opticalworm/Marlin_v1
Improved support for panelolu2 encoder and buzzer
11 years ago
David Forrest a5f53f0cf3 Heater wattage reporting for M105 using EXTRUDER_WATTS and BED_WATTS 11 years ago
Ronald 8d162e5bd7 Improved support for panelolu2 encoder and buzzer
I added #define for LCD_FEEDBACK_FREQUENCY_HZ and
LCD_FEEDBACK_FREQUENCY_DURATION_MS  which is used to alter the default
buzzer sound.

When selecting Panelolu2 in configuration.h:
- it automatically sets the correct ENCODER_PULSES_PER_STEP and
ENCODER_STEPS_PER_MENU_ITEM.
- if LCD_USE_I2C_BUZZER is defined it will also set the default
LCD_FEEDBACK_FREQUENCY_HZ and LCD_FEEDBACK_FREQUENCY_DURATION_MS

When selecting the sanguinololu 1284p the following is true:
- its now enables  LARGE_FLASH
- It enables the gcode M300 when the panelolu2 LCD_USE_I2C_BUZZER is
defined
11 years ago
whosawhatsis b2c11ba980 Change diameter code to 'D'
For some reason that I can’t figure out, the decimal is dropped when
using ’S’ for the code.

Also some minor code improvements to M200.
11 years ago
ErikZalm 61059385a3 Merge pull request #737 from whosawhatsis/M200
M200 implementation
11 years ago
whosawhatsis 856edfcc0d Fixed math
This is why I wanted to sleep on the code I wrote while falling asleep
rather than immediately submitting a pull request.
11 years ago
ErikZalm 0d81ae77bc Merge pull request #727 from drf5n/oversampling
temperature.cpp: Actually use OVERSAMPLENR in the oversampling calculation.
11 years ago
ErikZalm 84df13f7d1 Merge pull request #721 from drf5n/lcdOnly
Enable basic ULTRA_LCD screen w/o encoders and menus.
11 years ago
ErikZalm 4c7e9502ad Merge pull request #718 from drf5n/temptableRes
createTemperatureLookupMarlin.py: Add resolution comments and format for...
11 years ago
ErikZalm 652a0f6b5a Merge pull request #717 from drf5n/tpins2
fastio.h: Add AT90USBxx_TEENSYPP_ASSIGNMENTS for teensyduino/Lincomatic/...
11 years ago
ErikZalm 96a0cdc541 Merge pull request #716 from drf5n/maketeensy
Makefile: Update for Arduino 1.0.5 and Teensyduino dependent boards (HAR...
11 years ago