daid303
442ade15a6
Move Gen6 stuff into a proper location.
2013-01-08 12:31:28 +01:00
daid
5fd4582cc8
Merge pull request #242 from Drakelive/Marlin_v1
...
Fixes issues # 216 and # 135 for Gen6 and Gen6 Deluxe board
2013-01-08 03:29:20 -08:00
daid303
8b88e3b386
Fixed #345 , Fixed #267 .
2013-01-08 12:14:55 +01:00
daid
27843388c6
Merge pull request #360 from njprossi/Marlin_v1
...
Power signal control definitions for other power supplies
2013-01-08 02:58:02 -08:00
daid303
921273baa0
Added optional feature to stop printing when an endstop is hit. Made the Z display on the LCD in 3.2 format instead of 3.1. Added LCD message when and endstop is hit.
2013-01-08 11:53:18 +01:00
Yuri Valentini
7d20ec706e
Added libraries from Arduino 1.0.3 for sanguino build
2013-01-07 17:26:50 +01:00
Nicolas Rossi
437eb3bafc
Initialize PS_ON at startup
2013-01-07 14:57:51 +01:00
Nicolas Rossi
f3c1fc70a9
Power signal control definitions for ATX and others
2013-01-07 14:33:30 +01:00
Yuri Valentini
dad7691df9
makefile for sanguino standalone compilation
2013-01-07 11:08:10 +01:00
Daniele Sdei
5f82f03ff3
Add italian MSG_RESUMING.
2012-12-28 11:44:35 +01:00
daid303
5e3873c8db
Add german MSG_RESUMING.
2012-12-25 20:53:11 +01:00
daid303
01aac2a142
Small changes on the LCD panel, let the speed control work better, line up the parameter edit the same as the menu, remove some unused defines, and remove the Z from the 10mm move menu.
2012-12-21 16:14:47 +01:00
daid303
b69cb9fbd9
Change the end of SD cart print message from minutes/seconds to hours/minutes.
2012-12-19 12:26:40 +01:00
daid
30254e3388
Merge pull request #350 from jcrocholl/Marlin_v1
...
Automatically set *_MIN_PIN and *_MAX_PIN according to *_HOME_DIR.
2012-12-17 02:16:31 -08:00
daid303
38ee395ac7
Replace the 1ms delay for 2 nops to get a 100ns delay. #259
2012-12-17 11:12:11 +01:00
daid303
5df5e4c4a2
Merge branch 'Marlin_v1' of github.com:ErikZalm/Marlin into Marlin_v1
2012-12-17 11:09:18 +01:00
daid303
a95dcd74e7
Fix some of the duplicated PSTRs, saving 500bytes of flash with LCD on.
2012-12-17 11:09:09 +01:00
Johann Rocholl
8caf5d252d
Remove bogus blank line.
2012-12-16 12:50:20 -08:00
Johann Rocholl
b39f5d614a
For boards with only one endstop per axis, automatically set *_MIN_PIN and *_MAX_PIN according to *_HOME_DIR.
2012-12-16 12:09:53 -08:00
oni303
ab09fa4bbf
fixed 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
2012-12-16 01:36:57 +01:00
Sergey Taranenko
5697451c72
fix lcd class
2012-12-14 15:39:47 +04:00
Sergey Taranenko
58e806f3fa
Fix the russial translation.
2012-12-14 15:39:26 +04:00
Sergey Taranenko
50a5ce1dc4
deduplicate messages
2012-12-14 15:37:05 +04:00
daid303
6123a00e64
Fix the german translation.
2012-12-14 11:11:02 +01:00
daid303
7c21716886
Fixed #341
2012-12-14 10:53:11 +01:00
daid303
ae1bc83350
Merge branch 'Marlin_v1' of github.com:ErikZalm/Marlin into Marlin_v1
2012-12-13 13:25:22 +01:00
daid303
596a7e1904
Fix compiling for Arduin < 1.0.0
2012-12-13 13:24:55 +01:00
Daid
b264317fa0
Reverted the patch by KevinOConnor, as it crashes some versions of avr-gcc and caused linking issues.
2012-12-13 12:19:12 +01:00
Daid
673577a31b
Merge branch 'Marlin_v1' of github.com:ErikZalm/Marlin into Marlin_v1
2012-12-13 11:41:34 +01:00
Daid
23022f1a82
Updates to Makefile to compile for Teensy.
2012-12-13 11:41:27 +01:00
daid
96e9db8919
Merge pull request #339 from KevinOConnor/CompilerFlags
...
Add additional optimization flags to Makefile
2012-12-13 01:30:17 -08:00
daid303
08356361ac
Fixing a problem with heated beds not working without PID and BED_LIMIT_SWITCHING
2012-12-13 10:25:29 +01:00
daid303
047d037f8c
#ifdef fix for #326
2012-12-13 09:04:41 +01:00
Kevin O'Connor
0908458381
Use gcc "-fwhole-program" optimization.
...
Use "whole program" and "link time optimization" features of gcc. The
whole-program optimization enables the compiler to evaluate the entire
firmware for optimization instead of just one code file at a time.
This leads to better overall optimizations.
2012-12-12 23:22:35 -05:00
Kevin O'Connor
16fbb455ef
Use linker "--relax" option.
...
The "relax" option enables the linker to convert certain "call"
instructions to the smaller "rcall" instruction. This reduces the
size of the resulting binary.
2012-12-12 23:22:31 -05:00
daid303
f30b46b2a8
One more fix for #338 , I really should get a heated bed to test with.
2012-12-12 23:06:17 +01:00
daid303
65c3f1ffcd
Most likely fixing #338
2012-12-12 21:56:17 +01:00
daid303
7577717b59
Fixed #336
2012-12-12 13:08:26 +01:00
daid303
1a8f54cea1
The 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.
2012-12-12 11:47:03 +01:00
daid303
6731c094ee
Fix compiling with just an 16x2 LCD and no buttons.
2012-12-12 11:32:33 +01:00
daid303
b99a928a80
Fix the M117 (display message on LCD) when used over USB with checksums.
2012-12-12 09:35:32 +01:00
daid303
55ba90ac19
Add 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.
2012-12-12 09:08:37 +01:00
daid303
5ff5cee8ce
Fix 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)
2012-12-11 14:53:53 +01:00
daid303
8b58edc70e
Merge branch 'Marlin_v1' of github.com:ErikZalm/Marlin into Marlin_v1
2012-12-11 13:38:34 +01:00
daid
d0319d45af
Merge pull request #335 from jcrocholl/Marlin_v1
...
Fix endstop pins for Printrboard
2012-12-11 02:59:58 -08:00
Johann Rocholl
ca409e5531
Fix X/Y/Z_MIN_PIN for Printrboard.
2012-12-11 01:59:48 -08:00
Johann Rocholl
1f45cb0a51
Fix typo in MANUAL_HOME_POSITION (plural S missing) and improve comments.
2012-12-11 01:54:40 -08:00
daid303
46ec4b648c
Added some missing Mxxx comments to M commands. Fixed the unsetting of the timer dividers for the fast PWM fan.
2012-12-11 10:21:44 +01:00
Daid
724f5aa36b
Update on makefile for moved Arduino addons.
2012-12-10 12:06:30 +01:00
daid303
6d9dfa96c3
Move 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.
2012-12-10 12:02:29 +01:00
daid303
3fb07d9b8d
Add MINTEMP/MAXTEMP error to LCD, and fix temperature bug with more then 1 extruder.
2012-12-10 10:48:46 +01:00
daid303
82c8724b33
Fix compile with PID_DEBUG
2012-12-09 23:50:12 +01:00
daid303
9b160972a1
Merge branch 'Marlin_v1' of github.com:ErikZalm/Marlin into Marlin_v1
2012-12-09 23:46:42 +01:00
daid303
e036750bdf
Use the disable macros on initialization. Which fixes a bug when there is no pin defined for stepper enabled (motherboard 4)
2012-12-09 23:46:25 +01:00
Daid
fcd9de72ef
Merge branch 'Marlin_v1' of github.com:ErikZalm/Marlin into Marlin_v1
2012-12-09 23:31:07 +01:00
Daid
32d4373e0f
Add printrboard and brainwave to Makefile.
2012-12-09 23:30:55 +01:00
daid
b3ddbcee2a
Merge pull request #329 from jcrocholl/Marlin_v1
...
Add Printrboard and Brainwave to pins.h and fastio.h
2012-12-09 14:29:26 -08:00
Daid
29435dfb4b
Proper avr for Sanguino in Makefile.
2012-12-09 23:02:03 +01:00
daid303
52158dffcc
Big 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.
2012-12-09 23:00:06 +01:00
Daid
ca7acbe6d9
Allow specification of which arduino hardware subvariant in Makefile.
2012-12-09 19:19:57 +01:00
Johann Rocholl
33247733e0
Teensylu and Printrboard use different analog pins for thermistors.
2012-12-09 02:19:13 -08:00
Johann Rocholl
621c24a10f
AT90USB is only defined after pins.h is included.
2012-12-09 01:40:33 -08:00
Johann Rocholl
6cba11f087
Stop 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.
2012-12-09 01:32:09 -08:00
Johann Rocholl
4d351b4846
Improved formatting and comments for consistency.
2012-12-08 20:15:53 -08:00
Johann Rocholl
a30007caa4
If fastio.h is not messed up then Teensylu and Printrboard are actually using the same pins.
2012-12-08 19:46:42 -08:00
Johann Rocholl
6aa87a7b67
Use the same fastio.h definition for AT90USB1286/7 and AT90USB646/7.
2012-12-08 15:16:38 -08:00
Johann Rocholl
b1c38d4c82
Avoid compiler warnings (redefined MOTHERBOARD) in Arduino 1.0 and greater.
2012-12-08 11:34:18 -08:00
Johann Rocholl
42e21bb06e
Add support for Printrboard (from https://github.com/lincomatic/Marlin ) and Brainwave (from https://github.com/metrix/Sprinter ).
2012-12-08 10:49:01 -08:00
Johann Rocholl
ce4b5bbeaa
Add AT90USB646 support from Sprinter to fastio.h.
2012-12-08 10:45:58 -08:00
Daid
f413aa33b3
Small makefile change, posibility to add defines on the commandline, and fix compiling with watchdog enabled when using the Makefile.
2012-12-08 11:49:53 +01:00
daid303
587154c01b
Fix 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.
2012-12-06 10:36:07 +01:00
daid303
1f27870d41
Fix compiling the watchdog error message when the manual reset watchdog is used.
2012-12-06 10:27:50 +01:00
daid303
c5d4225804
Mistake there, not sure why I did that. My bad.
2012-12-05 20:23:13 +01:00
daid303
529748894c
Minor changes in the temperature code for some cleanup.
2012-12-05 19:54:01 +01:00
daid303
4e26ecc940
The 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.
2012-12-05 19:32:26 +01:00
daid303
c421774422
The 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.
2012-12-05 19:32:02 +01:00
daid303
16078e47d4
Fixed #325
2012-12-04 16:27:21 +01:00
daid303
6a9bee27cc
Changed the naming of some LCD functions, so the names match better what the function does. Also moved around some prototypes for general cleanup.
2012-12-03 12:52:00 +01:00
daid303
94ea26ff46
Some 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.
2012-12-03 12:13:20 +01:00
daid303
6c51fe5039
Fix the bug where the SD percentage calculation is wrong when the file is larger then 42MB
2012-12-03 11:35:36 +01:00
brupje
57429cb9fe
Fix for keypad
2012-11-29 21:42:19 +01:00
daid303
97fa2a9c30
Few simple fixes that save RAM, as static strings are stored in RAM by default.
2012-11-28 10:30:34 +01:00
Daid
c94ca24adc
Fixed #317
2012-11-24 17:32:30 +01:00
Daid
99e9554edd
Some 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.
2012-11-24 11:46:31 +01:00
Erik vd Zalm
dbbf050005
More rambo fixes
2012-11-21 20:53:56 +01:00
Erik vd Zalm
f934d0ef5b
Merge remote-tracking branch 'tonokip/Marlin_v1' into Marlin_v1
...
Conflicts:
Marlin/Configuration.h
2012-11-21 20:36:30 +01:00
Erik vd Zalm
e48dfcc2b3
Tmp copy before merge
2012-11-21 20:29:31 +01:00
Erik vd Zalm
b98fb17fe9
Small FREQUENCY_LIMIT changes
2012-11-21 20:17:44 +01:00
daid
bce67ec2c9
Merge pull request #312 from gege2b/Marlin_v1
...
Added french translation
2012-11-18 13:43:07 -08:00
Gege
9b1d2483a0
I hope last changes to french translation
2012-11-18 22:34:56 +01:00
Gege
b1adc567da
Correction to french translation (non-ASCII chars only)
2012-11-18 20:00:41 +01:00
Gege
0807d82af0
Correction to french translation (plain text only)
2012-11-18 19:39:56 +01:00
Erik vd Zalm
5cd7a90b32
Added 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.
2012-11-16 23:51:05 +01:00
gege2b
bb119739b0
Added french translation
2012-11-16 18:38:50 +01:00
daid
df8dd5ac21
Merge pull request #306 from nothinman/Marlin_v1
...
Added automatic build numbering.
2012-11-14 01:59:33 -08:00
MaikStohn
2b7b1e52b1
allow marlin internal 0°C represenation
2012-11-13 14:37:08 +01:00
Martin Lukasik
2f771b3979
Added automatic build numbering.
2012-11-12 21:06:59 +00:00
daid
9bebe9b631
Merge pull request #302 from nothinman/Marlin_v1
...
Added Polish translation. Cosmetic changes to English.
2012-11-12 12:13:30 -08:00
daid303
a2032afa3a
Fixed #303
2012-11-12 21:04:07 +01:00
Martin Lukasik
6a55ca8370
Added Polish translation. Cosmetic changes to English.
2012-11-12 15:54:07 +00:00
daid303
8f20562f49
Fix some of the crowded code style. And fixed the conditional. #300
2012-11-12 15:49:40 +01:00
daid303
43018a48c4
Fix for a few -Wextra warnings.
2012-11-12 15:35:28 +01:00
daid303
72586eb30a
Solved few warnings.
2012-11-12 09:29:12 +01:00
daid303
7a02ba361c
Header multiple include protection should match the filename, not just _ARDUINO_H, which is almost bound to go wrong some day.
2012-11-12 09:24:28 +01:00
daid303
f4a89ec776
SDCARDINSERTED is always defined, and thus we do not need the #ifdefs.
2012-11-12 09:16:27 +01:00
daid303
57834776ad
Made the 2nd speed lookup table condition more explicit.
2012-11-11 12:02:48 +01:00
Daid
caa2b25b40
Fix Gen7 compile if you have avr-libc version 1.7.1 or higher. See http://code.google.com/p/arduino/issues/detail?id=604
2012-11-11 11:17:54 +01:00
daid303
a27fef8750
Store the pre-heat constants outside of the ULTIPANEL define, so we can use them when storing EEPROM in a build without the ULTIPANEL.
2012-11-11 11:06:58 +01:00
daid303
789be03b4f
Update on makefile, should make it easier to compile for different boards without changing the makefile. (Still missing Arduino 1.x.x support).
2012-11-11 11:05:52 +01:00
daid303
40ce057a3e
Fixing issue #297
2012-11-10 14:37:01 +01:00
daid303
625ac81acc
Yes, makes sense, lets NOT use the value directly from the configuration define but modify it before setting it. This will not confuse people (including me) at all!
2012-11-09 22:36:31 +01:00
daid303
ffc69537aa
Update on some comments, make the MOTHERBOARD list complete again.
2012-11-09 09:10:51 +01:00
daid303
71efcfc648
Most likely fixing issue #295 .
2012-11-08 21:08:05 +01:00
daid303
04be9d6001
God damn. Sorry, my mistake, forgot to add this file.
2012-11-07 23:16:43 +01:00
daid303
c17da4b707
Add ConfigurationStore to the Makefile.
2012-11-07 22:43:01 +01:00
daid
ccd9fd0dc3
Merge pull request #292 from jothan/lcdfix
...
Lcd fixes
2012-11-07 13:10:59 -08:00
Jonathan Bastien-Filiatrault
46b9988e26
Search and replace failure.
2012-11-07 16:09:30 -05:00
Jonathan Bastien-Filiatrault
0f73afb0b0
Avoid defining overriding definitions for the RepRapDiscount Smart
...
Controller. Remove common definitions. Harmonize declaration order.
2012-11-07 16:04:28 -05:00
Jonathan Bastien-Filiatrault
36b452c7ac
Remove abbrs.
2012-11-07 15:42:18 -05:00
YanFM
332344bd43
Update Marlin/language.h
...
Included Portuguese language
2012-11-07 09:43:13 -02:00
daid303
e6c1cadea0
Set the watchdog to a 4 second timeout, as with 1 second it can timeout during SD card init.
2012-11-07 12:32:17 +01:00
daid
faea7d72b8
Merge pull request #290 from buildrob/Marlin_v1
...
Clean up special serial port cases
2012-11-07 02:00:26 -08:00
daid303
12a4d60e18
Fix the EEPROM storage, no longer inline it at multiple locations, and remove the template.
2012-11-07 10:02:45 +01:00
Jonathan Bastien-Filiatrault
9606f4d04f
Include Marlin_main.cpp in source files.
2012-11-06 20:32:48 -05:00
Jonathan Bastien-Filiatrault
3cbaad9288
RepRapDiscount Smart Controller pin definitions.
2012-11-06 20:32:13 -05:00
Robert F-C
99692dc99e
Clean up special serial port cases
...
Assume SERIAL_PORT 0 if not defined. Collapse un-numbered register
special case. Clarify comments.
2012-11-07 09:00:21 +11:00
daid303
5a998558a9
Update suggested by Robert F-C. #289
2012-11-06 21:04:29 +01:00
daid303
f6ff0ab767
signed/unsigned fixes.
2012-11-06 15:33:49 +01:00
daid303
5d471e0f34
Also reset the PID values to defaults. Fixes #281
2012-11-06 15:21:00 +01:00
daid303
d3ebc34958
Hopefully also support chips with a single UART in MarlinSerial now.
2012-11-06 14:43:36 +01:00
daid303
b6ff45254e
Better explain the watchdog "problem" and rename the config define so it explains that the feature belongs to the watchdog.
2012-11-06 13:33:00 +01:00
daid303
7e348fcb5f
By mistake enabled the watchdog by default. This should be off by default.
2012-11-06 13:20:08 +01:00
daid303
06b58a9c4f
First cleanup. Moved all code to cpp files, so there are no dependencies on pde files. And no more odd requirement to cat files together. (Still need to fix the Makefile). Also cleaned up some defines and made defines upper case as by C coding conventions.
2012-11-06 12:06:41 +01:00
daid
539f3b3fe4
Merge pull request #284 from brackendawson/Marlin_v1
...
Use the right pins for Gen7 1.4
2012-11-06 01:06:24 -08:00
Robert F-C
65c9a0728f
Set default serial port back to 0.
2012-11-05 22:15:07 +11:00
Robert F-C
ab9d183024
Make serial port configurable.
...
This change makes the choice of serial port configurable so that
wireless capability can be easily added by connecting Bluetooth modules
(such as BlueSmirf or JY-MCU) to the expansion port pins.
2012-11-05 21:34:27 +11:00
Bracken Dawson
f5631a89e8
Add dummy Emergancy Pin to Gen7 1.4
...
Change required after pulling from ErikZalm.
2012-10-26 22:28:37 +01:00
Bracken Dawson
a4f9e1ebf2
Merge git://github.com/ErikZalm/Marlin into Marlin_v1
2012-10-26 22:20:35 +01:00
Bracken Dawson
2873d67b17
Put bogus temp override back in Gen7 up to 1.3
...
Took out the ifdef when I split 1.4 out and forgot to permanently
define it for <=1.3.
2012-10-26 22:17:26 +01:00
ErikZalm
a7e40b2903
Merge pull request #276 from setar/Marlin_v1
...
Fix num of digits on LCD for E and Z axis.
2012-10-23 09:48:55 -07:00
MaikStohn
6ed02c86be
Fixed wrong code (will not even compile when EXTRUDERS>2)
2012-10-23 18:08:43 +02:00
Sergey Taranenko
2a67363e27
Fix ‘prog_uchar’ definition in LiquidCrystalRus.cpp
2012-10-22 11:05:17 +04:00
Sergey Taranenko
205304ddee
Merge git://github.com/ErikZalm/Marlin into Marlin_v1
2012-10-22 10:59:27 +04:00
Erik vd Zalm
58bca87c72
fix LCD temp bed artifacts on power up ' B022/0.) -> B022/000 '
2012-10-21 14:40:06 +02:00
Erik vd Zalm
febeb43197
Revert "fix LCD temp bed artifacts on power up ' B022/0.) -> B022/000 '"
...
This reverts commit cb02c2f9d8
2012-10-21 14:36:31 +02:00
Sergey Taranenko
8178dec4c3
Fix num of digits on LCD for E and Z axis.
...
The number of steps per mm often contains 4 digits before the decimal point and does not require precision greater than 0.1
2012-10-18 17:45:40 +04:00
ErikZalm
70f57a6844
Merge pull request #273 from setar/Marlin_v1
...
fix LCD temp bed artifacts on power up ' B022/0.) -> B022/000 '
2012-10-17 04:10:18 -07:00
ErikZalm
ff14199e58
Merge pull request #270 from jothan/Marlin_v1
...
Create an explicit rule for building applet/Marlin.cpp.
2012-10-17 04:09:36 -07:00
Daniele Sdei
695938ba3f
Italian language support
2012-10-17 12:48:26 +02:00
Sergey Taranenko
cb02c2f9d8
fix LCD temp bed artifacts on power up ' B022/0.) -> B022/000 '
2012-10-17 10:49:05 +04:00
