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
BorisLandoni
4c7d1436e9
Update pins.h
2013-06-07 18:37:44 +03:00
BorisLandoni
6588933c04
Update Configuration.h
2013-06-07 18:36:16 +03:00
Scott Lahteine
5dabc95409
Apply all changes from latest Marlin_V1
...
Diffed and merged, preserving my updates
2013-06-06 15:49:25 -07:00
Gord Christmas
a733537ddd
Missed some variable declarations
...
Integrated fixes from henrikbrixandersen pull request #504
2013-06-06 09:18:03 -07:00
Gord Christmas
f4f30c9d64
Added servo actuated enstop coding to allow G28 command to engage and retract a servo to specified angles.
2013-06-06 07:36:52 -07:00
Erik van der Zalm
79374f0b93
Merge branch 'reisnyderb' of https://github.com/ErikZalm/Marlin into Marlin_v1
2013-06-05 17:44:48 +02:00
ErikZalm
1520de0093
Merge pull request #505 from MStohn/much-faster-glcd-st7920
...
faster GLCD (ST7920 SW-SPI) implementation / fixes
2013-06-05 08:40:59 -07:00
Maik Stohn
da05b3ba94
faster GLCD (ST7920 SW-SPI) implementation / fixes
...
- fixed long menu entries (>14 or >18 chars) caused overrun in dogm lcd
implementation
- fixed pin set problem when in interrupt
- much faster ST7920 SW-SPI implementation
- increased ST7920 framebuffer size for more speed
2013-06-05 16:27:44 +02:00
kiyoshigawa
4b19c8552e
Fixing changed Configuration.h settings to be default values per ErikZalm Request.
2013-06-04 12:01:55 -06:00
Erik van der Zalm
971ec35135
Expanded M302 to allow setting the temp
2013-06-02 17:36:23 +02:00
Erik van der Zalm
4de419e26e
Updated README.md
2013-06-02 16:26:42 +02:00
Erik van der Zalm
a0729f0c3a
no message
2013-06-02 15:42:59 +02:00
Erik van der Zalm
5090c56651
More redundant temp sensor changes. (After testing and debugging by reifsnderb)
2013-05-29 19:29:30 +02:00
Guillaume Seguin
16b9239a26
Report temperatures for all extruders
2013-05-29 18:06:12 +02:00
ErikZalm
a964b3cf3d
Merge pull request #495 from Gatulibu/Marlin_v1
...
Added support for Megatronics v2.0 and Minitronics v1.0
2013-05-28 07:51:49 -07:00
ErikZalm
34fb4831a2
Merge pull request #496 from MStohn/fix-16x2-lcd
...
Fix: Long menu entries (>14 or >18 chars) caused overrun in hitachi display implementation
2013-05-28 07:50:52 -07:00
Maik Stohn
e8572c5239
Fix: Long menu entries (>14 or >18 chars) caused overrun in hitachi display implementation
2013-05-28 15:53:07 +02:00
