SunRed/Marlin-Artillery-M600
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity
3509 commits 1 branch 0 tags 118 MiB
Commit graph

3509 commits

This branch
This branch
All branches
Author SHA1 Message Date
Erik van der Zalm
a5be0c52c6 no message 2013-07-14 15:35:54 +02:00
ErikZalm
e73611f5fa Merge pull request #535 from GabinoLopez/patch-1 
Update language.h
 2013-07-14 02:24:31 -07:00
Michael Mayer
e509cdbeb0 added contrast control function for gLCDs 2013-07-14 15:28:26 +07:00
Michael Mayer
99b7e926e7 added MaKr3d Melzi board 2013-07-14 15:17:55 +07:00
Gabino Lopez
68be33b1fc Update language.h 
I update the spanish Messages, now this compile for spanish language.
 2013-07-04 10:23:00 +02:00
daid
acb3271c9a Merge pull request #534 from xifle/Marlin_v1 
Fixes compiler warning for feedrate deadzone
 2013-07-01 23:41:51 -07:00
xifle
61fe430d4f Should fix compiler warning for feedrate deadzone 2013-07-01 11:10:02 +02:00
daid
d77f5ee722 Merge pull request #532 from codexmas/ServoEndstops 
Fix for ugly code compilation errors in SERVO_ENDSTOP checks
 2013-06-28 08:04:55 -07:00
Gord Christmas
fde17d5720 Fix for ugly code compilation errors in SERVO_ENDSTOP checks 2013-06-28 08:02:04 -07:00
Guillaume Seguin
aa65c20d1f Only clamp panel movements if software endstops are enabled 2013-06-28 14:18:00 +02:00
Erik van der Zalm
ecf3ab5de4 Added thermistor 60 to configuration.h 2013-06-27 23:25:51 +02:00
Nicolas Rossi
2daa85918e Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin.git into Marlin_v1 
Conflicts:
	Marlin/Configuration.h
	Marlin/Marlin_main.cpp
	Marlin/language.h
	Marlin/pins.h
	Marlin/ultralcd.cpp
 2013-06-20 23:59:56 +02:00
Erik van der Zalm
2015989f84 Added DISABLE_MIN_ENDSTOPS 2013-06-18 19:20:26 +02:00
ErikZalm
1c86adc760 Merge pull request #526 from ch100/Marlin_v1 
Fix Pin Description Typo
 2013-06-17 05:53:57 -07:00
Christian Inci
648d45cfb2 Fix Pin Description Typo 
Reverse 'Bed' and 'Fan' at the RAMPS 33 Description.

Signed-off-by: Christian Inci <chris.pcguy.inci@gmail.com>
 2013-06-16 23:35:33 +02:00
ErikZalm
171719f18c Merge pull request #525 from lajos/ultralcd_pid 
ultralcd.cpp compile errors when !defined(PIDTEMP)
 2013-06-16 00:02:54 -07:00
lajos
b519af4f05 fixed another !defined(PIDTEMP) compile in ultralcd.cpp 2013-06-15 20:49:18 -04:00
lajos
7d03c52511 fixed compile error in ultralcd.cpp when PIDTEMP undefined 2013-06-15 18:09:52 -04:00
ErikZalm
312b4aa7c2 Merge pull request #521 from lajos/azteeg_x1 
added Azteeg X1 motherboard
 2013-06-15 14:08:45 -07:00
lajos
02dee80fa5 added Azteeg X1 motherboard 2013-06-15 16:58:17 -04:00
ErikZalm
73569d891f Merge pull request #520 from henrikbrixandersen/Makefile-fixes 
Makefile fixes
 2013-06-15 02:35:51 -07:00
Henrik Brix Andersen
47dc70e3ec Fix location of avrdude.conf 2013-06-15 09:50:25 +02:00
Henrik Brix Andersen
1d258903bb Allow command line compilation when using BEEPER. 2013-06-15 09:36:55 +02:00
Erik van der Zalm
e34c9981ab Delta disabled by default 2013-06-11 22:33:58 +02:00
Erik van der Zalm
26a441fc7d More 3Drag controller patches. 2013-06-10 18:26:15 +02:00
Erik van der Zalm
ac975ed8c2 Merge branch 'deltabot' into Marlin_v1 2013-06-10 18:20:29 +02:00
ErikZalm
58d12aad73 Merge pull request #511 from wolfmanjm/ezdelta 
fix homing for deltas
 2013-06-09 23:45:03 -07:00
Jim Morris
caa848f943 fix homing for deltas 2013-06-09 21:10:00 -07:00
Erik van der Zalm
7ad12be763 Merge branch 'Marlin_v1' of https://github.com/codexmas/Marlin into codexmas-Marlin_v1 
Conflicts:
	Marlin/Configuration.h
	README.md
 2013-06-09 23:10:41 +02:00
Erik van der Zalm
408169aef4 Merge branch 'Marlin_v1' of https://github.com/BorisLandoni/Marlin into BorisLandoni-Marlin_v1 
Conflicts:
	Marlin/Configuration.h
	Marlin/language.h
	Marlin/pins.h
 2013-06-09 22:57:40 +02:00
Erik van der Zalm
bd96d22bfb Merge branch 'Marlin_v1' into thinkyhead 
Conflicts:
	Marlin/Configuration.h
	Marlin/Configuration_adv.h
	Marlin/Marlin.h
	Marlin/Marlin_main.cpp
	Marlin/Servo.cpp
	Marlin/language.h
	Marlin/pins.h
	Marlin/planner.cpp
	Marlin/ultralcd_implementation_hitachi_HD44780.h
	README.md
 2013-06-09 22:26:47 +02:00
Erik van der Zalm
73f21cd5d6 Spanish updated so far. 2013-06-09 21:40:35 +02:00
Erik van der Zalm
6f4a6e531c Merge branch 'deltabot' into Marlin_v1 2013-06-09 13:55:18 +02:00
Erik van der Zalm
01edf22a10 Fix home_all_axis to make QUICK_HOME work with Repetier-Host which sends G28 X0 Y0 Z0 instead of G28. Thanks to Matt Schoenholz for reporting this issue. 2013-06-09 13:54:19 +02:00
Erik van der Zalm
ff6fa09ecf Moved corexy implementation from stepper to planner 
(Thanks iquizzle)
 2013-06-09 13:10:06 +02:00
Erik van der Zalm
c8dcc7c208 Allow increasing the software PWM frequency. 2013-06-09 12:52:49 +02:00
Erik van der Zalm
8b0d82e9db Removed "awaiting translation" for french 2013-06-09 12:24:06 +02:00
Erik van der Zalm
1e05d192ab Make the beep tone less offensive 2013-06-09 12:21:16 +02:00
Erik van der Zalm
373f3ecab3 Merge branch 'deltabot' of https://github.com/jcrocholl/Marlin into deltabot 
Conflicts:
	Marlin/Configuration.h
	Marlin/Marlin_main.cpp
	Marlin/pins.h
 2013-06-09 00:51:58 +02:00
ErikZalm
e36d31a3b7 Merge pull request #467 from kiyoshigawa/Marlin_v1 
Support for Elefu RA Board
 2013-06-08 10:01:53 -07:00
kiyoshigawa
f295712008 Trying to fix weird diff on ultralcd_implementation_hitachi_HD44780.h 2013-06-08 09:27:56 -06:00
kiyoshigawa
5c70c785f5 Fixed small error in lcd define statements. 2013-06-08 09:17:41 -06:00
kiyoshigawa
69b02031ca Fixed small error in lcd define statements. 2013-06-08 09:09:11 -06:00
kiyoshigawa
2ca6c5fbd7 Fixed small error in lcd define statements. 2013-06-08 09:00:34 -06:00
kiyoshigawa
6a81291c57 Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into Marlin_v1 
This should fix issues with pull request 467, I hope.

Conflicts:
	Marlin/Configuration.h
	Marlin/Marlin.pde
	Marlin/ultralcd_implementation_hitachi_HD44780.h
 2013-06-08 08:48:18 -06:00
BorisLandoni
15b1b896e8 Update pins.h 2013-06-08 14:45:11 +02:00
BorisLandoni
c1cb5977ee Update Configuration.h 2013-06-08 14:37:39 +02:00
BorisLandoni
8a5bd8a808 Update Configuration.h 2013-06-08 14:37:17 +02:00
ErikZalm
3dea417c25 Merge pull request #506 from codexmas/ServoEndstops 
Servo Enstops working!
 2013-06-08 04:41:27 -07:00
BorisLandoni
c1d7cf939e Update language.h 2013-06-07 17:38:17 +02:00