1566 Commits (22e591518a60c0597a6d805846fc359ebc92ad72)

Author SHA1 Message Date
odewdney cd55a93a13 re-add blank line 10 years ago
odewdney 23bfe30036 moved include themister to temperature.c 10 years ago
odewdney 538859669d Removing compiler warnings for progmem 10 years ago
grob6000 bf2c923db5 Make multiple PID parameters a config option
* Adds config parameter `PID_PARAMS_PER_EXTRUDER` - allows single PID
parameters to be used where this would be preferable (e.g. dual
identical extruders)
* When disabled, will use `float Kp, Ki, Kd, Kc;` as before.
Preprocessor macros used to switch between.
* ultralcd.cpp defines extra menus for extra parameters only where
required
* M301 reports `e:xx` only if independent pid parameters enabled
* EEPROM structure still leaves space for 3 extruders worth, when undef
will save single parameter to all extruder positions, but only read the
first
* Switching off saves approx 330 B with no LCD enabled, 2634B with LCD
(RRD) enabled: this is significant.
* LCD modifications should be tested.
10 years ago
grob6000 0877aa0fe0 Merge remote-tracking branch 'upstream/Development' into independent_pid 10 years ago
msutas e0beb98fd3 Improvement - G29 Option for Not Retracting Servo
This change introduces an improvement to G29 command on Marlin.

Auto bed leveling operation's reliability is based on the repeatability of the Z-probe switch and the servo. This change introduces an option to G29 command. When the G29 command is sent with an "e" option, during auto bed levelling the servo is not retracted between probes which decreases the bias on auto bed levelling resulting from servo.

G29 command does the auto bed probing as it is.

G29 E command engages the servo on first probing point, probes all points and retracts the servo after probing the last point.

Please comment your opinions, test on your printer and check the code on a programmer's perspective. (I am not a good programmer.)
10 years ago
grob6000 7d32c7f36d Multiple PID parameter edit for ultralcd
* Depending on extruder count, will add menu items for ultralcd to edit
individual PID parameters for each extruder
* Added menu items to each language_xx.h
* Builds OK, but recommend testing with typical LCD
10 years ago
Steffen Vogel 69dc411ae0 Merge branch 'Development' of github.com:MarlinFirmware/Marlin into LogoLCD
Conflicts:
	Marlin/dogm_lcd_implementation.h
10 years ago
grob6000 3e2af67ce3 Fix R-H compatibility
* R-H reads incorrect M301 line from EEPROM output if more than one is
present. Reverted to original output format, using only E0 value.
10 years ago
grob6000 37c7e8300f Independent PID parameters for each extruder
* Variables Kp, Ki, Kd, Kc now arrays of size EXTRUDERS
* M301 gains (optional, default=0) E parameter to define which
extruder's settings to modify. Tested, works with Repetier Host's EEPROM
config window, albeit only reads/updates settings for E0.
* All Kp, Ki, Kd, Kc parameters saved in EEPROM (version now v14), up to
3 extruders supported (same as Marlin in general)
10 years ago
Scott Lahteine 326b925557 DOGLCD and LCD_PROGRESS_BAR to coexist
Small changes (and formatting to confuse the diff’er) which first
allows DOGLCD and LCD_PROGRESS_BAR to be enabled in tandem, then a
#warning (rather than error) that the extra progress bar / message
options don’t apply to graphical displays at this time. This leaves
open perhaps combining the progress bar and message area in some future
(or forked custom) graphical LCD display arrangement (at which time the
relevant variables may be moved into ultralcd.cpp with externs in
ultralcd.h). I also added a conditional error that the progress bar and
the filament display may not work well together.
10 years ago
Erik van der Zalm 1aade4a8e2 Merge branch 'Development' of https://github.com/MarlinFirmware/Marlin into Development 10 years ago
Erik van der Zalm 8a2e84e3f1 Possible fix for FWRETRACT with 0 zlift. 10 years ago
Steffen Vogel 905aab3b85 added missing #endif 10 years ago
Steffen Vogel b9cf1465a7 updated LCD bouts with new strings and bitmaps
new version is pretty generic and should work in most scenarios
10 years ago
Steffen Vogel c7632be5cc added high and low resolutions version of splash screen logo (saving code size) 10 years ago
Steffen Vogel 8f0dba7cbf adding string for bouts splash string to config 10 years ago
Bo Herrmannsen d94109e886 updated logo post and ver info 10 years ago
Bo Herrmannsen cd33b5b062 changed logo and ver info
logo is now 110 pixels wide and starts 9 pixels in from top left corner and also 9 pixels down from same corner... this will give a 9 pixel border all way round

ver info is placed centered and there is a 9 pixel from bottom of display to ver info
10 years ago
Bo Herrmannsen 9b6c1cfda6 removed unneeded lines in welcome msg 10 years ago
Bo Herrmannsen ffa09f86f4 moved ver info 5 spaces to the right 10 years ago
Alex Borro 2bbb68be8a Fix calculation of BAL grid fitting into the bed
The previous calc was wrong. Between N points there are only N-1 gaps,
not N.

So changing AUTO_BED_LEVELING_GRID_POINTS to
(AUTO_BED_LEVELING_GRID_POINTS-1)
10 years ago
Bo Herrmannsen 590caafa2d changed ver info 10 years ago
Bo Herrmannsen 3bb9b31515 changed boot logo a bit to test if fat wall goes away 10 years ago
Steffen Vogel da192c521f Merge pull request #1333 from andrewsil1/development
Fix grammar/typos in new Configuration.h option
10 years ago
Erik van der Zalm 3a30d45c2e Revert "issue 968 for dev branch" 10 years ago
andrewsil1 269ec9f87f Fix grammar/typos in new Configuration.h option
(For the SLOW_PWM_HEATERS option)
10 years ago
Todd Swindoll 506353892e Rambo Pin documentation and servo support
Updated pins reference and servo support.

cross referenced between Rambo 1.1, 1.2, and 1.3
10 years ago
Steffen Vogel 8d7bfd03d8 moved/renamed documentation stuff to top-level directory 10 years ago
Bo Herrmannsen 3c9e6b7b62 added link for pic to hex converter 10 years ago
Bo Herrmannsen 0e760274bd changed reprap logo to marlin logo 10 years ago
Bo Herrmannsen b291a422e9 added square png version of logo
406*406 pixels
10 years ago
Luis E Alvarado 7ae548cf34 Update Marlin Firmware URL 10 years ago
Erik van der Zalm 8f9067faa6 Added marlin logos. (Designed by Ahmet Cem TURAN) 10 years ago
Bo Herrmannsen addf52fd4a Merge pull request #1328 from DinoMesina/development
Some corrections and new features
10 years ago
Dino Del Favero 5cfe13f240 Correct some mistakes 10 years ago
Dino Del Favero c7e2d73039 Merge branch 'development'
ok
10 years ago
Alex Borro 422a958a34 Fix CoreXY speed calculation
For cartesian bots, the X_AXIS is the real X movement and same for
Y_AXIS.
But for corexy bots, that is not true. The "X_AXIS" and "Y_AXIS" motors
(that should be named to A_AXIS
and B_AXIS) cannot be used for X and Y length, because A=X+Y and B=X-Y.
So we need to create other 2 "AXIS", named X_HEAD and Y_HEAD, meaning
the real displacement of the Head.
Having the real displacement of the head, we can calculate the total
movement length and apply the desired speed.
10 years ago
Dino Del Favero 038fccd7a1 I have added some code in the "temperature.cpp" for have the possibility of control the time of the states with the heater drived by relays, with this feature now it is possible use PID function in conjunction with relay to control the temperature. I have made some tests and the temperature stay always in the range of +-1°C from the setted temp.
There is the possibility of turn on this features adding "#define SLOW_PWM_HEATERS" in Configuration.h
10 years ago
DinoMesina 6730335657 Update Configuration.h 10 years ago
Bo Herrmannsen 4ffecdbf7d Merge pull request #1313 from wgm4321/Development
Re-enable filament menu with recalc fix when enabling/disabling mm3
10 years ago
Steffen Vogel 672f764b4d replaced ASCII GPL v3 license by markdown version
moved new COPYING file to top-level directory to make it more visible and remove clutter from Marlin subduer
10 years ago
Steffen Vogel f25e793cff rename stepper lookup table scipt to be consistent with termistor lookup table script 10 years ago
Steffen Vogel df17a6a1b4 fix #1305 by proposed workaround (thanks gaby64) 10 years ago
Steffen Vogel f7e65935fb make use of power operator 10 years ago
Steffen Vogel 4e02aff9b5 automatically determine min/max temp for terminator 10 years ago
Steffen Vogel 81363bc441 more cleanups 10 years ago
Steffen Vogel 95f4a55820 refactored termistor table calculation to be in line with wikipedia's article about Steinhart-Hart coefficients 10 years ago
Steffen Vogel 21205cc3d8 more cleanups in the termistorTable generation script 10 years ago
Steffen Vogel fb0996b5db improved output aligment and precision 10 years ago
Steffen Vogel 538231edfd cosmetic whitespace cleanup and comments added/updated 10 years ago
wgm4321 067b509479 Re-enable filament menu with recalc fix when enabling/disabling mm3 10 years ago
wgm4321 a19f2f8ae7 Disable volumetric menu item due to missing recalc of of multipliers when enabled/disabled 10 years ago
wgm4321 f24dda9700 Revert "Make sure volumetric multipliers are recalc'ed during menu enable/disable of mm3"
This reverts commit dd7e4ee97f.
10 years ago
wgm4321 ec4681ab6b Revert "Add "Detailed Z Probe" menu item with ABL is defined."
This reverts commit 2b9722f387.
10 years ago
wgm4321 dd7e4ee97f Make sure volumetric multipliers are recalc'ed during menu enable/disable of mm3 10 years ago
wgm4321 2b9722f387 Add "Detailed Z Probe" menu item with ABL is defined. 10 years ago
Dan Royer 9472bbe51d issue 968 for dev branch
try, try again.

If 'OK' is garbled on sending PC won't receive it.  Both machines will
wait on each other forever.  This resends OK if nothing is heard from PC
for a while to avoid this bad case.
10 years ago
alexborro d2b6e62996 Merge pull request #1309 from philfifi/fix_temp_runaway
temp runaway: proper cast to prevent any overflow.
10 years ago
Philippe L 30248214c7 temp runaway: proper cast to prevent any overflow. 10 years ago
Bo Herrmannsen c5f138ea07 Merge pull request #1291 from alhirzel/Development
Define analogInputToDigitalPin only if needed
10 years ago
odewdney 652895d656 try different proproc for CI failure 10 years ago
Bo Herrmannsen 3d9f4ac757 Merge pull request #1303 from wgm4321/Development
Fix for cant compile when REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER ...
10 years ago
wgm4321 04fb34c7ff Add English defines for filament menu to non-English to prevent compile errors until translated 10 years ago
wgm4321 f8aa5ff771 Fix for cant compile when REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER defined 10 years ago
odewdney 39fae9e3a3 Fix progmem warning
Borrow code from https://github.com/arduino/Arduino/issues/1793
10 years ago
Alexander Hirzel f36fd3ddec Merge branch 'Development' of https://github.com/ErikZalm/Marlin into Development 10 years ago
Scott Lahteine b5e50cdd4e Move scripts and documentation to subfolders 10 years ago
Alexander Hirzel eed451e034 rework analogInputToDigitalPin definition 10 years ago
Lane Roberts 1f520a5a8c Due to the fix for #1248, X and Y probe offsets must not be floats.
The compiler does not support comparing float values: "error: floating constant in preprocessor expression"
The loss in X/Y precision shouldn't matter for Z probes, as most microswitches or inductive sensors are larger than 1mm square anyway.
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
Due to the fix for #1248, X and Y probe offsets must not be floats.
10 years ago
Bo Herrmannsen a18b625534 Merge pull request #1261 from wgm4321/Development
Add Filament menu and add Filament/Retract settings to config store.
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
temperature.cpp: Fix typo of MAX_BED_PID to MAX_BED_POWER.
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.
The compiler does not support comparing float values: "error: floating constant in preprocessor expression"
The loss in X/Y precision shouldn't matter for Z probes, as most microswitches or inductive sensors are larger than 1mm square anyway.
10 years ago
Grogyan 6b82415c81 Update pins.h
Somehow the pin definitions for the MAX6675 Slave Select/Chip Select got changed back to the hardware SPI SS/CS.  
Pin 49 cannot be used as that is used by the SD card socket to detect if an SD card is present.
Pin 53 is the Hardware SPI SS, which is dedicated, nicely, to the SD card SS and therefore cannot be used as the MAX6675 SS
Pin 66 is in Aux2 port adjacent to the Hardware SPI interface port on RAMPS 1.4, and is currently not used for anything.
10 years ago
Bo Herrmannsen 692a01b1c7 Merge pull request #1277 from thinkyhead/fix_regressions
Fix regressions affecting compilation
10 years ago
Scott Lahteine 2ec2bf1564 Fix regressions affecting compilation
This fixes two regressions, caused by #1167 and #1191 .
10 years ago
Scott Lahteine e7db8ee9e5 ftostr32np > ftostr32sp
sp=space-padded, similar to: ns=no-sign
10 years ago
Scott Lahteine 10e1b6ef8b Least stack-usage self-contained ftostr32np()
This is the optimal code for a self-contained formatter, although the
original code is crafty in being smaller and simpler, and can be
evaluated as using the original output as a scratch pad for state,
making the final formatter more straightforward. While this code is
longer, all code-paths are minimal.
10 years ago
Scott Lahteine d1f21d1189 As it should be 10 years ago
Scott Lahteine 449dad71f2 Least stack-usage self-contained ftostr32np()
This is the optimal code for a self-contained formatter, although the
original code is crafty in being smaller and simpler, and can be
evaluated as using the original output as a scratch pad for state,
making the final formatter more straightforward. While this code is
longer, all code-paths are minimal.
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
Caleb Anderson 991a74b75b Move delta calibration menu to sample delta configuration.
Turn off by default.
10 years ago
Bo Herrmannsen 67fd8f0727 Merge pull request #1267 from RobotCaleb/LanguageFix
Language Fix - Using the new language implementation wasn't behaving as expected.
10 years ago
Caleb Anderson 236db44669 Fix spacing 10 years ago
Caleb Anderson e6774fb7d2 Using the new language implementation wasn't behaving as expected.
No matter what LANGUAGE_CHOICE was set to it would always take the en branch.
I revamped it a bit to use a macro to create the language include file name. This required a slight tweak to the RU declaration since it's special-cased in a couple places in code.

This is an attempt to pull my changes from #1222 over.
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
To test/enable, uncomment the #define DELTA_CALIBRATION_MENU in Configuration.h
10 years ago
Bernhard Kubicek 10ad9f1062 Addes servo0 pin ultimaker 10 years ago
Bernhard Kubicek f24c5d82e3 Update Marlin_main.cpp
fixed minor typo
10 years ago