daid
236bb2c110
Merge pull request #365 from DanieleSdei/Marlin_v1
...
Marlin v1, italian MSG_RESUMING and RepRapPro thermistor tables.
2013-01-14 08:29:55 -08:00
Daniele Sdei
9ecb267b63
Merge remote-tracking branch 'upstream/Marlin_v1' into Marlin_v1
2013-01-14 15:47:40 +01:00
Daniele Sdei
3cf59f6f9a
add RepRapPro Huxley thermistor tables
2013-01-14 15:36:08 +01:00
daid
c1730e2b08
Merge pull request #363 from yuroller/sanguino_panelolu
...
Panelolu pin assignment for sanguinololu
2013-01-10 07:19:37 -08:00
Yuri Valentini
86358dd6cd
Panelolu pin assignment for sanguinololu from http://reprap.org/wiki/Panelolu
2013-01-10 12:23:20 +01:00
daid303
0f3f5d083d
Minor cleanup of the new FAN_KICKSTART code. #334
2013-01-10 11:08:45 +01:00
daid
6ec56fa923
Merge pull request #334 from KevinOConnor/FanKick
...
Add feature to briefly run the cooling fan at full speed when it first starts.
2013-01-09 02:47:59 -08:00
daid
965baf2683
Merge pull request #362 from daid/Marlin_v1
...
Finnish language
2013-01-09 02:42:09 -08:00
daid
4fde836d83
Merge pull request #8 from randomev/Marlin_v1
...
+ Finnish translation
2013-01-09 02:39:43 -08:00
Kevin O'Connor
3d91bd486c
Add "kick fan" feature - briefly run fan at full speed on start.
...
Add a feature to run the cooling fan at full speed for a small period
(default 100ms) when first starting the fan. Some fans wont reliably
start spinning at low power, and many fans have issue with the PWM at
low power. However, once the fan starts spinning it can reliably be
set to a wide range of PWM values.
2013-01-08 18:50:15 -05:00
Kevin O'Connor
3f2f94ef28
Be consistent in setting of the fan PWM.
...
Always set the FAN PWM value in check_axes_activity() and always use
the value of the active move if a move is active.
2013-01-08 18:49:18 -05:00
Henry Palonen
7f30039d2a
+ Finnish translation
2013-01-08 19:21:34 +02:00
daid303
14e1d495ef
Merge branch 'Marlin_v1' of github.com:ErikZalm/Marlin into Marlin_v1
2013-01-08 17:10:30 +01:00
daid303
bbe7d3d0fe
Fixed #312
2013-01-08 17:09:57 +01:00
daid
7ce509b9a7
Merge pull request #361 from yuroller/MakefileSanguino
...
Makefile sanguino
2013-01-08 06:22:27 -08:00
Yuri Valentini
9c34c4f05b
fixes for ramps compilation using installed arduino ide
2013-01-08 12:54:31 +01:00
daid303
442ade15a6
Move Gen6 stuff into a proper location.
2013-01-08 12:31:28 +01:00
daid
5fd4582cc8
Merge pull request #242 from Drakelive/Marlin_v1
...
Fixes issues # 216 and # 135 for Gen6 and Gen6 Deluxe board
2013-01-08 03:29:20 -08:00
daid303
8b88e3b386
Fixed #345 , Fixed #267 .
2013-01-08 12:14:55 +01:00
daid
27843388c6
Merge pull request #360 from njprossi/Marlin_v1
...
Power signal control definitions for other power supplies
2013-01-08 02:58:02 -08:00
daid303
bfa5bb86e4
Merge branch 'Marlin_v1' of github.com:ErikZalm/Marlin into Marlin_v1
2013-01-08 11:54:13 +01:00
daid303
921273baa0
Added optional feature to stop printing when an endstop is hit. Made the Z display on the LCD in 3.2 format instead of 3.1. Added LCD message when and endstop is hit.
2013-01-08 11:53:18 +01:00
Yuri Valentini
7d20ec706e
Added libraries from Arduino 1.0.3 for sanguino build
2013-01-07 17:26:50 +01:00
Nicolas Rossi
437eb3bafc
Initialize PS_ON at startup
2013-01-07 14:57:51 +01:00
Nicolas Rossi
f3c1fc70a9
Power signal control definitions for ATX and others
2013-01-07 14:33:30 +01:00
Yuri Valentini
dad7691df9
makefile for sanguino standalone compilation
2013-01-07 11:08:10 +01:00
daid
3a1cd30ce1
Merge pull request #358 from yuroller/sanguino_spi
...
Definitions for Sanguino SPI
2013-01-04 11:53:10 -08:00
Yuri Valentini
69582042d7
Definitions for Sanguino SPI
2013-01-04 18:32:08 +01:00
Daniele Sdei
5f82f03ff3
Add italian MSG_RESUMING.
2012-12-28 11:44:35 +01:00
daid303
5e3873c8db
Add german MSG_RESUMING.
2012-12-25 20:53:11 +01:00
daid303
01aac2a142
Small changes on the LCD panel, let the speed control work better, line up the parameter edit the same as the menu, remove some unused defines, and remove the Z from the 10mm move menu.
2012-12-21 16:14:47 +01:00
daid303
b69cb9fbd9
Change the end of SD cart print message from minutes/seconds to hours/minutes.
2012-12-19 12:26:40 +01:00
daid
30254e3388
Merge pull request #350 from jcrocholl/Marlin_v1
...
Automatically set *_MIN_PIN and *_MAX_PIN according to *_HOME_DIR.
2012-12-17 02:16:31 -08:00
daid303
38ee395ac7
Replace the 1ms delay for 2 nops to get a 100ns delay. #259
2012-12-17 11:12:11 +01:00
daid303
5df5e4c4a2
Merge branch 'Marlin_v1' of github.com:ErikZalm/Marlin into Marlin_v1
2012-12-17 11:09:18 +01:00
daid303
a95dcd74e7
Fix some of the duplicated PSTRs, saving 500bytes of flash with LCD on.
2012-12-17 11:09:09 +01:00
daid
ab318beaaf
Merge pull request #348 from oni303/Marlin_v1
...
fixed (#328 ) pwm generation at pin D12 and D13
2012-12-17 02:08:28 -08:00
Johann Rocholl
8caf5d252d
Remove bogus blank line.
2012-12-16 12:50:20 -08:00
Johann Rocholl
b39f5d614a
For boards with only one endstop per axis, automatically set *_MIN_PIN and *_MAX_PIN according to *_HOME_DIR.
2012-12-16 12:09:53 -08:00
oni303
ab09fa4bbf
fixed pwm generation at pin D12 and D13 when one of them is used as FAN_PIN on Sanguino, added soft pwm entry for FAN_PIN in temperature.cpp
2012-12-16 01:36:57 +01:00
daid
83ea7dc5b9
Merge pull request #342 from setar/Marlin_v1
...
Fix the russian translation.
2012-12-14 05:04:41 -08:00
Sergey Taranenko
5697451c72
fix lcd class
2012-12-14 15:39:47 +04:00
Sergey Taranenko
58e806f3fa
Fix the russial translation.
2012-12-14 15:39:26 +04:00
Sergey Taranenko
50a5ce1dc4
deduplicate messages
2012-12-14 15:37:05 +04:00
daid303
6123a00e64
Fix the german translation.
2012-12-14 11:11:02 +01:00
daid303
7c21716886
Fixed #341
2012-12-14 10:53:11 +01:00
daid303
ae1bc83350
Merge branch 'Marlin_v1' of github.com:ErikZalm/Marlin into Marlin_v1
2012-12-13 13:25:22 +01:00
daid303
596a7e1904
Fix compiling for Arduin < 1.0.0
2012-12-13 13:24:55 +01:00
Daid
b264317fa0
Reverted the patch by KevinOConnor, as it crashes some versions of avr-gcc and caused linking issues.
2012-12-13 12:19:12 +01:00
Daid
673577a31b
Merge branch 'Marlin_v1' of github.com:ErikZalm/Marlin into Marlin_v1
2012-12-13 11:41:34 +01:00
