a95dcd74e7Fix some of the duplicated PSTRs, saving 500bytes of flash with LCD on.
daid303
2012-12-17 11:09:09 +01:00
ab318beaafMerge pull request #348 from oni303/Marlin_v1
daid
2012-12-17 02:08:28 -08:00
8caf5d252dRemove bogus blank line.
Johann Rocholl
2012-12-16 12:50:20 -08:00
1c2ecddae4Fix typo (# missing before define).
Johann Rocholl
2012-12-16 12:33:44 -08:00
6dfb8a2187Fix home_all_axis to make QUICK_HOME work with Repetier-Host which sends G28 X0 Y0 Z0 instead of G28. Thanks to Matt Schoenholz for reporting this issue.
Johann Rocholl
2012-12-16 12:30:33 -08:00
3b2e5027e5Merged updates from Marlin_v1.
Johann Rocholl
2012-12-16 12:19:24 -08:00
b39f5d614aFor boards with only one endstop per axis, automatically set *_MIN_PIN and *_MAX_PIN according to *_HOME_DIR.
Johann Rocholl
2012-12-16 12:08:55 -08:00
ab09fa4bbffixed pwm generation at pin D12 and D13 when one of them is used as FAN_PIN on Sanguino, added soft pwm entry for FAN_PIN in temperature.cpp
oni303
2012-12-16 01:36:57 +01:00
83ea7dc5b9Merge pull request #342 from setar/Marlin_v1
daid
2012-12-14 05:04:41 -08:00
5697451c72fix lcd class
Sergey Taranenko
2012-12-14 15:39:47 +04:00
58e806f3faFix the russial translation.
Sergey Taranenko
2012-12-14 15:39:26 +04:00
1a8f54cea1The big LCD code update. This splits the display and menu implementation. Paving the way for future different displays. It also makes it easier to modify the menu structures while keeping everything consistant. Note that this most likely breaks the translations, which need to be updated.
daid303
2012-12-12 11:47:03 +01:00
6731c094eeFix compiling with just an 16x2 LCD and no buttons.
daid303
2012-12-12 11:32:33 +01:00
b99a928a80Fix the M117 (display message on LCD) when used over USB with checksums.
daid303
2012-12-12 09:35:32 +01:00
55ba90ac19Add PID functional range setting. With high powered heaters the current functional range of 10 degrees causes high overshoots as the PID needs to kick in before the temperature hits 10 degrees below target.
daid303
2012-12-12 09:08:37 +01:00
5ff5cee8ceFix the sensitive pin definitions, there where analogue numbers in the digital pin list. Also made M42 without a P function on the LED_PIN (which was otherwise a useless pin definition)
daid303
2012-12-11 14:53:53 +01:00
8b58edc70eMerge branch 'Marlin_v1' of github.com:ErikZalm/Marlin into Marlin_v1
daid303
2012-12-11 13:38:34 +01:00
d0319d45afMerge pull request #335 from jcrocholl/Marlin_v1
daid
2012-12-11 02:59:58 -08:00
ca409e5531Fix X/Y/Z_MIN_PIN for Printrboard.
Johann Rocholl
2012-12-11 01:59:48 -08:00
1f45cb0a51Fix typo in MANUAL_HOME_POSITION (plural S missing) and improve comments.
Johann Rocholl
2012-12-11 01:54:40 -08:00
931a0052eaFix typo in MANUAL_HOME_POSITION (plural S missing) and reduce BLOCK_BUFFER_SIZE because 64 wasn't working for some reason.
Johann Rocholl
2012-12-11 01:22:04 -08:00
46ec4b648cAdded some missing Mxxx comments to M commands. Fixed the unsetting of the timer dividers for the fast PWM fan.
daid303
2012-12-11 10:21:44 +01:00
724f5aa36bUpdate on makefile for moved Arduino addons.
Daid
2012-12-10 12:06:30 +01:00
6d9dfa96c3Move the Arduino related stuff out of the Marlin tree, as they are not directly related to Marlin functionality but addons for the Arduino IDE. Also split up the addons for pre 1.0.0 Arduino and post 1.0.0 Arduino.
daid303
2012-12-10 12:02:29 +01:00
3fb07d9b8dAdd MINTEMP/MAXTEMP error to LCD, and fix temperature bug with more then 1 extruder.
daid303
2012-12-10 10:48:46 +01:00
8e2519e88bAdd realtime delta geometry in Marlin_main.cpp.
Johann Rocholl
2012-12-10 01:04:12 -08:00
cec7283b21Enable QUICK_HOME for deltabot.
Johann Rocholl
2012-12-10 00:43:47 -08:00
2292441f0cUse X/Y/Z_MAX_PIN instead of X/Y/Z_MIN_PIN for top endstops on deltabot.
Johann Rocholl
2012-12-10 00:43:14 -08:00
c430906d3bDeltabot settings and configuration adjustments.
Johann Rocholl
2012-12-10 00:10:56 -08:00
82c8724b33Fix compile with PID_DEBUG
daid303
2012-12-09 23:50:12 +01:00
9b160972a1Merge branch 'Marlin_v1' of github.com:ErikZalm/Marlin into Marlin_v1
daid303
2012-12-09 23:46:42 +01:00
e036750bdfUse the disable macros on initialization. Which fixes a bug when there is no pin defined for stepper enabled (motherboard 4)
daid303
2012-12-09 23:46:25 +01:00
fcd9de72efMerge branch 'Marlin_v1' of github.com:ErikZalm/Marlin into Marlin_v1
Daid
2012-12-09 23:31:07 +01:00
32d4373e0fAdd printrboard and brainwave to Makefile.
Daid
2012-12-09 23:30:55 +01:00
b3ddbcee2aMerge pull request #329 from jcrocholl/Marlin_v1
daid
2012-12-09 14:29:26 -08:00
29435dfb4bProper avr for Sanguino in Makefile.
Daid
2012-12-09 23:02:03 +01:00
52158dffccBig temperature code update. No longer converts back and forwards between temperature and raw sample value. Reducing complexity, removing code. Also named some variables better. While keeping the safety intact and functionality the same.
daid303
2012-12-09 23:00:06 +01:00
ca7acbe6d9Allow specification of which arduino hardware subvariant in Makefile.
Daid
2012-12-09 19:19:57 +01:00
33247733e0Teensylu and Printrboard use different analog pins for thermistors.
Johann Rocholl
2012-12-09 02:19:13 -08:00
621c24a10fAT90USB is only defined after pins.h is included.
Johann Rocholl
2012-12-09 01:40:33 -08:00
6cba11f087Stop redefining MOTHERBOARD and #define AT90USB instead. Also put #ifndef AT90USB around the HardwareSerial_h trick, so now Printrboard / Brainwave support compiles on Arduino 1.0.2 as well.
Johann Rocholl
2012-12-09 01:32:09 -08:00
4d351b4846Improved formatting and comments for consistency.
Johann Rocholl
2012-12-08 20:15:53 -08:00
a30007caa4If fastio.h is not messed up then Teensylu and Printrboard are actually using the same pins.
Johann Rocholl
2012-12-08 19:46:42 -08:00
6aa87a7b67Use the same fastio.h definition for AT90USB1286/7 and AT90USB646/7.
Johann Rocholl
2012-12-08 15:16:38 -08:00
b1c38d4c82Avoid compiler warnings (redefined MOTHERBOARD) in Arduino 1.0 and greater.
Johann Rocholl
2012-12-08 11:34:18 -08:00
ce4b5bbeaaAdd AT90USB646 support from Sprinter to fastio.h.
Johann Rocholl
2012-12-08 10:45:58 -08:00
f413aa33b3Small makefile change, posibility to add defines on the commandline, and fix compiling with watchdog enabled when using the Makefile.
Daid
2012-12-08 11:49:53 +01:00
587154c01bFix the WATCHPERIOD implementation. It did not work correctly in a multi extruder setup, it did not work after 32 seconds after startup (int16 used as millies timestamp). And it did not work if you gave an M104 or M109 when the target was already around the target setpoint. So on average, it did not work at all. The new implementation should be robust in detecting a failure to heat up.
daid303
2012-12-06 10:36:07 +01:00
1f27870d41Fix compiling the watchdog error message when the manual reset watchdog is used.
daid303
2012-12-06 10:27:50 +01:00
c5d4225804Mistake there, not sure why I did that. My bad.
daid303
2012-12-05 20:23:13 +01:00
529748894cMinor changes in the temperature code for some cleanup.
daid303
2012-12-05 19:54:01 +01:00
4e26ecc940The Partial release message (which does not really tell you anything) overwrites the final print time on the LCD, which is a real shame. So I removed the message.
daid303
2012-12-05 19:32:26 +01:00
c421774422The Partial release message (which does not really tell you anything) overwrites the final print time on the LCD, which is a real shame. So I removed the message.
daid303
2012-12-05 19:32:02 +01:00
6a9bee27ccChanged the naming of some LCD functions, so the names match better what the function does. Also moved around some prototypes for general cleanup.
daid303
2012-12-03 12:52:00 +01:00
94ea26ff46Some minor changes on code style. And a bugfix where the counters for positioning in the stepper where wrong depending on compiler settings. (Caused strange values to reported back with M114 and endstop triggers). Also fixed compiling with FWRETRACT enabled.
daid303
2012-12-03 12:13:20 +01:00
6c51fe5039Fix the bug where the SD percentage calculation is wrong when the file is larger then 42MB
daid303
2012-12-03 11:35:36 +01:00
34b2de4cd8Merge pull request #320 from brupje/patch-1
daid
2012-12-01 01:02:32 -08:00
57429cb9feFix for keypad
brupje
2012-11-29 21:42:19 +01:00
97fa2a9c30Few simple fixes that save RAM, as static strings are stored in RAM by default.
daid303
2012-11-28 10:30:34 +01:00
99e9554eddSome fixes in the Makefile to support Arduino 1.0.0 or higher and added the Rambo. Still needs some more work for the different arduino hardware variants.
Daid
2012-11-24 11:46:31 +01:00
dbbf050005More rambo fixes
Erik vd Zalm
2012-11-21 20:53:56 +01:00
f934d0ef5bMerge remote-tracking branch 'tonokip/Marlin_v1' into Marlin_v1
Erik vd Zalm
2012-11-21 20:36:30 +01:00
e48dfcc2b3Tmp copy before merge
Erik vd Zalm
2012-11-21 20:29:31 +01:00
b98fb17fe9Small FREQUENCY_LIMIT changes
Erik vd Zalm
2012-11-21 20:17:44 +01:00
bce67ec2c9Merge pull request #312 from gege2b/Marlin_v1
daid
2012-11-18 13:43:07 -08:00
9b1d2483a0I hope last changes to french translation
Gege
2012-11-18 22:34:56 +01:00
b1adc567daCorrection to french translation (non-ASCII chars only)
Gege
2012-11-18 20:00:41 +01:00
0807d82af0Correction to french translation (plain text only)
Gege
2012-11-18 19:39:56 +01:00
5cd7a90b32Added new temperature lookup table creation tool. This one uses stein hart-hart equations. You need 3 temperature resistance:combinations. This gives a better result then using beta.
Erik vd Zalm
2012-11-16 23:51:05 +01:00
bb119739b0Added french translation
gege2b
2012-11-16 18:38:50 +01:00
df8dd5ac21Merge pull request #306 from nothinman/Marlin_v1
daid
2012-11-14 01:59:33 -08:00
b7c8e5bbcfMerge pull request #308 from MStohn/Marlin_v1
daid
2012-11-13 05:53:58 -08:00
6a55ca8370Added Polish translation. Cosmetic changes to English.
Martin Lukasik
2012-11-12 15:54:07 +00:00
8f20562f49Fix some of the crowded code style. And fixed the conditional. #300
daid303
2012-11-12 15:49:40 +01:00
43018a48c4Fix for a few -Wextra warnings.
daid303
2012-11-12 15:35:28 +01:00
72586eb30aSolved few warnings.
daid303
2012-11-12 09:29:12 +01:00
7a02ba361cHeader multiple include protection should match the filename, not just _ARDUINO_H, which is almost bound to go wrong some day.
daid303
2012-11-12 09:24:28 +01:00