3eacb4c16d
Wrap the call to turn off the bed heater in a #if to prevent a compile error on boards that do not have a bed heater
13 years ago
e4d2138dbd
reinitialize the lcd, if the SD card is inserted or removed. It seems that LCDs can confused by electrical discharges from time to time.
...
Since a removal or insert of the sd card takes a long time in firmware, just reinitializing the lcd does not hurt.
actually, it solves a problem with the UltiControlle
13 years ago
464b755918
added support for the UltiController
13 years ago
44fd8d46d2
fixed quickhome
13 years ago
33bb044d7c
fixed catsting to (int)e in serial error messages.
...
see https://github.com/ErikZalm/Marlin/issues/148
13 years ago
c2557abc03
Merge pull request #138 from triffid/fix-makefile
...
make should rebuild if configuration or Makefile is changed
13 years ago
67cf105bc6
Fixed AUTOTEMP (M109 S215 B260 F1 starts autotemp)
...
Changed SLOWDOWN. IF this does not work ok OLD_SLOWDOWN is the old algo.
13 years ago
8aee9d51b6
Disabled disable_heater in PID_autotune.
13 years ago
414408b2d0
Fix for wrong systax in #ifdef.
13 years ago
77d503fa13
Fix Makefile
13 years ago
cf7c8c458f
Fixed MAX6675
13 years ago
03b0850e63
This breaks temperature readout for pronterface!
13 years ago
ad8bc71d3e
- Fixed a typo
13 years ago
46feae79c6
Fixed typo in arc
13 years ago
4ca2f336f0
Changed default MINIMUM_PLANNER_SPEED -> 0.05
...
Fixed small bug in arcs
M105 prints now actual_temp/target_temp
13 years ago
ae0bf8068b
Fixed arc offset.
13 years ago
0c1b863755
Ignore ":" in comments.
13 years ago
63aec3c56e
Replaced Kill by Stop. If the printer is stopped. Fix the error and use M999 to restart.
...
Moved the PID_dT in the Ki and Kd calculation from the configuration.h to temperature.cpp
13 years ago
8b785f75a6
Merge pull request #123 from buserror-uk/for-upstream
...
For upstream
13 years ago
520f1a54a8
Fix compilation error when PIDTEMP is undefined and ULTIPANEL is defined.
13 years ago
5550e893d5
New board variant, Open Motion Controller
...
Open Hardware board currently used by the group build of http://tvrrug.org.uk
The board can be found at http://solderpad.com/folknology/open-motion-controller/
Signed-off-by: Michel Pollet <buserror@gmail.com>
13 years ago
aa6e6e914e
Makefile: Redone
...
+ Removed most explicit pathnames, use the standard make "VPATH" to let
make find the files for itself.
+ Added a "hardware variant" variable that allows compiging Sanguino and
Gen7 as well as "generic" arduino.
+ Allows overriding the MOTHERBOARD define from the Makefile
+ Removed the 'preprocessor' bit that wasn't needed, now just "include" the
files that are needed, since it allows gcc to show the right file/line
when displaying error/warnings.
+ Uses gcc's own dependency generator to generate the .d files, and
and include these instead of self-patching the makefile
Signed-off-by: Michel Pollet <buserror@gmail.com>
13 years ago
0183e6332a
made prepare->autostart independent of current folder.
13 years ago
1532200435
found error in filenames.
...
One array was too short. This had nothing to do with long filenames, other than if they were 12 characters exactly, which could only happen if the extension and the text before were filled completely
13 years ago
b985e4a134
Fixed compile errors in ultralcd when no ultra_lcd is selected.
13 years ago
2e749d60c3
Added DISABLE_MAX_ENDSTOPS
13 years ago
33f5697888
PPID tune exports more constants.
13 years ago
b44055cc51
Merge branch 'Marlin_v1' of github.com:ErikZalm/Marlin into Marlin_v1
13 years ago
f5eae52098
Added more manage_inactivity checks
13 years ago
19a47dae4a
Merge pull request #99 from Justblair/master
...
Better pin configuration for rotary encoder in RAMPS boards
13 years ago
910f4e77a2
Added 20MHz support.
13 years ago
7cefad3744
Merge pull request #106 from bgamari/Marlin_v1
...
Make F_CPU dependence of stepper.cpp more explicit
13 years ago
87ff2f8867
Added CONTROLLERFAN. (Controlling a fan to cool down the steppper drivers)
13 years ago
387fe51a56
Do not disable steppers when there are moves in the queue.
13 years ago
421264e58a
Fixed typo
13 years ago
15ad923310
Removed !!!. Stupid arduino bootloader can't handle this.
13 years ago
61e09e6be2
Added FAN_PIN -1 checks
13 years ago
87c4e06c24
Corrected active_extruder when autotemp is used.
13 years ago
7b1e295f34
Merge branch 'Marlin_v1' of github.com:ErikZalm/Marlin into Marlin_v1
13 years ago
c077316b2b
Added PID autotune. (experimental)
...
M303 Starts autotune. Wait till the Kp Ki and Kd constants are printed.
Put these values in Configuration.h
13 years ago
49b228c4b3
Add instructions to regenerate speed_lookuptable when changing F_CPU
13 years ago
96509494f0
stepper: Clarify comment on timer-counter configuration
13 years ago
6d7e6a11fc
Add create_speed_lookup
13 years ago
ce07c9186d
While Waiting for hotbed to warm up via M190, LCD Display and Click Encoder input freeze until target temperature is reached.
13 years ago
116dc86b8a
Fixed type in e-jerk
13 years ago
02ee9e3d30
Changed Pin Assignment for the RAMPS motherboard so that LCD and Rotary encoder are all wired to AUX-4
...
This simplifies wiring for those with RAMPS 1.3 and 1.4 boards.
13 years ago
e056bf8081
Added E-Jerk
13 years ago
4deeffbc88
Added missing defines to the german section.
...
Translation still needed.
13 years ago
632528aa95
merging with SCUBA82
13 years ago
aac7aa3bf0
Queued fan control. Issue #90
13 years ago
fde51084f3
set SD file delete to M30; switch printime output to M31
13 years ago
21e2bae063
Changed (corrected?) SD_card comment handling.
13 years ago
e509bbf636
Merge branch 'Marlin_v1' of github.com:ErikZalm/Marlin into Marlin_v1
13 years ago
072011a3ef
Added current_block = NULL to quickStop()
13 years ago
2422a857a1
Merge pull request #96 from haxar/Marlin_v1
...
make analog2tempBed return a precise celsius reading for BED_USES_THERMISTOR, ...
13 years ago
f598077af3
Removed vc files
13 years ago
cb0c84e075
Merge remote-tracking branch 'justblair/master' into Marlin_v1
13 years ago
1d5809d458
Merge pull request #88 from daid/Marlin_v1
...
Made plan_buffer_line arguments const...
13 years ago
ed951b1977
Fixed RAMPS 1.2 support (Found and fixed by rrhb)
13 years ago
4879de08e8
The percent complete for the SD file statistic sits squint. Changed "lcd.Setcursor (7,2);" to "lcd.Setcursor (10,2);".
...
The percent complete now lines up with the temperatures and Z-axis position figures, nicer to read and nicer to look at IMHO.
13 years ago
f278e1c00f
This is in my opinion a much better way of dealing with SD cards than my previous fix.
...
Instead of adding a momentary switch to fake the insertion of the card I have modified the ultralcd menu item:
Card Menu -> Refresh
to reinitialise the card providing that the SDCARDDETECT pin has been set to -1 in the pins.h file. This requires one less switch on the front panel and the refresh menu item is in the most relevent place for a user who wishes to inert a card and then print from it.
It also means that the "Card inserted" messages do not bother the users of these card readers (they dont make sense for users without SCCARDDETECT)
13 years ago
046a8e0039
Added more defines to the language.h file so that nowe most of the text strings are now configured via this file. Still got some hunting down to do to complete this task.
13 years ago
79a466ca26
make analog2tempBed return a precise celsius reading for BED_USES_THERMISTOR, complementing changes to analog2temp in d15f01e
13 years ago
5f3a422e68
added M31 - delete file from sd card
13 years ago
fa2e3a40e9
fixed LCD manual z axis move Feedrate to 70 (was 1700)
13 years ago
a92b3afe64
added german translation;Menue should be in english.. sounds better
13 years ago
9fa586bbed
fixed languages; Preheat_PLA and Preheat_ABS was not defined for non
...
english
13 years ago
00d33e6b82
Typo fix
13 years ago
7d124478fa
Only protect the heater pins for the defined extruders.
...
Changed the way the extruder pins are defined so it doesn't create extra -1 entries in the list.
13 years ago
3d83109028
Fixed general 16x2 LCD build without SD support.
13 years ago
cb02914687
Merge remote-tracking branch 'upstream/Marlin_v1' into Marlin_v1
13 years ago
10bf2bb8e1
-
13 years ago
d47b666630
Merge branch 'Marlin_v1' of git://github.com/ErikZalm/Marlin into Marlin_v1
13 years ago
88d289caa1
Made plan_buffer_line arguments const, which optimizes better and fixes the RUNOUT_PREVENTION feature.
13 years ago
b4833d55c2
Fixed HOME_POS in combination with G28 X0 or G28 Y0
13 years ago
c6f2ec3c82
remove stop_heating_wait
13 years ago
b48d67ce10
Fixed homing
13 years ago
071eec7aa7
Merge pull request #81 from phord/09469add5560ca8a676c42e4bcd499868c33f0dd
...
Clean up and add some trace info
13 years ago
1ebe7d1ab6
Merge pull request #83 from phord/tempfix
...
Add explicit #define for bogus temp override
13 years ago
b65ef8d66c
Add support for upcoming Gen7 v1.4
...
V1.4 moves thermistor power to the always-on 5v line.
The BOGUS_TEMPERATURE_FAILSAFE_OVERRIDE is no longer
needed on this board. Add a new motherboard type to
support this feature.
13 years ago
740f0c7690
Add explicit #define for bogus temp override
...
The code to ignore the "bad thermistor reading failsafe"
suicide function depends on the existing of the PS_ON pin
feature. But in some boards this shouldn't be the case
Fix this by adding an explicit definition to make our
intentions more clear and separable.
13 years ago
ba8500a236
pins.h: Define Z_MAX_PIN for Gen7 board
...
The Z_MAX_PIN value was defined as no-value, but this causes
the compile to fail. Fix this by setting the Z_MAX_PIN to the
correct value (which happens to be 0 for pin PB0/DIO0/0).
13 years ago
09469add55
Add board reset reporting (from Repetier-Firmware)
13 years ago
f3101e96d9
Add suitable .gitignore to avoid build noise
13 years ago
245dca4bee
Makefile: generic pde=>cpp rule
...
This adds flexibility to the makefile by allowing different pde
targets to be specified for different needs.
13 years ago
97d42ca2b2
SDSUPPORT default disabled
13 years ago
7b14953c99
Fix build on Sanguino based boards with ATmega1284P
13 years ago
286d5003fa
Fixed compiler warning for Sanguino compile
13 years ago
66d50562b6
Merge pull request #76 from iXce/Marlin_v1
...
Fix Makefile
13 years ago
27f595a444
Changed version => RC2
13 years ago
018c567abf
Moved SLOWDOWN function. (jetty840)
...
Included AD595 calibration options. (daid)
13 years ago
4fbda5c3f5
Merge remote-tracking branch 'daid/Marlin_v1' into Test
13 years ago
ce714fe306
Fixes in pins.h
13 years ago
35e57bf149
Added gen6 deluxe.
13 years ago
84ea2d61e8
Moved gen7 boards to motherboard type 10, 11 and 12.
...
Split ramps1.3 in Sprinter like config and multiextruder config.
13 years ago
adc108d79e
Correctly build the produced applet/Marlin.cpp source
13 years ago
5aa9c41ab1
Changed comment mode for detection.
...
Added M221 extuder multiply factor.
13 years ago
00690f7ffd
Fix cast warning in Gen7
13 years ago
01d28c18ab
Fixed casting warning in sanguino
13 years ago
2fd8c248fe
Added Fan control to the pre-heat settings.
...
I find that the PID routine works better when the cooling fan is switched on
at the beginning of a warm up routine. Otherwise when you enable the fan
just before a print, you have a delay as the PIDre-adjusts.
This should also be safer as most cooling fans are directed at the hot -ends
thermal barrier!
13 years ago
d9f2f509d5
Added new menu items under the prepare submenu.
...
Instead of a single pre-heat, now there is pre-heat ABS and PLA options
Added defines to the configuration file to adjust preheat temperatures for both
13 years ago
ae3e7586c6
Added HOME_POS. This adds the posibility to make the center 0
...
Updated the Xsteps ... settings via the LCD menu
13 years ago
df1437bd86
Changed display format for some numbers.
13 years ago
8816ef1c64
Small fixes after merge
13 years ago
d298dd121f
merged SBUBA82 and Justblair
13 years ago
2cc9a89830
Merge remote-tracking branch 'SCUBA82/Marlin_v1' into Marlin_v1
13 years ago
a0a1f81913
various changes
13 years ago
8a8ea50f33
fixed manual axis movement lcd option
13 years ago
b976692d0f
Removed VS project files for tidyness stakes
13 years ago
fe940a142d
Added a structure that will allow easy translations/modifications to the LCD menu.
...
Signed-off-by: Blair Thompson <mail@justblair.co.uk>
13 years ago
b3fb09a20c
change preheat to ABS values of nozzle 227 and be 105 C
...
next try for manual axis movement
13 years ago
a05a261b72
Added a workaround. Ramps SD card does not have sdcarddetect. My temporary solution is to add a momentary swtich
...
that pulls down the SDCARDDETECT pin and mimicking the pull and reinsert ofa a SD card
13 years ago
1b6765ed12
Updated the pin config for RAMPS 1.3 to include ultimaker new style LCD/Rotary Encoder interface
13 years ago
1ff99ae25f
ATMega1284P support for Arduino IDE
...
replace $ARDUINO_HOME/hardware/tools/avr/etc/arduino.conf with this file
13 years ago
e661578c84
support for GEN7 1.1,1.2 and 1.3
13 years ago
73344e69c1
Added temperature offset/gain settings for AD595.
13 years ago
d309565b56
Merge remote-tracking branch 'upstream/Marlin_v1' into Marlin_v1
...
Conflicts:
Marlin/Configuration.h
13 years ago
0e3631ff4b
smaller changes
13 years ago
fa2e1be0ca
changed default EXTRUDE_MINTEMP to 170.
13 years ago
7699f250e3
Fixed small merge bug
13 years ago
11518a987f
merged with triffid fork
13 years ago
13e185d330
removed unused HEATING_EARLY_FINISH_DEG_OFFSET
...
Simplified stepper inactive time
13 years ago
b58eae7657
Corrected e-length calculation in planner
13 years ago
2a77c84c8f
Updated SERIAL define to MYSERIAL, because Arduino 1.0 defines SERIAL as 0.
13 years ago
d47a3e5950
Changed check i mtion_conrol
...
if (millimeters_of_travel == 0.0) => if (millimeters_of_travel < 0.001)
(thanks mooselake)
13 years ago
f87c80889f
Fixed M109 timer overflow (reported by triffid)
13 years ago
154de69c02
Print configuration.h version during startup (thanks hairykiwi)
13 years ago
6ef8459494
Corrected distance calculation. (thanks jv4779)
13 years ago
598eb1d4f1
Fixed compilation for gcc-4.6.2 with avr-lib-1.8.0 (thanks daid)
13 years ago
9173a5713b
Teensylu support.
13 years ago
da040fd393
Fixed ultimaker heater 1 pins. (Thanks daid)
13 years ago
bdb70c0509
Warning for 10k thermistor
13 years ago
5113513cb2
RC 1
13 years ago
d8a0c6450f
Split the configuration file in two parts.
...
One for common settings.
One for advanced settings.
13 years ago
4cc8e37bf1
lcd menue "move_axis" added
13 years ago
b5fae1104b
fixed sUICIDE_PIN disable
13 years ago
f9c5333f97
Made "stop heating wait" optional.
...
Default off.
13 years ago
292ddd2edb
Fix Z_LATE_ENABLE
13 years ago
25cd8af536
added arduino ide GEN7 support Files
13 years ago
14702089ee
-disable TEMP Min MAX Kill while using PS_ON Pin
...
ON GEN7 there is no temperature reading when power is off.. so Marlin
would kill itself. There seems to be an update from "Traumflug" on GEN7
using standby VCC for thermistors.
13 years ago
b51e8bf7e5
-disabled CARDDETECT if PIN is set to -1
...
- redo disable Beeper if PIN is set to -1
13 years ago
3183a14755
-added Configuration for GEN7 which worked for me
13 years ago
5edef148fe
-disalbe beeper if BEEPER_PIN = -1
13 years ago
13e2ad2831
- added info for using GEN7 configuration
13 years ago
59cc5f889e
- added support for ATMega1284P
13 years ago
a11f3b2d2f
- Pins for modified GEN7 assigned
...
- Added support for ATMega1284
13 years ago
abb7e63906
fixed z-disable bug.
13 years ago
9f139d6e0e
Added MAX6675 support. (Thanks to gregfrost)
...
Needs some work to remove the blocking in read max6675.
13 years ago
e45e5c68bb
Added support for Gen3+ (Pins file only)
...
Added late z enable. (blddk request)
Only calculate look ahead if >2 moves in buffer.
Removed some FORCE_INLINE to save memory.
Signed-off-by: Erik van der Zalm <erik@vdzalm.eu>
13 years ago
9c918a497b
more work on Makefile - actually rebuilds if Makefile or Configuration.h are altered, also much cleaner output
13 years ago
Logan Bowers