Erik van der Zalm
8f9067faa6
Added marlin logos. (Designed by Ahmet Cem TURAN)
2015-01-07 12:21:16 +01:00
Bo Herrmannsen
addf52fd4a
Merge pull request #1328 from DinoMesina/development
...
Some corrections and new features
2015-01-06 23:52:32 +01:00
Bo Herrmannsen
e9ddd21aef
Update README.md
2015-01-06 22:22:35 +01:00
DinoMesina
2d7d43b64c
Merge pull request #1 from DinoMesina/master
...
Master
2015-01-06 21:59:51 +01:00
Dino Del Favero
5cfe13f240
Correct some mistakes
2015-01-06 21:55:08 +01:00
Bo Herrmannsen
9852252bca
Update README.md
2015-01-06 21:52:57 +01:00
Bo Herrmannsen
1c33310363
Update README.md
2015-01-06 21:41:06 +01:00
Bo Herrmannsen
380c9abf16
removed note on Ramps
...
ramps do have power for the servos, the power comes from the power connector, not sure why this note was even made
2015-01-06 21:15:46 +01:00
Bo Herrmannsen
501fe97c00
changed some stuff near IDE
2015-01-06 21:12:21 +01:00
Dino Del Favero
c7e2d73039
Merge branch 'development'
...
ok
2015-01-06 20:18:03 +01:00
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.
2015-01-06 16:39:48 -02:00
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
2015-01-06 18:32:17 +01:00
DinoMesina
6730335657
Update Configuration.h
2015-01-06 18:06:02 +01:00
Bo Herrmannsen
1a57644b0c
Update README.md
2015-01-06 17:12:17 +01:00
Bo Herrmannsen
80afded132
Update README.md
2015-01-06 17:10:05 +01:00
Bo Herrmannsen
028fe129a5
Update README.md
2015-01-06 17:09:19 +01:00
Bo Herrmannsen
d7a2dd676e
Update README.md
2015-01-06 15:45:51 +01:00
Bo Herrmannsen
b3f2b30347
Update README.md
2015-01-06 15:44:26 +01:00
Bo Herrmannsen
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
Bo Herrmannsen
2dfdf4b55c
Merge pull request #1320 from stv0g/Development
...
replaced ASCII GPL v3 license by markdown version
2015-01-06 12:30:54 +01:00
Bo Herrmannsen
358759cb52
Update README.md
2015-01-06 12:02:42 +01:00
Bo Herrmannsen
93c8b2a40b
added irc channel
2015-01-06 11:59:11 +01:00
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
2015-01-06 11:49:05 +01:00
Bo Herrmannsen
5a5b95edbf
Merge pull request #1319 from stv0g/Development
...
Cleanup and refactoring of termistor LUT generator (fixes bug #1305 )
2015-01-06 11:25:07 +01:00
Steffen Vogel
f25e793cff
rename stepper lookup table scipt to be consistent with termistor lookup table script
2015-01-06 10:30:20 +01:00
Steffen Vogel
df17a6a1b4
fix #1305 by proposed workaround (thanks gaby64)
2015-01-06 10:29:26 +01:00
Steffen Vogel
f7e65935fb
make use of power operator
2015-01-06 10:28:43 +01:00
Steffen Vogel
4e02aff9b5
automatically determine min/max temp for terminator
2015-01-06 10:28:19 +01:00
Steffen Vogel
81363bc441
more cleanups
2015-01-06 10:27:40 +01:00
Steffen Vogel
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
Steffen Vogel
21205cc3d8
more cleanups in the termistorTable generation script
2015-01-06 08:23:51 +01:00
Steffen Vogel
fb0996b5db
improved output aligment and precision
2015-01-06 08:20:52 +01:00
Steffen Vogel
538231edfd
cosmetic whitespace cleanup and comments added/updated
2015-01-06 08:20:20 +01:00
wgm4321
067b509479
Re-enable filament menu with recalc fix when enabling/disabling mm3
2015-01-05 22:29:29 -05:00
wgm4321
a19f2f8ae7
Disable volumetric menu item due to missing recalc of of multipliers when enabled/disabled
2015-01-04 22:15:16 -05:00
wgm4321
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
wgm4321
ec4681ab6b
Revert "Add "Detailed Z Probe" menu item with ABL is defined."
...
This reverts commit 2b9722f387
2015-01-04 21:53:37 -05:00
wgm4321
dd7e4ee97f
Make sure volumetric multipliers are recalc'ed during menu enable/disable of mm3
2015-01-04 21:44:55 -05:00
wgm4321
2b9722f387
Add "Detailed Z Probe" menu item with ABL is defined.
2015-01-04 21:42:16 -05:00
Bo Herrmannsen
00e4bc9f54
Merge pull request #1311 from i-make-robots/Development
...
issue 968 for dev branch
2015-01-04 21:29:29 +01:00
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.
2015-01-04 12:17:46 -08:00
alexborro
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
Philippe L
30248214c7
temp runaway: proper cast to prevent any overflow.
2015-01-04 14:23:31 +01:00
Bo Herrmannsen
c5f138ea07
Merge pull request #1291 from alhirzel/Development
...
Define analogInputToDigitalPin only if needed
2015-01-04 12:53:41 +01:00
Bo Herrmannsen
efca4afab2
Merge pull request #1304 from monkeydave/Travis-CI
...
Added further tests to Travis CI config
2015-01-04 12:52:38 +01:00
odewdney
652895d656
try different proproc for CI failure
2015-01-04 11:15:23 +00:00
Bo Herrmannsen
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
monkeydave
9d57c376db
Commented out configs that are failing with no easy fixes for the moment
2015-01-03 22:46:15 +00:00
wgm4321
04fb34c7ff
Add English defines for filament menu to non-English to prevent compile errors until translated
2015-01-03 17:28:05 -05:00
wgm4321
f8aa5ff771
Fix for cant compile when REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER defined
2015-01-03 17:10:13 -05:00
