Charles R
c244eb860c
If you have a switch on suicide pin, this is useful if you want to
...
start another print with suicide feature after a print without
suicide...
11 years ago
fmalpartida
7b556d2e96
Added BT support on AT90USB devices
...
Added AT90USB device BT connectivity support using second UART.
11 years ago
Kaz Walker
a5e8575829
Add UUID support to M115 responses.
11 years ago
Daniel Benamy
cab84e0e5b
Add (correct) missing pin definitions for Y2
...
I tested this and it works.
11 years ago
fmalpartida
5b3f60ea2e
Corrected LCD only error
...
If only an LCD is defined and no menu or keyboard defined, there is a
compilation error.
Added conditional compilation.
11 years ago
Justus Perlwitz
62d0b79023
Fix servo control for Melzi
11 years ago
fmalpartida
b5a964fcc5
Initial SAV MkI (RepRap CloneWars board) integration.
...
Included support for BT dongle on AT90USB boards.
Added LCD Shift Register LCD control
Included support for RepRap Clone Wars project board (SAV MKI).
11 years ago
dumle29
f941203172
PS_ON configurable boot state
...
Allows the user to select wheter or not the PSU should be turned on or
kept in standby when marlin boots
11 years ago
whosawhatsis
c79e3967b3
Make G11 not horribly broken
11 years ago
bkubicek
d69822ed51
Fix '#'
...
since it can occure in comments.
11 years ago
bkubicek
2fb2a0a119
Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into Marlin_v1
11 years ago
bkubicek
39d88bcccb
preparation for hibernation
...
If a print is stopped, it would be nice in the future to write a file with the printer state, the filename of the print, and the position within the print.
this file could be read, to continue a previously stopped print.
not finished yet.
11 years ago
bkubicek
ab965376ff
Sub-file calls.
...
by overloading M32 it is now possible to execute gcode files from other gcode files, with a fixed recursion level.
This can be used e.g. for having a real start.g and end.g somewhere on the sd card, which are then called from the normal print file.
Another usecase would be to have macro-files for nozzle-change and layerchange.
I have not tested the speedwise performance. The testing was done with pronterface.
syntax:
normal call from sd card will open the new file and continue executing there.
M32 !/path/filename#
this however will call the new file and return to the caller file.
M32 P !/path/filename#
with the optional "S<position>" the file starting position can be set.
this is for continuing prints from a previous location.
11 years ago
bkubicek
b2cc27e5ea
Added a magic character for sd buffering.
...
if a '#' is read now the buffer will be emptied before reading ahead.
This is so one can execute files from within gcode files, without messing the buffer with preread characters from the caller file.
# can not occure in sd files imho, because it should only occure within checksums in ther serial communication.
Yes, thats a lame argument. If you have a better idea please tell me. It has to be a character that one can type
on a keyboard manually.
11 years ago
Erik van der Zalm
8a08cca0f2
Added temperature status less.
...
Hopefully fixed viky button handling without braking other boards
11 years ago
Erik van der Zalm
667d278f54
Revert "Fix for Viki display"
...
This reverts commit 314fd13c39
.
11 years ago
Erik van der Zalm
bf27e79e74
Small BlinkM fix
11 years ago
Erik van der Zalm
87e28c0599
Added ifdefs to blinkm
11 years ago
Erik van der Zalm
24c6b2ab35
Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into Marlin_v1
11 years ago
ErikZalm
6a803ba9c5
Merge pull request #590 from timkoster/Marlin_v1
...
Added BlinkM support over i2c
11 years ago
Erik van der Zalm
457d8a0acb
Fixed merge conflicts
11 years ago
Alex Borro
6f85a8c7aa
Bed auto Leveling change: Raise Z before homing
...
- Added "Z_RAISE_BEFORE_HOMING" for raising Z the defined distance
before homing. This is useful to avoid Z-Probe collision when hotend is
near bed.
- Fixed the issue of Z not going bellow Z_PROBE_OFFSET when
"min_software_endstops" is true.
Now the Z_PROBE_OFFSET is not set in Z_MIN_POS, it is added after
homing.
11 years ago
Alex Borro
dd3086d3f2
Show Temperature ADC values
...
If "SHOW_TEMP_ADC_VALUES" is defined in Configuration_adv.h, the M105
command will present, after tradicional temperatures, the ADC value read
from temp sensors. This is great for adjusting thermistor tables with
thermocouple.
From Pronterface you can see the ADC value and compare with a
thermocouple reading.. then you just need to create your own thermistor
table.
Since this merge doesnt change the original information, it doesnt mess
with PC software parsing (tested under Pronterface and Repetier-Host).
11 years ago
bkubicek
7fad13a1e2
Reverse SD card file name order.
...
This is _not_ automatically the cronological, since deleting a file will free
the filesystem descriptor for it, which then will be used by the next file copied on it.
Since this makes the auto0.g file very inaccessible, I put the option back, to have it in the prepare menu.
this should satisfy https://github.com/ErikZalm/Marlin/pull/373
as a reminder, auto0.g will be executed every time after a boot with sd card present and file present.
thereafter, if there is a file auto1.g this will be done. Thats IMHO the best place to put settings, and prepare heating.
I also execute again after each (now again via the prepare menu) before starting a new print/ after a failed one.
It for me 100% replaces any start.gcode form the slicers.
11 years ago
bkubicek
b832f5b9f6
added delta tower babystepping. Its untested, but hopefully florian horsch will be able to try.
...
also, removed some trouble for compilation with corexy.
I think that babystepping is only possible in z for a delta tower.
not sure if it would be usefull to step individual motors on a delta, i don't own one
11 years ago
bkubicek
c38b0855c8
I think that filament change is ready for the masses. I have tested very often with my ultimaker.
...
I strongly vote for it being a single gcode, because otherwise the triggering from the menu is terrible.
11 years ago
bkubicek
d147a057ac
Add the socalled "Babystepping" feature.
...
It is a realtime control over the head position via the LCD menu system that works _while_ printing.
Using it, one can e.g. tune the z-position in realtime, while printing the first layer.
Also, lost steps can be manually added/removed, but thats not the prime feature.
Stuff is placed into the Tune->Babystep *
It is not possible to have realtime control via gcode sending due to the buffering, so I did not include a gcode yet. However, it could be added, but it movements will not be realtime then.
Historically, a very similar thing was implemented for the "Kaamermaker" project, while Joris was babysitting his offspring, hence the name.
say goodby to fuddling around with the z-axis.
11 years ago
Erik van der Zalm
bca353cc12
Fixed duplicate define in fastio.h
11 years ago
Alex Borro
253dfc4bc1
Bed Auto Leveling feature
...
Check the Readme for instruction how to enable and configure the feature
11 years ago
ErikZalm
1bda6bf862
Merge pull request #609 from phq1910/patch-1
...
Update Configuration.h
11 years ago
ErikZalm
c80aac1518
Merge pull request #610 from phq1910/patch-2
...
Update pins.h
11 years ago
Erik van der Zalm
314fd13c39
Fix for Viki display
11 years ago
phq1910
4f7c6dfe35
Update pins.h
...
Include Pins cpu Sethi 3D
11 years ago
phq1910
57173739a1
Update Configuration.h
...
Include CPU Sethi 3D
11 years ago
Erik van der Zalm
0dca49a7c0
Added Azteeg X3 board.
11 years ago
Erik van der Zalm
d8c2c810b4
Added info to the delta configuration files in the configuration.h file
11 years ago
Erik van der Zalm
9bc88f8bab
Placed optional ENCODER_PULSES_PER_STEP in the configuration.h file
11 years ago
Erik van der Zalm
3ca1ca6869
Fixed missing ENCODER_PULSES_PER_STEP
11 years ago
Tim Koster
97b0da0c2e
Removed #ifndef BLINKM
11 years ago
Tim Koster
61db046b32
Added #ifdef BLINKM around new code. Also refined BlinkM.h.
11 years ago
Richard Miles
77df2ab0e7
Make Y_DUAL_STEPPER_DRIVERS disabled by default
11 years ago
Richard Miles
ed1ab42186
Added Y_DUAL_STEPPER_DRIVERS
...
Enables two stepper drivers to be used for the Y axis (useful for
Shapeoko style machines)
Each Y driver can be stepped in either the same way or in opposite
directions, accounting for different hardware setups (leadscrew vs. belt
driven)
11 years ago
Richard Miles
f4a59e4ce5
Revert "Added Y_DUAL_STEPPER_DRIVERS"
...
This reverts commit 7ee275b620
.
11 years ago
Richard Miles
7ee275b620
Added Y_DUAL_STEPPER_DRIVERS
...
Enables two stepper drivers to be used for the Y axis (useful for
Shapeoko style machines)
Each Y driver can be stepped either the same way or in opposite
directions, accounting for different hardware setups (leadscrew vs. belt
driven)
11 years ago
ErikZalm
6a1e980c6d
Merge pull request #600 from xoan/Encoder_Pulses_Per_Step
...
add ENCODER_PULSES_PER_STEP
11 years ago
ErikZalm
20076a8bd3
Merge pull request #598 from GDV0/Marlin_v1
...
FIx compilation error when enabling SERVO_ENDSTOPS (#591 )
11 years ago
Erik van der Zalm
3626b5ad8b
Removed Delta from the default config file.
...
Changed EEPROM CHITCHAT behavior. M503 is always enabled.
11 years ago
Xoan Sampaiño
bf7007d02f
add ENCODER_PULSES_PER_STEP
11 years ago
GDV0
f17506c504
FIx compilation error when enabling SERVO_ENDSTOPS ( #591 )
11 years ago
Martin Lukasik
acd8619809
Fan fix for Panelolu2+Sanguinololu.
11 years ago
George Roberts
595580556c
Fixed bug that makes ulticontroller knob backwards introduced Feb 28 2013 by Robert.
...
Bug introduced in version 6beb42cdf6
.
Robert did a good job of simplifying but messed up this chunk of code.
Looking at working version: 839bef6d5d
it seems there is no case where encrot3 should be defined as 2
because if ULTICONTROLLER is defined then NEWPANEL is also defined.
11 years ago
Tim Koster
88dfeefca3
Define BlinkM default disabled
11 years ago
Tim Koster
5350faf2a2
Merge https://github.com/timkoster/MarlinBlinkM into Marlin_v1
11 years ago
Tim Koster
7016cc9511
Added BlinkM support over i2c
11 years ago
Tim Koster
3b315b3da0
Added BlinkM support over i2c
11 years ago
Jim Morris
f26f26b7bd
Fix the example delta configuration as someone forgot to do it.
11 years ago
Peter Hercek
9aa2229077
add command M666 for adjusting delta printer endstop position
11 years ago
Robert F-C
9547fb9dfb
Add duplication and auto-park mode for dual x-carriage support.
12 years ago
Steve Kelly
53614e5144
add pins for rambo lcd
12 years ago
Steve Kelly
b42d24e31e
add additional pins to avr2560 for rambo lcd
12 years ago
Nicolas Rossi
b0c8120fcc
Added feedrate setting in exemple config for manual moves from panel
12 years ago
Nicolas Rossi
a54fe2d73c
Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin.git into Marlin_v1
...
Conflicts:
Marlin/Marlin_main.cpp
12 years ago
ErikZalm
7ea63d08df
Merge pull request #565 from iXce/avrdudeconfpath
...
Detect OS in Makefile to use the correct avrdude.conf path
12 years ago
ErikZalm
4187b637a5
Merge pull request #570 from hg42/separate-INVERTING-macros-for-MIN-and-MAX-endstops
...
separate INVERTING for MIN and MAX endstops (6 #defines instead of 3)
12 years ago
ErikZalm
07e7de3600
Merge pull request #569 from hg42/convert-PROTOCOL-macros-from-statements-to-expressions
...
convert PROTOCOL macros from statements to (multiple, comma separated) expressions
12 years ago
Guillaume Seguin
c0c4c97db6
Detect OS in Makefile to use the correct avrdude.conf path
12 years ago
hg42@gmx.net
2ca983568d
separate INVERTING for MIN and MAX endstops (6 #defines instead of 3)
12 years ago
hg42@gmx.net
3700f688f5
convert PROTOCOL macros from statements to (multiple, comma separated) expressions
12 years ago
daid
a504c88346
Fix a bug where the PID controllers D action kicks in hard as soon as the PID controller starts.
12 years ago
Nicolas Rossi
394ed08f88
Added feedrate setting for manual moves from panel
12 years ago
Nicolas Rossi
9bf1cf1b22
Pre-calculate diagonal rod length squared
12 years ago
Nicolas Rossi
4623e78ce0
Added Honeywell thermistor 135-104LAF-J01
12 years ago
Brendan-csel
d7f384f680
Skip SD menu refresh if nothing has changed
12 years ago
Brendan-csel
abc8320a68
Save LCD_CLICKED before it is cleared
...
The SD card menu was refreshing so slowly that the button interrupt was clearing LCD_CLICKED before the menu items could check it.
12 years ago
Guillaume Seguin
f4c3135c6d
Add Panelolu2 pins for RAMPS1.3
12 years ago
Guillaume Seguin
aae42c68f9
Update French translation in language.h
12 years ago
Guillaume Seguin
4d435c38a6
Add support of LiquidTWI2-based panels to Makefile
...
Use LIQUID_TWI2=1 as make argument to enable this support
12 years ago
Guillaume Seguin
6c42a3a339
Woops, fix logic
12 years ago
Guillaume Seguin
376d8af2c8
Report temperatures for all extruders
12 years ago
ErikZalm
434b6a05c1
Merge pull request #552 from iXce/Marlin_v1
...
Report temperatures for all extruders in reply to M105
12 years ago
ErikZalm
bdc2621119
Merge pull request #561 from Brendan-csel/Marlin_v1
...
Fix for Viki LCD issues printing from SD card
12 years ago
ErikZalm
6965bd4e15
Merge pull request #560 from njprossi/Marlin_v1
...
Fixed move from panel for delta bot #557
12 years ago
ErikZalm
a55b33e613
Merge pull request #559 from iXce/panelolupinsramps13
...
Add Panelolu2 pins for RAMPS1.3
12 years ago
ErikZalm
8b34351537
Merge pull request #558 from iXce/frenchupdate
...
Update French translation in language.h
12 years ago
ErikZalm
735e556724
Merge pull request #555 from iXce/liquidtwi2_makefile
...
Add support of LiquidTWI2-based panels to Makefile
12 years ago
Brendan-csel
d80aecda0a
Skip SD menu refresh if nothing has changed
12 years ago
Brendan-csel
be2dea1dc6
Save LCD_CLICKED before it is cleared
...
The SD card menu was refreshing so slowly that the button interrupt was clearing LCD_CLICKED before the menu items could check it.
12 years ago
Nicolas Rossi
55c287a69e
Fixed move from panel for delta bot #557
12 years ago
Guillaume Seguin
1902d339b0
Add Panelolu2 pins for RAMPS1.3
12 years ago
Guillaume Seguin
eb23a68e92
Update French translation in language.h
12 years ago
ErikZalm
1561c6df51
Merge pull request #547 from wolfmanjm/delta-configuration
...
Setup Default configuration for Deltas if DELTA is defined
12 years ago
Guillaume Seguin
374bc99fa3
Add support of LiquidTWI2-based panels to Makefile
...
Use LIQUID_TWI2=1 as make argument to enable this support
12 years ago
Jim Morris
ab624eac2a
revert COnfiguratiuon to the same as head
12 years ago
Jim Morris
52f79ffeca
add an example default configuration for delta style bots
12 years ago
Jim Morris
b9d7ccf1cd
Merge remote-tracking branch 'upstream/Marlin_v1' into delta-configuration
...
Conflicts:
Marlin/Marlin_main.cpp
12 years ago
Guillaume Seguin
d4d1540727
Use -fno-use-cxa-atexit to override gcc --enable-cxa_atexit
12 years ago
Guillaume Seguin
01ed99143c
Woops, fix logic
12 years ago
Guillaume Seguin
76841450c8
Only display poweron/poweroff if PS_ON_PIN > -1
12 years ago
Guillaume Seguin
44f327d738
Uniformly reindent language.h
12 years ago
Guillaume Seguin
326d2db025
Update language.h so that all languages compile
...
Some strings still need translation, but at least everything compiles.
12 years ago
Guillaume Seguin
2cb716f513
Run Marlin/language.h through dos2unix
12 years ago
Guillaume Seguin
34da3a0a3f
Merge github.com:ErikZalm/Marlin into Marlin_v1
...
Conflicts:
Marlin/language.h
12 years ago
Guillaume Seguin
18199ff960
Merge github.com:ErikZalm/Marlin into Marlin_v1
12 years ago
Robert F-C
fb5334f428
Fixed compile error when QUICK_HOME is defined.
...
As well a couple of minor changes to handling of extruder offset for
dual x-carriage mode.
12 years ago
Robert F-C
c3568398b5
Disable DUAL_X_CARRIAGE by default
12 years ago
Robert F-C
39cd3dbdbe
Remove dual x-carriage functionality that could/should be implemented in slicer
...
Also added a couple of missed merge lines in homeaxis() from previous
commit.
12 years ago
Jim Morris
fb20ceabce
enable soft endstops for delta
...
disable delta by default
12 years ago
Jim Morris
d01ee7e7b5
fix zjerk being the same for delta as xy jerk
...
add more delta defaults
on delta make second home even slower
12 years ago
Robert F-C
d7390e13d9
Support dual x-carriage printers
...
Dual x-carriage designs offer some substantial improvements for dual
extruder printing.
12 years ago
Jim Morris
f3aa2a48e7
update max pos
12 years ago
Jim Morris
460751503e
Added default configurations for deltas when DELTA is defined
12 years ago
Maik Stohn
9da94c247a
fixed bad lcd commit from makr3d
...
#elsif does not exist #elif is correct
12 years ago
Erik van der Zalm
59004023fd
Fixed typo
12 years ago
Erik van der Zalm
461dad6e05
Added : M32 - Select file and start SD print (Can be used when printing from SD card)
...
Untested
12 years ago
Erik van der Zalm
c4a2077951
M109 and M190 now wait when cooling down if R is used instead of S.
...
M109 S180 waits only when heating.
M109 R180 also waits when cooling.
12 years ago
ErikZalm
8a2a3ef91d
Merge pull request #531 from iXce/Marlin_v1_lcd
...
Only clamp panel movements if software endstops are enabled
12 years ago
Erik van der Zalm
6397b3339c
restored configuration.h defaults
12 years ago
Erik van der Zalm
cdaaad3df1
Merge branch 'Marlin_v1' of https://github.com/makr3d/Marlin into makr3d-Marlin_v1
12 years ago
Erik van der Zalm
e3bdefd873
fixed missing #endif
12 years ago
Erik van der Zalm
a5be0c52c6
no message
12 years ago
Michael Mayer
e509cdbeb0
added contrast control function for gLCDs
12 years ago
Michael Mayer
99b7e926e7
added MaKr3d Melzi board
12 years ago
Gabino Lopez
68be33b1fc
Update language.h
...
I update the spanish Messages, now this compile for spanish language.
12 years ago
daid
acb3271c9a
Merge pull request #534 from xifle/Marlin_v1
...
Fixes compiler warning for feedrate deadzone
12 years ago
xifle
61fe430d4f
Should fix compiler warning for feedrate deadzone
12 years ago
Gord Christmas
fde17d5720
Fix for ugly code compilation errors in SERVO_ENDSTOP checks
12 years ago
Guillaume Seguin
aa65c20d1f
Only clamp panel movements if software endstops are enabled
12 years ago
Erik van der Zalm
ecf3ab5de4
Added thermistor 60 to configuration.h
12 years ago
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
12 years ago
Erik van der Zalm
2015989f84
Added DISABLE_MIN_ENDSTOPS
12 years ago
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>
12 years ago
ErikZalm
171719f18c
Merge pull request #525 from lajos/ultralcd_pid
...
ultralcd.cpp compile errors when !defined(PIDTEMP)
12 years ago
lajos
b519af4f05
fixed another !defined(PIDTEMP) compile in ultralcd.cpp
12 years ago
lajos
7d03c52511
fixed compile error in ultralcd.cpp when PIDTEMP undefined
12 years ago
lajos
02dee80fa5
added Azteeg X1 motherboard
12 years ago
Henrik Brix Andersen
47dc70e3ec
Fix location of avrdude.conf
12 years ago
Henrik Brix Andersen
1d258903bb
Allow command line compilation when using BEEPER.
12 years ago
Erik van der Zalm
e34c9981ab
Delta disabled by default
12 years ago
Erik van der Zalm
26a441fc7d
More 3Drag controller patches.
12 years ago
Erik van der Zalm
ac975ed8c2
Merge branch 'deltabot' into Marlin_v1
12 years ago
Jim Morris
caa848f943
fix homing for deltas
12 years ago
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
12 years ago
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
12 years ago
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
12 years ago
Erik van der Zalm
73f21cd5d6
Spanish updated so far.
12 years ago
Erik van der Zalm
6f4a6e531c
Merge branch 'deltabot' into Marlin_v1
12 years ago
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.
12 years ago
Erik van der Zalm
ff6fa09ecf
Moved corexy implementation from stepper to planner
...
(Thanks iquizzle)
12 years ago
Erik van der Zalm
c8dcc7c208
Allow increasing the software PWM frequency.
12 years ago
Erik van der Zalm
8b0d82e9db
Removed "awaiting translation" for french
12 years ago
Erik van der Zalm
1e05d192ab
Make the beep tone less offensive
12 years ago
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
12 years ago
kiyoshigawa
f295712008
Trying to fix weird diff on ultralcd_implementation_hitachi_HD44780.h
12 years ago
kiyoshigawa
69b02031ca
Fixed small error in lcd define statements.
12 years ago
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
12 years ago
BorisLandoni
c1cb5977ee
Update Configuration.h
12 years ago
BorisLandoni
8a5bd8a808
Update Configuration.h
12 years ago
BorisLandoni
c1d7cf939e
Update language.h
12 years ago
BorisLandoni
4c7d1436e9
Update pins.h
12 years ago
BorisLandoni
6588933c04
Update Configuration.h
12 years ago
Scott Lahteine
5dabc95409
Apply all changes from latest Marlin_V1
...
Diffed and merged, preserving my updates
12 years ago
Gord Christmas
a733537ddd
Missed some variable declarations
...
Integrated fixes from henrikbrixandersen pull request #504
12 years ago
Gord Christmas
f4f30c9d64
Added servo actuated enstop coding to allow G28 command to engage and retract a servo to specified angles.
12 years ago
Erik van der Zalm
79374f0b93
Merge branch 'reisnyderb' of https://github.com/ErikZalm/Marlin into Marlin_v1
12 years ago
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
12 years ago
kiyoshigawa
4b19c8552e
Fixing changed Configuration.h settings to be default values per ErikZalm Request.
12 years ago
Erik van der Zalm
971ec35135
Expanded M302 to allow setting the temp
12 years ago
Erik van der Zalm
5090c56651
More redundant temp sensor changes. (After testing and debugging by reifsnderb)
12 years ago
Guillaume Seguin
16b9239a26
Report temperatures for all extruders
12 years ago
ErikZalm
a964b3cf3d
Merge pull request #495 from Gatulibu/Marlin_v1
...
Added support for Megatronics v2.0 and Minitronics v1.0
12 years ago
Maik Stohn
e8572c5239
Fix: Long menu entries (>14 or >18 chars) caused overrun in hitachi display implementation
12 years ago
Maik Stohn
7ee70c2248
Fix: removed wrong ; at end of define
12 years ago
Gatulibu
b78fa6bb70
Added support for Megatronics v2.0 and Minitronics v1.0
...
merged from code downloaded from reprapworld.com
12 years ago
Erik van der Zalm
9be61cdc02
Added redundant temp sensor
12 years ago
Erik van der Zalm
7231a20dba
Put #ifdef around servo pins in pins.h. This allows the pins to be used for M42.
12 years ago
Alexander Kasimir
e2ff536b03
Fixed typo in Comment
12 years ago
Robert F-C
40eb07bad4
Revert and extend previous change pin check change
...
Reviert previous change of #if BLAH_PIN > 0 to #if defined(BLAH_PIN) &&
BLAH_PIN > -1. Unfortunately some times pin 0 is used. For my sins I've
gone through and replaced all unsafe checks of #if BLAH_PIN > -1 with
the safe version.
12 years ago
Maik Stohn
bd33cf4a9f
fixed typo / added "const" to defines for newer gcc compatibility
12 years ago
ErikZalm
567291e734
Merge pull request #485 from Banjer/Panelolu2_Melzi
...
Add Panelolu2 support for Melzi
12 years ago
Maik Stohn
8d80cbbf4c
fix broken LCD commit #dfa549f268 from buildrob - GLCD/DOGM implementation was ignored
12 years ago
xifle
98d0d48191
fixed merge
12 years ago
xifle
bbe67fca5a
soft tab correction
12 years ago
xifle
9eeb711c96
Merged from Upstream Master
12 years ago
Bas Spaans
424101110c
Add Panelolu2 support for Melzi
12 years ago
Robert F-C
0d4a9444c4
Merge remote-tracking branch 'upstream/Marlin_v1' into Marlin_v1
12 years ago
Erik van der Zalm
86cce025f4
Added #ifdef NUM_SERVOS to servo.cpp
12 years ago
xifle
03141a5ef4
LCD: Added Deadzone at 100% Feedrate
...
This adds a deadzone at 100% Feedrate when changing it at the status
screen/main menu. Prevents from unwanted feedrate-changing when
navigating back to the main menu and makes it easier to return to 100%.
12 years ago
Gord Christmas
28ada096e2
Adding servo documentation
12 years ago
Robert F-C
4121311b9d
Change to LCD status indicators
...
The I2C LCD status indicators now indicate when the hotends or bed are
turned on at all (rather than just when they are in their heating phase)
12 years ago
Robert F-C
dfa549f268
Merge remote-tracking branch 'upstream/Marlin_v1' into Marlin_v1
12 years ago
ErikZalm
64360164ad
Merge pull request #482 from codexmas/Marlin_v1
...
servosupport
12 years ago
ErikZalm
86405cdd11
Merge pull request #479 from MStohn/thermocouple
...
BUGFIXES for temperature.cpp / add RUMBA thermocouple support
12 years ago
Erik van der Zalm
6c45c3f4e7
BariCUDA changes
12 years ago
Gord Christmas
96624f0f31
Forgot to include reference to Servo in makefile
12 years ago
Gord Christmas
dc59f07d24
First attempt at refactoring of original servo code. Only adding servo support as a start to keep things simple.
12 years ago
Gord Christmas
b668cb0516
Adding in clean copies of Servo library from Arduino 1.0.4
12 years ago
MaikStohn
95dff34b73
fixed wrong compare for min temp check of heater 1 and heater 2
12 years ago
MaikStohn
4cc6f9f6de
fixed wrong pin initialization when using temperature 2 pin input
12 years ago
MaikStohn
61a48cc662
Add support for RUMBA thermocouple add on
12 years ago
MaikStohn
9cc15876be
Add support for RUMBA thermocouple add on
12 years ago