Commit graph

535 commits

Author SHA1 Message Date
kliment
012855c6d1 Merge pull request #129 from jschleic/patch-1
Improve Makefile to rebuild on upload
2012-01-27 03:17:43 -08:00
Joachim Schleicher
77c3dd85ec fix indentation
This should be a comment. Instead it is printed together with
the 'upload' target, when idented.
2012-01-27 12:15:38 +01:00
kliment
fa63b839c6 Merge pull request #128 from blddk/experimental
Reported wrong temperature in M190
2012-01-22 12:53:50 -08:00
blddk
908bc5314c Reported wrong temperature while heating up 2012-01-22 21:51:56 +01:00
kliment
4f59622219 Merge pull request #127 from blddk/experimental
Stepper enable delay and temperature table
Fix bed temp reading in M190
2012-01-22 10:50:56 -08:00
blddk
d8b6c5f233 Changed temperature table for bed, to the one for the bed, instead of for the heater. 2012-01-22 15:43:51 +01:00
blddk
eb7a192c94 Added option to set a delay after enabling a stepper driver, default turned off to keep current behavior. 2012-01-22 15:28:46 +01:00
blddk
e7fb583df9 Added option to set a delay after enabeling stepper driver, to allow the driver to enable (time needed according to datasheet) 2012-01-22 15:27:27 +01:00
Joachim Schleicher
591b4fa6d8 correct dependencies in Makefile
applet/$(TARGET).elf should depend on the cpp file, not on .pde
so that the cpp is rebuilt when pde changes. We drop the target
applet_files to achieve the correct behaviour.
Now 'make upload' does rebuild the hex file as well.
2012-01-20 15:36:05 +01:00
kliment
439f339f74 Merge pull request #125 from gdahlm/experimental
Fixes for Gen7 Support #2
2011-12-10 12:47:22 -08:00
kliment
a352585065 Merge pull request #126 from ERoth3/patch-1
Updated readme with a warning about Arduino V1.0 incompatibility.
2011-12-10 12:45:33 -08:00
ERoth3
0f55d49705 Updated readme with a warning about Arduino V1.0 incompatibility. 2011-12-10 15:43:02 -05:00
Greg Dahlman
49c5c65dcf Fix ifdef with missing # in Sprinter.pde and add 644 non P to the Gen 7 board in pins.h 2011-12-06 12:30:56 -08:00
Greg Dahlman
2c00d1580f Fixing issues in pins.h and fastio.h, I created them not understanding it was using arduino pin numbers
I also put in a note that Gen 7 only works at 16 MHZ due to timing issues with WProgram.h and wiring.h
2011-12-05 20:34:02 -08:00
Greg Dahlman
09d5247ba2 Merge remote-tracking branch 'upstream/experimental'
Conflicts:
	Sprinter/pins.h
2011-12-05 20:29:31 -08:00
kliment
2550e6c566 Merge pull request #123 from FrozenFire/master
Allow running a specifically-named file from SD on startup if found.
2011-12-05 01:48:36 -08:00
Nathan Zadoks
f201ccb55b Added an option to make init.g on SD run on boot. 2011-12-04 13:03:20 +01:00
Kliment Yanev
b331d48101 Add gen7 to list of boards in configuration
Allow ATmega644 (non-P version) for Gen7
2011-11-28 16:23:52 +01:00
Kliment Yanev
9090c6a460 Merge branch 'master' into experimental 2011-11-28 16:22:00 +01:00
Kliment Yanev
67199da509 Revert "Merge pull request #121 from Traumflug/master"
This reverts commit 11d3281a09, reversing
changes made to f8c17d3b46.
2011-11-28 16:10:48 +01:00
kliment
11d3281a09 Merge pull request #121 from Traumflug/master
Allow ATmega644 for Gen7
2011-11-28 07:05:20 -08:00
Markus Hitter
3bbfe733e7 pins.h: allow an ATmega644 (without P). 2011-11-28 16:02:58 +01:00
kliment
bb28b03aa2 Merge pull request #119 from pipakin/experimental
Block transfer
2011-11-16 07:22:49 -08:00
Philip Kin
fa1a0e7def M30/M31 fast sd block transfer 2011-11-16 09:17:33 -06:00
Philip Kin
d196068a8c M30/M31 fast sd block transfer 2011-11-16 09:16:14 -06:00
kliment
f8c17d3b46 Merge pull request #117 from sparr/patch-1
Mark Sanguinololu-specific steps in instructions.
2011-11-10 01:37:43 -08:00
sparr
f0e3ab1e22 spelling correction 2011-11-10 04:31:44 -05:00
sparr
98b8a45868 note Sanguino-specific steps 2011-11-10 04:25:13 -05:00
Kliment Yanev
514eec1fee Merge branch 'master' into experimental 2011-11-10 10:14:08 +01:00
Kliment Yanev
074acbe547 Improve 200k thermistor table to better match reality 2011-11-10 10:13:12 +01:00
kliment
6b882d0368 Merge pull request #116 from cdaringe/master
Experimental oscillation reduction
2011-11-06 22:33:32 -08:00
Chris Dieringer
f5c05d9439 osc reduction 2011-11-06 07:57:57 -08:00
kliment
24469eaf25 Merge pull request #114 from gdahlm/experimental
Add missing #endif in gen7 definition in pins.h
2011-11-04 01:15:01 -07:00
Greg Dahlman
318c7b4f64 Edited pins.h to add missing #endif 2011-11-03 23:32:57 -07:00
Greg Dahlman
4506c497a4 Added missing #endif to pins.h 2011-11-03 23:25:08 -07:00
kliment
b98a4653d5 Merge pull request #112 from gdahlm/experimental
Add Gen7 support
2011-11-03 01:04:04 -07:00
Greg Dahlman
105eedeffa Added Pin 33-40 digital defs to fastio.h for the 644 2011-11-02 18:13:37 -07:00
Greg Dahlman
fcce94653d Added support for Gen7 Board 2011-11-02 17:01:19 -07:00
Kliment Yanev
b7cf9b4ea3 Define default value for alarm pin 2011-10-29 23:57:36 +02:00
kliment
232b68baae Merge pull request #110 from barclayo/patch-1
Fix d calculation on XYZ moves where comparison was inside of abs() instead of comparing with the absolute value
2011-10-29 11:20:24 -07:00
barclayo
67b81e0881 Fix d calculation on XYZ moves where comparison was inside of abs() instead of comparing with the result. 2011-10-29 11:17:13 -07:00
kliment
038ab7803e Merge pull request #109 from Kerman/master
Moved footer in pins.h to end of file, fixing teensylu support
2011-10-28 12:19:45 -07:00
Joe Kerman
4a9ab499ed Moved pins.h footer to the end of the file, fixing teensylu support 2011-10-28 14:06:42 -05:00
kliment
d1fe94db18 Merge pull request #107 from k-eex/PID
Better default PID parameters
2011-10-27 15:45:34 -07:00
Keegi
7906660f77 PID parameters for MakerGear 2011-10-27 23:38:53 +03:00
kliment
02f659a09c Merge pull request #106 from kliment/experimental
Merge Experimental into master
2011-10-27 12:43:46 -07:00
Kliment Yanev
6752615aca Merge branch 'master' of github.com:kliment/Sprinter into experimental
Conflicts:
	Sprinter/Configuration.h
2011-10-27 21:42:02 +02:00
kliment
b784326f14 Merge pull request #104 from blddk/experimental
Cooling fan control for a stepper driver fan - enable fan when stepper drivers are active
2011-10-16 07:10:41 -07:00
blddk
f63468b747 Update Sprinter/Sprinter.pde 2011-10-16 16:31:56 +03:00
blddk
588109f098 Update Sprinter/Sprinter.pde 2011-10-16 16:29:59 +03:00