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
ab01658fd2
local configuration stuff- WATCHPERIOD causes breakage, disable. few other misc changes
13 years ago
42bedb3f60
PROGMEM elements must be const
13 years ago
a991bde523
enable auto-reset before programming, disable afterwards
13 years ago
3e575533c5
get M81 working
13 years ago
2ae2ead97b
help residency not overflow
13 years ago
71dc82e0b4
my local configuration
13 years ago
5aadc2f5ca
cardreader needs to include some other files
13 years ago
8d0916af13
allow Marlin to actually compile with Makefile pulled from Sprinter and a few other modifications
13 years ago
6cc6029d7a
M109 EOL fix when TEMP_RESIDENCY_TIME is undefined; printer interface (pronterface) could not see target extruder heater temperature to continue print
13 years ago
157aa7f2fd
m115 eol fix
13 years ago
7aeb45303d
small mistake
13 years ago
cee5f9020a
added suicide pin for a power supply to the arduino that is only active if the arduino is holding high for an output.
13 years ago
3814bbb529
made sd code only compile with SDSUPPORT defined. safes 10k of codespace
13 years ago
729cde4475
fix autostart failure if in wrong directory
13 years ago
396270a0de
fix duplicated definition of MOSI MISO pins in case motherboard==33
13 years ago
11f2dafc4e
one step closer to a functional makefile..
13 years ago
8463e39a4a
starting with sanguino arduino 1.0 compatibility
13 years ago
2bc160a978
add wiring.h, that can be used to overwrite:
...
arduino-0023/hardware/arduino/cores/arduino/wiring.h
this is necessary if the avr libraries are recent, but arduino is old. Alternative: newer arduino
13 years ago
57f9359a41
simplified the includes, makefile now works with arduino23
13 years ago
3c1a4aac2b
header file simplification
13 years ago
212515148e
added m240 photography support. default off
13 years ago
6735025428
cooldown
13 years ago
415aadf704
lcd panel bed support
...
advance and ultipanel not any more in default config
13 years ago
554cc1718d
Fiexed E_ENABLE_PIN errors
13 years ago
617968ab76
G92 fix
13 years ago
84d9cf7339
merging
13 years ago
e017228569
Merged multiple extruder support.
...
Soft PWM. (Sanguinololu can also have PID temperature control)
Interrupt save WRITE for addresses > 0x0FF
13 years ago
3320a5b37d
make autotemp compatile for use without pid
13 years ago
06411d5c9e
ultralcd can now also stop the wait loop for the hot-end m109 heating when stopping sd prints.
13 years ago
82c99625fa
instant stop of sd prints from the panel.
13 years ago
01001b89d2
repaired nozzle runout prevention to not collide with automatic stepper disabeling.
13 years ago
88ee053af0
heating up santity, formarly knows as "watchdog", but renamed due to the existance of the real watchdog, works now.
13 years ago
b1d84d879b
st_synchronize back to normal..
13 years ago
f6fe7143e4
Merge pull request #29 from k-eex/Marlin_v1
...
Fix M201 not saving settings in all places, so the changes did not get written into EEPROM
13 years ago
dde4b40fa9
disable steppers in runout prevention
13 years ago
2bc5e7ec9e
prevent too long extrudes, or too cold extrudes
13 years ago
aa4f9a6474
better values.
13 years ago
87fd249c43
made runout prevention independent of tempeorarily set esteps
13 years ago
1ec0c3b68a
extruder runout prevention.
13 years ago
5b4625f79c
added a partial release option to "m84" aka "stepper release". If you do tiny layers, you might want to keep the z-axis powered to not loose height positioning after homeing.
13 years ago
cc4a9cdb69
added autostart procedure trigger to the ultralcd menu
13 years ago
61c943b4bf
fixed the st_synchronize. it would have continued if there is only the last move of the buffer being stepped.
13 years ago
bae1e422f6
Fix M201 not saving settings in all places, so the changes did not get written into EEPROM
13 years ago
754d2d69b2
z homing sound fix, for now until the actual cause is found..
13 years ago
986f0ba76c
moved <stdio.h> to more dominant location.
13 years ago
460b788d78
repaired homing position setting.
13 years ago
4fd75dc813
Working version of multiple extruders (up to 3)
...
- The temperature control is pretty much complete
(not sure what to do w/ autotemp though)
Changed the pins assignment to clearly separate bed and extruder heaters
and temp sensors, changed a bit how termistor tables are handled.
- The steppers control is rudimentary
(only chanages what pins it uses depending on the active_extruder var,
but that's enough for switching extruder in the start.gcode in the
the profiles)
- Tested only w/ RAMPS 1.4
13 years ago
12e8edcac3
Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into Marlin_v1
13 years ago
cf50ba140f
added M503 to display eeprom storage, and renamed eeprom routings. This version is compatible with the qtmarlin eeprom-tab.
13 years ago
89e832c295
Update endstops only for homing. (use less resources when not used)
13 years ago
b99c49ec3b
Add option to only check endstop when homing
13 years ago
95a0b28acb
Merge branch 'Marlin_v1', remote-tracking branch 'origin/Marlin_v1' into Marlin_v1
13 years ago
af22e9cd38
Some advance modifications
13 years ago
7714b98da7
solved some compiler warnings that are now visible in arduino 1.0.
...
Found a couple of unused variables, that I commented.
Tried to solve the program memory warning message, and failed.
13 years ago
dfd240b260
overworked autotemp, removed one layer of nesting from the ultralcd.
13 years ago
4f909963e4
make QUICKHOME configureable
13 years ago
6b86f15686
More 2nd extruder implementation. (Not usable)
...
Advance (not tested)
13 years ago
0bc9daa4f7
make it compile with arduino 1.0 ; function is still untested.
13 years ago
b0c3871750
more fixing of the sanguino math round problem
13 years ago
9c57453168
removed stream.h referenece from marlinserial.
13 years ago
59205ac5fc
preliminiary implementation for the early heating finish.
...
Might be replaced by something more clever, e.g. by erik, and does not yet support the second extruder or the bed.
its kind of not so cool, because you need 6 more ints.
Maybe isheating() should use the degrees directly, as it is not used in time-critical anyways.
Then it would be much easier. to have the offsets without additional variables.
13 years ago
7a4be21b4f
made it compile if arduino decides to include files in a differnt order. DEC HEX and stuff now defined in MarlinSerial.h
13 years ago
716e89b87c
first homing move diagonal towards home switches.
13 years ago
d00b7e5587
repaired compiliation in windows
13 years ago
e4ab0e5982
more inlines
13 years ago
8cb29921a0
possible stepper release after sd printing
13 years ago
044886b4a0
Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into Marlin_v1
13 years ago
b19c8b74b9
force inline
13 years ago
6d95644c0d
Moved M88 into M84. (M84 E)
13 years ago
311627141b
Merge branch 'smallopt' into Marlin_v1
...
Conflicts:
Marlin/temperature.h
13 years ago
7216a12856
Disabled M88 for boards that don't have seperate enable pins.
13 years ago
98805c9228
Added M88 command. (Request from Action68)
13 years ago
85da81e673
inlineing of small functions in serial
13 years ago
b9ad0bb2ce
removed unecessary indirect register adressing in serial.
13 years ago
dd5ca68c87
get rid of indirect ringbuffer calls, made some inlines, removed virtual and streaming class requirements.
13 years ago
dd5296ad4d
Fixed temperature reading bug.
...
(When using the lower and upper adc input bank)
13 years ago
f75f426dfa
Removed interrupt nesting in the stepper ISR.
...
Add serial checkRx in stepper ISR.
Copied HardwareSerial to MarlinSerial (Needed for checkRx).
13 years ago
2d9a715655
first naive attempt to have a offset in the homeing procedure. Does not enable to move into regions not allowed by endstops.
13 years ago
d2f034ba84
lcd message from gcode, m117
13 years ago
6aecf80278
add autotemp support to the lcd
13 years ago
b128d25f27
overlooked some inlines..
13 years ago
26a1de1e44
force inline
13 years ago
f8e170a44b
planner optimization by inline functions
13 years ago
aad4b75b94
First parts 2nd extruder
13 years ago
a0dc66f7bf
Home retract distance configureable per axis.
13 years ago
6d6f323535
make an option if sd-card stop should release the steppers.
13 years ago
4d6a5c29df
disable steppers as routine in stepper.cpp
13 years ago
74d0032e25
cooldown blocking selectable by #define.
13 years ago
191f36b493
slowdown
13 years ago
c54a807824
overworked ultralcd a bit
13 years ago
a6823a84e1
another typo
13 years ago
57e163e989
typo
13 years ago
b58787a367
now velocities are also set in mm/sec in gcode.
13 years ago
71ca78982b
Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into Marlin_v1
13 years ago
235051253a
overworked lcd+eeprom to have only mm/sec and PID including pid_dt
13 years ago
27654bfe69
Fixed variable (removed 0x)
13 years ago
cdf0bd4e63
Fixed config bug when EEPROM was disabled
13 years ago
6ac9b2e761
Fixed residency time bug. (Thanks to Sound :-) )
13 years ago
ac8adabb2b
Small nominal speed improvement.
13 years ago
0e0e4945d8
Removed ISR overtaken message from ISR routine
13 years ago
c0f8c9fd72
Seperate ENDSTOP_INVERTING for X Y and Z
...
Added simple endstop filter.
Corrected M114 count display.
13 years ago
5535e51bf6
Yes, thats the beta.
13 years ago
8b14a8ad34
Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into Marlin_v1
13 years ago
924bab1a03
less lcd flickering
13 years ago
379ea642e1
make tuneing sub-menu.
13 years ago
959d82e81e
Small temperature disable bug.
13 years ago
15bb3f284e
Merge branch 'Marlin_v1', remote-tracking branch 'origin/Marlin_v1' into Marlin_v1
13 years ago
4e5becfc51
Added endstop reporting
13 years ago
eeb4f029db
Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into Marlin_v1
13 years ago
b21d5193f2
made ultralcd compatible with folders.
13 years ago
2e43f9c809
Changed min max temperature code.
13 years ago
cd2268f10a
code cleanup in ultralcd.
13 years ago
0e7fee9a9b
Merge branch 'Marlin_v1', remote-tracking branch 'origin/Marlin_v1' into Marlin_v1
13 years ago
915ef2d4a1
Added software endstops
13 years ago
e87df99e22
update mcode documentation
13 years ago
8a1e719a3f
overworked config file
13 years ago
5ad1d19384
make it compile without sd_support
13 years ago
7a2d1f5aeb
add M17, so the enable stepper button works in repg.
13 years ago
e02af3e66a
Merge remote-tracking branch 'origin/Marlin_v1' into Marlin_v1
13 years ago
537b5c155d
Fixed arc flowrate.
13 years ago
953d830bba
Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into Marlin_v1
13 years ago
2a6afee832
make it compile without autotemp
13 years ago
f52e1a9571
autotemp working, default=disabled.
13 years ago
6e6fdb9a4e
Merge remote-tracking branch 'origin/Marlin_v1' into Marlin_v1
13 years ago
6841a10446
Fixed max/min temperature bug
13 years ago
8a08b8e07e
trying to get autotemp to work.
13 years ago
f0154de5b3
found bug that disabled printing from root.
13 years ago
70650c331d
corrected the ultimaker default values, the previous had a calculation error: see: http://groups.google.com/group/ultimaker/browse_thread/thread/91906788639703cf
13 years ago
9d90220537
Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into Marlin_v1
13 years ago
869cee74e6
host-based sd card printing seems now to work with folders
13 years ago
70abca195a
overworked cardreader for folder support; not finished yet.
13 years ago
ff69e0a772
Changed max/min temp init. Removed second uart from sabguino core
13 years ago
1e5e141ac9
Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into Marlin_v1
13 years ago
edb5ea7efa
the normal config again..
13 years ago
5df5727e93
removed some debugging comments
13 years ago
64f2121ab1
updated to sdfatlib2010902
13 years ago
b15902d3b5
Fixed bug in configuration.h
13 years ago
e63e224a33
Merge remote-tracking branch 'origin/Marlin_v1' into Marlin_v1
...
Conflicts:
Marlin/Configuration.h
Marlin/Marlin.pde
13 years ago
e7dca8614b
Advance experiments. Not working yet.
13 years ago
46f80e82d9
Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into Marlin_v1
...
Conflicts:
Marlin/ultralcd.h
13 years ago
a9c7da06e3
and changed ultipanel to have the mm/sec and not mm/min
...
Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into Marlin_v1
Conflicts:
Marlin/Marlin.pde
Marlin/ultralcd.h
13 years ago
02b9eceead
show sd%
13 years ago
7919a40d06
watchdog,percent done,
13 years ago
805d37f77b
Fixed some small planner bugs
13 years ago
5fd41ae872
Some fixes in planner
13 years ago
95126c09c0
Added slowdown
13 years ago
331e82dcd3
Buffer size > 16
13 years ago
2643ae93d6
Added modified Sanguino files
13 years ago
c00eefb824
Merge remote-tracking branch 'origin/Marlin_v1' into Marlin_v1
13 years ago
1d0452f10c
250000 baud
13 years ago
c57906b627
fixed bug with adjusting ki in realtime.
13 years ago
ac82411c73
Merge remote-tracking branch 'origin/Marlin_v1' into Marlin_v1
13 years ago
65934eee9c
A lot of changes in the planner code
13 years ago
9980ceb4a3
added a m400, that finished all moves,
...
and the mechanism so that if an endstop is hit it the ISR, the steps_to_be_taken are stored, and some current_block data that will be deleted in the next move
If the normal loop() then finds such an event, the position is calculated (floats would have taken too long in the ISR) A serial message is generated.
13 years ago
ff592b056a
heater power repair.
13 years ago
e9adfa27b5
re-enabled heaterpower as storage for the current storage of the heater PWM duty cycle.
...
the M301 now returns the current PID settings of the machine.
M105 returns heating pwm duty cylce as "@:"
13 years ago
36958ee305
minor changes and first not-well working version of autotemp
13 years ago
ba8a53a40f
Streaming.h is gone. It conflicted with PROGMEM. And saving memory is more important than nicer code, imho
13 years ago
27361e7cd0
beautified the config. ordered it into thematic sections.
13 years ago
ab154d5592
project progmem finished: total change with ultipanel: 2456 byte free ram initial. now: 4374 ram.
13 years ago
7b70caab7c
made progmem mainly, found one bug in cardreader, added a empty class for cardreader in case no sd support.
13 years ago
72ace55e6a
better visibility of public/private/imported variables
13 years ago
977fd2b2c7
Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into Marlin_v1
13 years ago
907daa49af
made loop counters uint8_t most were int(16_t) before
13 years ago
e3af73ee0c
Thermistor name problem
13 years ago
0b43761c3a
preprocessor magic to have a single source principle
13 years ago
156763d027
Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into Marlin_v1
13 years ago
fc0064e525
made cardreader more selfsustained
13 years ago
d3bfffcb6e
Corrected thermistor naming
13 years ago
01df04e02c
first compile with the cardreader class
13 years ago
163efdf1c7
Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into Marlin_v1
13 years ago
87aaf0f70a
static'ified Marlin.pde.
13 years ago
5cf349a24a
Fixed some arc bugs
13 years ago
79d1bfb5c0
made many possible variables static, so they cannot be used extern.
13 years ago
76b3f805c0
Added teensylu pins
13 years ago
1d171e9e52
reformating and some minor bugs/things found on the way.
13 years ago
900e0c9bf2
overworked the serial responses. Quite difficult, since many texts are Pronterface protocol.
13 years ago
1740a83e11
correcting commit errors.
13 years ago
7cc358b56b
wrong file location
13 years ago
e8092898b1
watchdog into dedicated file
13 years ago
2afb7bd4cf
refactured temperature.cpp so that there are now abstract functions to access temperatures.
13 years ago
0b82465168
First arcs version. (Arcs not working ok)
13 years ago
2e8e8878e5
Corrected temp variables.
13 years ago
04d3b5537f
Merge remote-tracking branch 'origin/Marlin_v1' into Marlin_v1
...
Conflicts:
Marlin/Configuration.h
Marlin/EEPROMwrite.h
Marlin/Marlin.h
Marlin/Marlin.pde
Marlin/temperature.cpp
Marlin/temperature.h
Marlin/thermistortables.h
13 years ago
d15f01e1b4
Temperature changes
13 years ago
ea86a5e10f
moved the variables in the ISR, thats the most normal use case of static.
13 years ago
b9ea0651ec
Revert "this is not working. Do you maybe know why?"
...
This reverts commit 8bcdb9f5f0
13 years ago
8bcdb9f5f0
this is not working. Do you maybe know why?
13 years ago
40e8081623
changed end of line to windows, which seems to be the majority of developers main platform.
13 years ago
00674af3a8
merge from the branch bkubicek/Marlin/zalmmerge
13 years ago
d7c4f0780b
Added M42, M80 and M81
13 years ago
95d3d9847c
M109 now equal to sprinter
13 years ago
bf879ceaa9
Added thermistor tables
13 years ago
094afe7c10
Merged Marlin, Marlin non gen6 and Ultimaker changes
13 years ago
0b1423c303
Fixed crashes.
13 years ago
27664c6da6
Software endstps added
13 years ago
8e017b81ab
Sync with non-gen6 version
13 years ago
b5f6482dce
Fixed small feedrate bug.
...
Copied Camiels comments in the Configuration.h file
14 years ago
0024a26ccf
Fixed lookup table bug.
14 years ago
5a1787b2f4
Fix M109
14 years ago
26bf57e22c
first-commit
14 years ago
f850af5c1c
Signed-off-by: Erik van der Zalm <erik@vdzalm.eu>
14 years ago
750f6c33e3
first commit
14 years ago
Erik van der Zalm