5cfe13f240
Correct some mistakes
2015-01-06 21:55:08 +01:00
c7e2d73039
Merge branch 'development'
...
ok
2015-01-06 20:18:03 +01:00
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.
2015-01-06 16:39:48 -02:00
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
2015-01-06 18:32:17 +01:00
6730335657
Update Configuration.h
2015-01-06 18:06:02 +01:00
4ffecdbf7d
Merge pull request #1313 from wgm4321/Development
...
Re-enable filament menu with recalc fix when enabling/disabling mm3
2015-01-06 13:47:49 +01:00
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
2015-01-06 11:49:05 +01:00
f25e793cff
rename stepper lookup table scipt to be consistent with termistor lookup table script
2015-01-06 10:30:20 +01:00
df17a6a1b4
fix #1305 by proposed workaround (thanks gaby64)
2015-01-06 10:29:26 +01:00
f7e65935fb
make use of power operator
2015-01-06 10:28:43 +01:00
4e02aff9b5
automatically determine min/max temp for terminator
2015-01-06 10:28:19 +01:00
81363bc441
more cleanups
2015-01-06 10:27:40 +01:00
95f4a55820
refactored termistor table calculation to be in line with wikipedia's article about Steinhart-Hart coefficients
2015-01-06 08:24:59 +01:00
21205cc3d8
more cleanups in the termistorTable generation script
2015-01-06 08:23:51 +01:00
fb0996b5db
improved output aligment and precision
2015-01-06 08:20:52 +01:00
538231edfd
cosmetic whitespace cleanup and comments added/updated
2015-01-06 08:20:20 +01:00
067b509479
Re-enable filament menu with recalc fix when enabling/disabling mm3
2015-01-05 22:29:29 -05:00
a19f2f8ae7
Disable volumetric menu item due to missing recalc of of multipliers when enabled/disabled
2015-01-04 22:15:16 -05:00
f24dda9700
Revert "Make sure volumetric multipliers are recalc'ed during menu enable/disable of mm3"
...
This reverts commit dd7e4ee97f
2015-01-04 22:08:41 -05:00
ec4681ab6b
Revert "Add "Detailed Z Probe" menu item with ABL is defined."
...
This reverts commit 2b9722f387
2015-01-04 21:53:37 -05:00
dd7e4ee97f
Make sure volumetric multipliers are recalc'ed during menu enable/disable of mm3
2015-01-04 21:44:55 -05:00
2b9722f387
Add "Detailed Z Probe" menu item with ABL is defined.
2015-01-04 21:42:16 -05:00
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.
2015-01-04 12:17:46 -08:00
d2b6e62996
Merge pull request #1309 from philfifi/fix_temp_runaway
...
temp runaway: proper cast to prevent any overflow.
2015-01-04 12:55:58 -02:00
30248214c7
temp runaway: proper cast to prevent any overflow.
2015-01-04 14:23:31 +01:00
c5f138ea07
Merge pull request #1291 from alhirzel/Development
...
Define analogInputToDigitalPin only if needed
2015-01-04 12:53:41 +01:00
652895d656
try different proproc for CI failure
2015-01-04 11:15:23 +00:00
3d9f4ac757
Merge pull request #1303 from wgm4321/Development
...
Fix for cant compile when REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER ...
2015-01-04 01:29:26 +01:00
04fb34c7ff
Add English defines for filament menu to non-English to prevent compile errors until translated
2015-01-03 17:28:05 -05:00
f8aa5ff771
Fix for cant compile when REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER defined
2015-01-03 17:10:13 -05:00
39fae9e3a3
Fix progmem warning
...
Borrow code from https://github.com/arduino/Arduino/issues/1793
2015-01-03 21:30:16 +00:00
f36fd3ddec
Merge branch 'Development' of https://github.com/ErikZalm/Marlin into Development
2015-01-02 12:39:39 -05:00
b5e50cdd4e
Move scripts and documentation to subfolders
2015-01-02 08:53:09 -08:00
eed451e034
rework analogInputToDigitalPin definition
2015-01-02 11:14:20 -05:00
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.
2015-01-02 11:12:16 -05:00
b32be2dc64
Fix syntax error caused by previous changes.
2015-01-02 11:12:16 -05:00
edac64e7d2
Add Filament menu and add Filament/Retract settings to config store.
2015-01-02 11:12:15 -05:00
ecda6cdc0a
Fix typo, PID_BED_POWER -> MAX_BED_POWER
2015-01-02 11:12:15 -05:00
f3e503e725
temperature.cpp: Fix typo of PID_MAX to MAX_BED_POWER for the bed.
2015-01-02 11:12:15 -05:00
1d5d853c9a
temperature.cpp: Fix typo of MAX_BED_PID to MAX_BED_POWER.
2015-01-02 11:12:15 -05:00
63da6900b0
Merge pull request #1282 from vandarin/Development
...
Due to the fix for #1248 , X and Y probe offsets must not be floats.
2015-01-02 15:35:40 +01:00
a18b625534
Merge pull request #1261 from wgm4321/Development
...
Add Filament menu and add Filament/Retract settings to config store.
2015-01-02 15:35:29 +01:00
ae12ad0d6c
Fix typo, PID_BED_POWER -> MAX_BED_POWER
2015-01-02 01:38:03 -05:00
80b17ab573
Merge pull request #1285 from drf5n/PID_CI_v2
...
temperature.cpp: Fix typo of MAX_BED_PID to MAX_BED_POWER.
2015-01-01 22:56:21 -02:00
625860f086
temperature.cpp: Fix typo of PID_MAX to MAX_BED_POWER for the bed.
2015-01-01 19:24:42 -05:00
6583bb781d
temperature.cpp: Fix typo of MAX_BED_PID to MAX_BED_POWER.
2015-01-01 19:11:42 -05:00
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.
2014-12-31 12:34:59 -06:00
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.
2014-12-31 13:04:16 +13:00
692a01b1c7
Merge pull request #1277 from thinkyhead/fix_regressions
...
Fix regressions affecting compilation
2014-12-30 16:49:08 +01:00
2ec2bf1564
Fix regressions affecting compilation
...
This fixes two regressions, caused by #1167 and #1191 .
2014-12-30 07:36:18 -08:00
