bissen21/Marlin_Firmware
1
0
Fork 0
Code Issues Pull Requests Projects Releases 4 Wiki Activity
9,788 Commits 1 Branch 4 Tags 151 MiB
532bb3aaa1
Commit Graph

8110 Commits

Author SHA1 Message Date
Bernhard
71ca78982b Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into Marlin_v1 2011-11-25 22:14:36 +01:00
Bernhard
235051253a overworked lcd+eeprom to have only mm/sec and PID including pid_dt 2011-11-25 22:14:29 +01:00
Erik van der Zalm
27654bfe69 Fixed variable (removed 0x) 2011-11-25 22:10:06 +01:00
Erik van der Zalm
cdf0bd4e63 Fixed config bug when EEPROM was disabled 2011-11-25 20:07:30 +01:00
Erik van der Zalm
6ac9b2e761 Fixed residency time bug. (Thanks to Sound :-) ) 2011-11-25 19:34:36 +01:00
Erik van der Zalm
ac8adabb2b Small nominal speed improvement. 2011-11-25 15:32:50 +01:00
Erik van der Zalm
0e0e4945d8 Removed ISR overtaken message from ISR routine 2011-11-25 13:59:58 +01:00
Erik van der Zalm
c0f8c9fd72 Seperate ENDSTOP_INVERTING for X Y and Z 
Added simple endstop filter.
Corrected M114 count display.
 2011-11-25 13:43:06 +01:00
Bernhard Kubicek
5535e51bf6 Yes, thats the beta. 2011-11-20 17:04:57 +01:00
Bernhard Kubicek
8b14a8ad34 Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into Marlin_v1 2011-11-20 16:39:39 +01:00
Bernhard Kubicek
924bab1a03 less lcd flickering 2011-11-20 16:37:01 +01:00
Bernhard Kubicek
379ea642e1 make tuneing sub-menu. 2011-11-20 16:05:42 +01:00
Erik van der Zalm
959d82e81e Small temperature disable bug. 2011-11-20 15:03:35 +01:00
Erik van der Zalm
15bb3f284e Merge branch 'Marlin_v1', remote-tracking branch 'origin/Marlin_v1' into Marlin_v1 2011-11-20 14:51:40 +01:00
Erik van der Zalm
4e5becfc51 Added endstop reporting 2011-11-20 14:50:08 +01:00
Bernhard Kubicek
eeb4f029db Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into Marlin_v1 2011-11-20 14:45:38 +01:00
Bernhard Kubicek
b21d5193f2 made ultralcd compatible with folders. 2011-11-20 14:43:47 +01:00
Erik van der Zalm
2e43f9c809 Changed min max temperature code. 2011-11-20 13:14:58 +01:00
Bernhard Kubicek
cd2268f10a code cleanup in ultralcd. 2011-11-20 11:55:33 +01:00
Erik van der Zalm
0e7fee9a9b Merge branch 'Marlin_v1', remote-tracking branch 'origin/Marlin_v1' into Marlin_v1 2011-11-19 21:33:15 +01:00
Erik van der Zalm
915ef2d4a1 Added software endstops 2011-11-19 21:32:47 +01:00
Bernhard Kubicek
e87df99e22 update mcode documentation 2011-11-19 21:01:07 +01:00
Bernhard Kubicek
8a1e719a3f overworked config file 2011-11-19 20:52:43 +01:00
Bernhard Kubicek
5ad1d19384 make it compile without sd_support 2011-11-19 20:18:54 +01:00
Bernhard Kubicek
7a2d1f5aeb add M17, so the enable stepper button works in repg. 2011-11-19 18:22:22 +01:00
Erik van der Zalm
e02af3e66a Merge remote-tracking branch 'origin/Marlin_v1' into Marlin_v1 2011-11-19 17:23:47 +01:00
Erik van der Zalm
537b5c155d Fixed arc flowrate. 2011-11-19 17:23:28 +01:00
Bernhard Kubicek
953d830bba Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into Marlin_v1 2011-11-19 17:09:43 +01:00
Bernhard Kubicek
2a6afee832 make it compile without autotemp 2011-11-19 17:09:33 +01:00
Bernhard Kubicek
f52e1a9571 autotemp working, default=disabled. 2011-11-19 17:07:44 +01:00
Erik van der Zalm
6e6fdb9a4e Merge remote-tracking branch 'origin/Marlin_v1' into Marlin_v1 2011-11-19 16:18:13 +01:00
Erik van der Zalm
6841a10446 Fixed max/min temperature bug 2011-11-19 16:16:26 +01:00
Bernhard Kubicek
8a08b8e07e trying to get autotemp to work. 2011-11-19 15:37:10 +01:00
Bernhard Kubicek
f0154de5b3 found bug that disabled printing from root. 2011-11-19 15:36:49 +01:00
Bernhard Kubicek
70650c331d corrected the ultimaker default values, the previous had a calculation error: see: http://groups.google.com/group/ultimaker/browse_thread/thread/91906788639703cf 2011-11-19 14:50:31 +01:00
Bernhard Kubicek
9d90220537 Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into Marlin_v1 2011-11-19 14:35:53 +01:00
Bernhard Kubicek
869cee74e6 host-based sd card printing seems now to work with folders 2011-11-19 14:34:27 +01:00
Bernhard Kubicek
70abca195a overworked cardreader for folder support; not finished yet. 2011-11-19 13:13:34 +01:00
Erik van der Zalm
ff69e0a772 Changed max/min temp init. Removed second uart from sabguino core 2011-11-19 12:19:53 +01:00
Bernhard Kubicek
1e5e141ac9 Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into Marlin_v1 2011-11-18 22:22:23 +01:00
Bernhard Kubicek
edb5ea7efa the normal config again.. 2011-11-18 22:22:07 +01:00
Bernhard Kubicek
5df5727e93 removed some debugging comments 2011-11-18 22:20:53 +01:00
Bernhard Kubicek
64f2121ab1 updated to sdfatlib2010902 2011-11-18 22:17:37 +01:00
Erik van der Zalm
b15902d3b5 Fixed bug in configuration.h 2011-11-18 19:46:16 +01:00
Erik van der Zalm
e63e224a33 Merge remote-tracking branch 'origin/Marlin_v1' into Marlin_v1 
Conflicts:
	Marlin/Configuration.h
	Marlin/Marlin.pde
 2011-11-18 19:04:09 +01:00
Erik van der Zalm
e7dca8614b Advance experiments. Not working yet. 2011-11-18 18:59:17 +01:00
Bernhard Kubicek
46f80e82d9 Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into Marlin_v1 
Conflicts:
	Marlin/ultralcd.h
 2011-11-15 22:53:04 +01:00
Bernhard Kubicek
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
 2011-11-15 22:50:43 +01:00
Bernhard Kubicek
02b9eceead show sd% 2011-11-15 20:55:00 +01:00
Bernhard Kubicek
7919a40d06 watchdog,percent done, 2011-11-15 20:54:40 +01:00
Erik van der Zalm
805d37f77b Fixed some small planner bugs 2011-11-15 18:14:00 +01:00
Erik van der Zalm
5fd41ae872 Some fixes in planner 2011-11-14 23:57:34 +01:00
Erik van der Zalm
95126c09c0 Added slowdown 2011-11-14 20:04:29 +01:00
Erik van der Zalm
331e82dcd3 Buffer size > 16 2011-11-14 18:53:09 +01:00
Erik van der Zalm
2643ae93d6 Added modified Sanguino files 2011-11-14 18:27:47 +01:00
Erik van der Zalm
c00eefb824 Merge remote-tracking branch 'origin/Marlin_v1' into Marlin_v1 2011-11-14 18:26:57 +01:00
Erik van der Zalm
1d0452f10c 250000 baud 2011-11-14 18:24:02 +01:00
Bernhard Kubicek
c57906b627 fixed bug with adjusting ki in realtime. 2011-11-13 21:43:26 +01:00
Erik van der Zalm
ac82411c73 Merge remote-tracking branch 'origin/Marlin_v1' into Marlin_v1 2011-11-13 20:46:44 +01:00
Erik van der Zalm
65934eee9c A lot of changes in the planner code 2011-11-13 20:42:08 +01:00
Bernhard Kubicek
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
Bernhard Kubicek
ff592b056a heater power repair. 2011-11-13 00:48:55 +01:00
Bernhard Kubicek
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
Bernhard Kubicek
36958ee305 minor changes and first not-well working version of autotemp 2011-11-09 22:09:16 +01:00
Bernhard Kubicek
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
Bernhard Kubicek
27361e7cd0 beautified the config. ordered it into thematic sections. 2011-11-09 20:28:40 +01:00
Bernhard Kubicek
ab154d5592 project progmem finished: total change with ultipanel: 2456 byte free ram initial. now: 4374 ram. 2011-11-09 20:27:44 +01:00
Bernhard Kubicek
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
Bernhard Kubicek
72ace55e6a better visibility of public/private/imported variables 2011-11-06 23:34:40 +01:00
Bernhard Kubicek
977fd2b2c7 Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into Marlin_v1 2011-11-06 23:21:33 +01:00
Bernhard Kubicek
907daa49af made loop counters uint8_t most were int(16_t) before 2011-11-06 23:21:12 +01:00
Erik van der Zalm
e3af73ee0c Thermistor name problem 2011-11-06 23:20:01 +01:00
Bernhard Kubicek
0b43761c3a preprocessor magic to have a single source principle 2011-11-06 23:13:19 +01:00
Bernhard Kubicek
156763d027 Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into Marlin_v1 2011-11-06 22:48:36 +01:00
Bernhard Kubicek
fc0064e525 made cardreader more selfsustained 2011-11-06 22:48:15 +01:00
Erik van der Zalm
d3bfffcb6e Corrected thermistor naming 2011-11-06 22:37:43 +01:00
Bernhard Kubicek
01df04e02c first compile with the cardreader class 2011-11-06 21:39:53 +01:00
Bernhard Kubicek
163efdf1c7 Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into Marlin_v1 2011-11-06 19:49:04 +01:00
Bernhard Kubicek
87aaf0f70a static'ified Marlin.pde. 2011-11-06 19:48:37 +01:00
Erik van der Zalm
5cf349a24a Fixed some arc bugs 2011-11-06 19:37:12 +01:00
Bernhard Kubicek
79d1bfb5c0 made many possible variables static, so they cannot be used extern. 2011-11-06 19:36:29 +01:00
Erik van der Zalm
76b3f805c0 Added teensylu pins 2011-11-06 19:30:04 +01:00
Bernhard Kubicek
1d171e9e52 reformating and some minor bugs/things found on the way. 2011-11-06 19:23:08 +01:00
Bernhard Kubicek
900e0c9bf2 overworked the serial responses. Quite difficult, since many texts are Pronterface protocol. 2011-11-06 17:33:09 +01:00
Bernhard Kubicek
1740a83e11 correcting commit errors. 2011-11-06 15:10:29 +01:00
Bernhard Kubicek
7cc358b56b wrong file location 2011-11-06 14:58:12 +01:00
Bernhard Kubicek
e8092898b1 watchdog into dedicated file 2011-11-06 14:22:15 +01:00
Bernhard Kubicek
2afb7bd4cf refactured temperature.cpp so that there are now abstract functions to access temperatures. 2011-11-06 14:03:41 +01:00
Erik van der Zalm
0b82465168 First arcs version. (Arcs not working ok) 2011-11-06 12:39:00 +01:00
Erik van der Zalm
2e8e8878e5 Corrected temp variables. 2011-11-05 20:21:09 +01:00
Erik van der Zalm
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
Erik van der Zalm
d15f01e1b4 Temperature changes 2011-11-05 19:21:36 +01:00
Bernhard Kubicek
ea86a5e10f moved the variables in the ISR, thats the most normal use case of static. 2011-11-05 16:53:37 +01:00
Bernhard Kubicek
b9ea0651ec Revert "this is not working. Do you maybe know why?" 
This reverts commit 8bcdb9f5f0.
 2011-11-05 16:49:29 +01:00
Bernhard Kubicek
8bcdb9f5f0 this is not working. Do you maybe know why? 2011-11-05 16:43:44 +01:00
Bernhard Kubicek
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
Bernhard Kubicek
00674af3a8 merge from the branch bkubicek/Marlin/zalmmerge 2011-11-05 14:13:20 +01:00
Erik van der Zalm
d7c4f0780b Added M42, M80 and M81 2011-11-05 11:18:52 +01:00
Erik van der Zalm
95d3d9847c M109 now equal to sprinter 2011-11-04 23:38:25 +01:00
Erik van der Zalm
bf879ceaa9 Added thermistor tables 2011-11-04 22:51:14 +01:00
Erik van der Zalm
094afe7c10 Merged Marlin, Marlin non gen6 and Ultimaker changes 2011-11-04 18:02:56 +01:00
Erik van der Zalm
0b1423c303 Fixed crashes. 2011-10-18 19:13:30 +02:00
Erik van der Zalm
27664c6da6 Software endstps added 2011-09-15 17:37:58 +02:00
Erik van der Zalm
8e017b81ab Sync with non-gen6 version 2011-09-14 18:56:45 +02:00
Erik van der Zalm
b5f6482dce Fixed small feedrate bug. 
Copied Camiels comments in the Configuration.h file
 2011-08-21 18:29:47 +02:00
Erik van der Zalm
0024a26ccf Fixed lookup table bug. 2011-08-15 19:26:40 +02:00
Erik van der Zalm
5a1787b2f4 Fix M109 2011-08-14 22:15:33 +02:00
Erik van der Zalm
26bf57e22c first-commit 2011-08-13 10:09:54 +02:00
Erik van der Zalm
f850af5c1c Signed-off-by: Erik van der Zalm <erik@vdzalm.eu> 2011-08-12 22:31:59 +02:00
Erik van der Zalm
750f6c33e3 first commit 2011-08-12 22:28:35 +02:00