0e760274bd
changed reprap logo to marlin logo
10 years ago
b291a422e9
added square png version of logo
...
406*406 pixels
10 years ago
7ae548cf34
Update Marlin Firmware URL
10 years ago
8f9067faa6
Added marlin logos. (Designed by Ahmet Cem TURAN)
10 years ago
addf52fd4a
Merge pull request #1328 from DinoMesina/development
...
Some corrections and new features
10 years ago
5cfe13f240
Correct some mistakes
10 years ago
c7e2d73039
Merge branch 'development'
...
ok
10 years ago
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
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
6730335657
Update Configuration.h
10 years ago
4ffecdbf7d
Merge pull request #1313 from wgm4321/Development
...
Re-enable filament menu with recalc fix when enabling/disabling mm3
10 years ago
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
f25e793cff
rename stepper lookup table scipt to be consistent with termistor lookup table script
10 years ago
df17a6a1b4
fix #1305 by proposed workaround (thanks gaby64)
10 years ago
f7e65935fb
make use of power operator
10 years ago
4e02aff9b5
automatically determine min/max temp for terminator
10 years ago
81363bc441
more cleanups
10 years ago
95f4a55820
refactored termistor table calculation to be in line with wikipedia's article about Steinhart-Hart coefficients
10 years ago
21205cc3d8
more cleanups in the termistorTable generation script
10 years ago
fb0996b5db
improved output aligment and precision
10 years ago
538231edfd
cosmetic whitespace cleanup and comments added/updated
10 years ago
067b509479
Re-enable filament menu with recalc fix when enabling/disabling mm3
10 years ago
a19f2f8ae7
Disable volumetric menu item due to missing recalc of of multipliers when enabled/disabled
10 years ago
f24dda9700
Revert "Make sure volumetric multipliers are recalc'ed during menu enable/disable of mm3"
...
This reverts commit dd7e4ee97f
10 years ago
ec4681ab6b
Revert "Add "Detailed Z Probe" menu item with ABL is defined."
...
This reverts commit 2b9722f387
10 years ago
dd7e4ee97f
Make sure volumetric multipliers are recalc'ed during menu enable/disable of mm3
10 years ago
2b9722f387
Add "Detailed Z Probe" menu item with ABL is defined.
10 years ago
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
d2b6e62996
Merge pull request #1309 from philfifi/fix_temp_runaway
...
temp runaway: proper cast to prevent any overflow.
10 years ago
30248214c7
temp runaway: proper cast to prevent any overflow.
10 years ago
c5f138ea07
Merge pull request #1291 from alhirzel/Development
...
Define analogInputToDigitalPin only if needed
10 years ago
652895d656
try different proproc for CI failure
10 years ago
3d9f4ac757
Merge pull request #1303 from wgm4321/Development
...
Fix for cant compile when REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER ...
10 years ago
04fb34c7ff
Add English defines for filament menu to non-English to prevent compile errors until translated
10 years ago
f8aa5ff771
Fix for cant compile when REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER defined
10 years ago
39fae9e3a3
Fix progmem warning
...
Borrow code from https://github.com/arduino/Arduino/issues/1793
10 years ago
f36fd3ddec
Merge branch 'Development' of https://github.com/ErikZalm/Marlin into Development
10 years ago
b5e50cdd4e
Move scripts and documentation to subfolders
10 years ago
eed451e034
rework analogInputToDigitalPin definition
10 years ago
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
b32be2dc64
Fix syntax error caused by previous changes.
10 years ago
edac64e7d2
Add Filament menu and add Filament/Retract settings to config store.
10 years ago
ecda6cdc0a
Fix typo, PID_BED_POWER -> MAX_BED_POWER
10 years ago
f3e503e725
temperature.cpp: Fix typo of PID_MAX to MAX_BED_POWER for the bed.
10 years ago
1d5d853c9a
temperature.cpp: Fix typo of MAX_BED_PID to MAX_BED_POWER.
10 years ago
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
a18b625534
Merge pull request #1261 from wgm4321/Development
...
Add Filament menu and add Filament/Retract settings to config store.
10 years ago
ae12ad0d6c
Fix typo, PID_BED_POWER -> MAX_BED_POWER
10 years ago
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
625860f086
temperature.cpp: Fix typo of PID_MAX to MAX_BED_POWER for the bed.
10 years ago
6583bb781d
temperature.cpp: Fix typo of MAX_BED_PID to MAX_BED_POWER.
10 years ago
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
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
692a01b1c7
Merge pull request #1277 from thinkyhead/fix_regressions
...
Fix regressions affecting compilation
10 years ago
2ec2bf1564
Fix regressions affecting compilation
...
This fixes two regressions, caused by #1167 and #1191 .
10 years ago
e7db8ee9e5
ftostr32np > ftostr32sp
...
sp=space-padded, similar to: ns=no-sign
10 years ago
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
d1f21d1189
As it should be
10 years ago
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
a2109cb492
Patch to make Z look more like X and Y on UltraLCD
10 years ago
3d1da45f3e
Update Marlin.h
10 years ago
d02daec08f
fixed compilation
10 years ago
991a74b75b
Move delta calibration menu to sample delta configuration.
...
Turn off by default.
10 years ago
67fd8f0727
Merge pull request #1267 from RobotCaleb/LanguageFix
...
Language Fix - Using the new language implementation wasn't behaving as expected.
10 years ago
236db44669
Fix spacing
10 years ago
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
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
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
10ad9f1062
Addes servo0 pin ultimaker
10 years ago
f24c5d82e3
Update Marlin_main.cpp
...
fixed minor typo
10 years ago
8a6f098cc6
Expand manage_inactivity #1264
...
void manage_inactivity(bool ignore_stepper_queue=false)
standard is false so it is not necessary to change additional code. this
change should be better, hopefully nophead like this :)
10 years ago
d1995aec7a
Rename ignore_blocks_queued
...
more speaking name
10 years ago
4122de9d17
change filament issue
...
make a more general solution
10 years ago
d60efc3b5d
Fix syntax error caused by previous changes.
10 years ago
cb12161191
Add Filament menu and add Filament/Retract settings to config store.
10 years ago
ec33df0554
Merge branch 'SAV-MkI_merge' into Development
...
Tested for SAV MKI and SAV 3D LCD on lewihe.
10 years ago
0468f81950
Update for pull request #837
10 years ago
6e42c9e305
Add fwretract settings to M503 output
10 years ago
3afe66bb0c
Fix issues #1248 , #1240
...
- Fixed issue when BAL area probing is shorter than it should be for
grid probing
- Warning when BAL activated with Delta Kinematics
- Fix XY_TRAVEL_SPEED when homing Z axis
10 years ago
9eb6df17a7
Consider negative Z Offsets when auto bed leveling is active
10 years ago
c9f60183a9
Merge pull request #1233 from NarimaanV/Development
...
Fixed BABYSTEPPING feature
10 years ago
0d957872a0
Merge pull request #1234 from gregrebholz/issue_1069
...
Fixes #1069 . Added "auto fan" checks to PID_autotune.
10 years ago
9c07d28bd6
Merge pull request #1249 from drf5n/PID_CI_v2
...
temperature.cpp: Add Conditional Integration to prevent excessive integral windup
10 years ago
23e768dffa
Merge pull request #1250 from chertykov/Development
...
Move initialization of errormagic[] and echomagic[] to Marlin_main.cpp
10 years ago
2f467e2797
LCD Progress Bar
10 years ago
050ca9ca13
Move initialization of errormagic[] and echomagic[] to Marlin_main.cpp
10 years ago
cf52c48d19
Configuration.m: Set PID_INTEGRAL_DRIVE_MAX from PID_MAX from BANG_MAX.
...
Current defaults are all 255. If it makes sense to reduce them, they should come down together, and
be in a PID_INTEGRAL_DRIVE_MAX <= PID_MAX <- BANG_MAX relationship.
10 years ago
984177c40c
temperature.cpp:Add PID Conditional integration on heated bed.
10 years ago
c9b8435749
heater.c: Limit PID I term with conditional integration.
10 years ago
7ecb7cbd46
Added "auto fan" checks to PID_autotune
10 years ago
7667949aca
Fixed BABYSTEPPING feature
...
Moved PSTR() macro to correct place which was causing the " initializer fails to determine size of '__c' " when attempting to compile with BABYSTEPPING enabled.
10 years ago
d74aabf259
Revert "Change Auto_Bed_Leveling to Auto_Bed_Compensation"
10 years ago
60628864ca
Merge pull request #1167 from thinkyhead/sd_freemem
...
Use SdFatUtil::FreeRam() for freeMemory() if there
10 years ago
889d7ba218
Merge pull request #1177 from martin-pr/probing_z_speed
...
Split do_blocking_move() to XY and Z sections
10 years ago
5e7bd2dc87
Merge pull request #1200 from chertykov/Marlin_v1
...
Fix syntax errors in #ifdef
10 years ago
b086394178
Fix syntax errors in #ifdef.
10 years ago
39d28a9bbf
Update qr_solve.h
...
Changed level to compensation
10 years ago
6325968a39
Update qr_solve.cpp
...
Changed leveling to compensation
10 years ago
e99f24ff2f
Update planner.h
...
Changed level and leveling to compensation.
10 years ago
ac204028e7
Update planner.cpp
...
Changed level and leveling to compensation
10 years ago
Bo Herrmannsen