c00eefb824
Merge remote-tracking branch 'origin/Marlin_v1' into Marlin_v1
2011-11-14 18:26:57 +01:00
1d0452f10c
250000 baud
2011-11-14 18:24:02 +01:00
c57906b627
fixed bug with adjusting ki in realtime.
2011-11-13 21:43:26 +01:00
ac82411c73
Merge remote-tracking branch 'origin/Marlin_v1' into Marlin_v1
2011-11-13 20:46:44 +01:00
65934eee9c
A lot of changes in the planner code
2011-11-13 20:42:08 +01:00
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.
2011-11-13 19:58:09 +01:00
ff592b056a
heater power repair.
2011-11-13 00:48:55 +01:00
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 "@:"
2011-11-12 20:37:28 +01:00
36958ee305
minor changes and first not-well working version of autotemp
2011-11-09 22:09:16 +01:00
ba8a53a40f
Streaming.h is gone. It conflicted with PROGMEM. And saving memory is more important than nicer code, imho
2011-11-09 20:30:41 +01:00
27361e7cd0
beautified the config. ordered it into thematic sections.
2011-11-09 20:28:40 +01:00
ab154d5592
project progmem finished: total change with ultipanel: 2456 byte free ram initial. now: 4374 ram.
2011-11-09 20:27:44 +01:00
7b70caab7c
made progmem mainly, found one bug in cardreader, added a empty class for cardreader in case no sd support.
2011-11-07 22:33:13 +01:00
72ace55e6a
better visibility of public/private/imported variables
2011-11-06 23:34:40 +01:00
977fd2b2c7
Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into Marlin_v1
2011-11-06 23:21:33 +01:00
907daa49af
made loop counters uint8_t most were int(16_t) before
2011-11-06 23:21:12 +01:00
e3af73ee0c
Thermistor name problem
2011-11-06 23:20:01 +01:00
0b43761c3a
preprocessor magic to have a single source principle
2011-11-06 23:13:19 +01:00
156763d027
Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into Marlin_v1
2011-11-06 22:48:36 +01:00
fc0064e525
made cardreader more selfsustained
2011-11-06 22:48:15 +01:00
d3bfffcb6e
Corrected thermistor naming
2011-11-06 22:37:43 +01:00
01df04e02c
first compile with the cardreader class
2011-11-06 21:39:53 +01:00
163efdf1c7
Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into Marlin_v1
2011-11-06 19:49:04 +01:00
87aaf0f70a
static'ified Marlin.pde.
2011-11-06 19:48:37 +01:00
5cf349a24a
Fixed some arc bugs
2011-11-06 19:37:12 +01:00
79d1bfb5c0
made many possible variables static, so they cannot be used extern.
2011-11-06 19:36:29 +01:00
76b3f805c0
Added teensylu pins
2011-11-06 19:30:04 +01:00
1d171e9e52
reformating and some minor bugs/things found on the way.
2011-11-06 19:23:08 +01:00
900e0c9bf2
overworked the serial responses. Quite difficult, since many texts are Pronterface protocol.
2011-11-06 17:33:09 +01:00
1740a83e11
correcting commit errors.
2011-11-06 15:10:29 +01:00
7cc358b56b
wrong file location
2011-11-06 14:58:12 +01:00
e8092898b1
watchdog into dedicated file
2011-11-06 14:22:15 +01:00
2afb7bd4cf
refactured temperature.cpp so that there are now abstract functions to access temperatures.
2011-11-06 14:03:41 +01:00
0b82465168
First arcs version. (Arcs not working ok)
2011-11-06 12:39:00 +01:00
2e8e8878e5
Corrected temp variables.
2011-11-05 20:21:09 +01:00
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
2011-11-05 20:03:38 +01:00
d15f01e1b4
Temperature changes
2011-11-05 19:21:36 +01:00
ea86a5e10f
moved the variables in the ISR, thats the most normal use case of static.
2011-11-05 16:53:37 +01:00
b9ea0651ec
Revert "this is not working. Do you maybe know why?"
...
This reverts commit 8bcdb9f5f0
2011-11-05 16:49:29 +01:00
8bcdb9f5f0
this is not working. Do you maybe know why?
2011-11-05 16:43:44 +01:00
40e8081623
changed end of line to windows, which seems to be the majority of developers main platform.
2011-11-05 14:19:57 +01:00
00674af3a8
merge from the branch bkubicek/Marlin/zalmmerge
2011-11-05 14:13:20 +01:00
d7c4f0780b
Added M42, M80 and M81
2011-11-05 11:18:52 +01:00
95d3d9847c
M109 now equal to sprinter
2011-11-04 23:38:25 +01:00
bf879ceaa9
Added thermistor tables
2011-11-04 22:51:14 +01:00
094afe7c10
Merged Marlin, Marlin non gen6 and Ultimaker changes
2011-11-04 18:02:56 +01:00
0b1423c303
Fixed crashes.
2011-10-18 19:13:30 +02:00
27664c6da6
Software endstps added
2011-09-15 17:37:58 +02:00
b099fe142c
Merge branch 'master' of github.com:ErikZalm/Marlin
2011-09-14 18:57:32 +02:00
8e017b81ab
Sync with non-gen6 version
2011-09-14 18:56:45 +02:00
Erik van der Zalm