Commit graph

1857 commits

Author SHA1 Message Date
Bo Herrmannsen 47881574ed Merge pull request #1336 from stv0g/Documentation
Documentation restructuring
2015-01-08 20:35:45 +01:00
Steffen Vogel 26337a56cc Merge branch 'Documentation' of github.com:stv0g/Marlin into Documentation 2015-01-08 20:02:56 +01:00
Steffen Vogel eaa462279e Merge branch 'Development' of github.com:MarlinFirmware/Marlin into Documentation
Conflicts:
	README.md
2015-01-08 20:02:40 +01:00
Steffen Vogel 6712179502 updated milestone link 2015-01-08 19:57:09 +01:00
Steffen Vogel 6dc9e87b68 added missing bracket 2015-01-08 19:55:33 +01:00
Steffen Vogel 38669a56cb updated credits 2015-01-08 19:54:46 +01:00
Steffen Vogel 49b759b804 added credits 2015-01-08 19:48:56 +01:00
Steffen Vogel 6388be0731 reformatting 2015-01-08 19:38:52 +01:00
Steffen Vogel c98d87935a reformatting 2015-01-08 19:37:36 +01:00
Steffen Vogel 11a42c3215 fixed formatting issue 2015-01-08 19:26:23 +01:00
Steffen Vogel d19ef56199 started hardware list 2015-01-08 19:21:57 +01:00
Steffen Vogel bc91167363 moved licence to Documentation (its linked from the frontpage) to get a cleaner top level dir 2015-01-08 18:59:40 +01:00
Steffen Vogel fd68d0074b added missing gcodes description 2015-01-08 18:59:40 +01:00
Steffen Vogel cf88d61c20 added links to reprap.org and the license 2015-01-08 18:59:40 +01:00
Steffen Vogel 4a1f34c522 added logo to README 2015-01-08 18:58:57 +01:00
Steffen Vogel e351eec169 added logo for GitHub Readme 2015-01-08 18:58:08 +01:00
Steffen Vogel 6f137bbe3e updated compilation/configuring instructions 2015-01-08 18:58:08 +01:00
Steffen Vogel 5db6ffc03e fixed line endings 2015-01-08 18:58:08 +01:00
Steffen Vogel abea094f90 fixed hyperlinks 2015-01-08 18:57:33 +01:00
Steffen Vogel 04eafe3d04 splitted huge README.md in several sections and moved them to the
Documentation directory
2015-01-08 18:55:32 +01:00
Erik van der Zalm a06700a14b Revert "issue 968 for dev branch" 2015-01-08 18:54:06 +01:00
andrewsil1 489b4fd3a5 Fix grammar/typos in new Configuration.h option
(For the SLOW_PWM_HEATERS option)
2015-01-08 18:54:06 +01:00
Bo Herrmannsen fdf9dbb6fe added link to google hangout 2015-01-08 18:54:06 +01:00
Steffen Vogel da192c521f Merge pull request #1333 from andrewsil1/development
Fix grammar/typos in new Configuration.h option
2015-01-08 00:34:01 +01:00
Erik van der Zalm 0f5cccca4f Merge pull request #1334 from MarlinFirmware/revert-1311-Development
Revert "issue 968 for dev branch"
2015-01-07 23:41:10 +01:00
Erik van der Zalm 3a30d45c2e Revert "issue 968 for dev branch" 2015-01-07 23:40:17 +01:00
andrewsil1 269ec9f87f Fix grammar/typos in new Configuration.h option
(For the SLOW_PWM_HEATERS option)
2015-01-07 12:41:09 -08:00
Bo Herrmannsen 3d2b471c1a added link to google hangout 2015-01-07 21:05:28 +01:00
Steffen Vogel 72912851b8 Merge pull request #1331 from stv0g/Development
moved/renamed documentation stuff to top-level directory
2015-01-07 15:50:24 +01:00
Steffen Vogel 8d7bfd03d8 moved/renamed documentation stuff to top-level directory 2015-01-07 15:33:50 +01:00
Bo Herrmannsen 3c9e6b7b62 added link for pic to hex converter 2015-01-07 14:28:51 +01:00
Bo Herrmannsen 0e760274bd changed reprap logo to marlin logo 2015-01-07 14:27:51 +01:00
Bo Herrmannsen b291a422e9 added square png version of logo
406*406 pixels
2015-01-07 13:00:37 +01:00
Bo Herrmannsen 8813978766 Merge pull request #1330 from avluis/feature-request
Update Marlin Firmware URL
2015-01-07 12:48:21 +01:00
Luis E Alvarado 7ae548cf34 Update Marlin Firmware URL 2015-01-07 05:26:47 -06:00
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