9497 Commits (608be966d7c7f1fecabdd92e7e992aedfd3d2e4b)

Author SHA1 Message Date
Gord Christmas a733537ddd Missed some variable declarations
Integrated fixes from henrikbrixandersen pull request #504
12 years ago
Gord Christmas f4f30c9d64 Added servo actuated enstop coding to allow G28 command to engage and retract a servo to specified angles. 12 years ago
Erik van der Zalm 79374f0b93 Merge branch 'reisnyderb' of https://github.com/ErikZalm/Marlin into Marlin_v1 12 years ago
Maik Stohn da05b3ba94 faster GLCD (ST7920 SW-SPI) implementation / fixes
- fixed long menu entries (>14 or >18 chars) caused overrun in dogm lcd
implementation
- fixed pin set problem when in interrupt
- much faster ST7920 SW-SPI implementation
- increased ST7920 framebuffer size for more speed
12 years ago
kiyoshigawa 4b19c8552e Fixing changed Configuration.h settings to be default values per ErikZalm Request. 12 years ago
Erik van der Zalm 971ec35135 Expanded M302 to allow setting the temp 12 years ago
Erik van der Zalm 5090c56651 More redundant temp sensor changes. (After testing and debugging by reifsnderb) 12 years ago
Guillaume Seguin 16b9239a26 Report temperatures for all extruders 12 years ago
ErikZalm a964b3cf3d Merge pull request #495 from Gatulibu/Marlin_v1
Added support for Megatronics v2.0 and Minitronics v1.0
12 years ago
Maik Stohn e8572c5239 Fix: Long menu entries (>14 or >18 chars) caused overrun in hitachi display implementation 12 years ago
Maik Stohn 7ee70c2248 Fix: removed wrong ; at end of define 12 years ago
Gatulibu b78fa6bb70 Added support for Megatronics v2.0 and Minitronics v1.0
merged from code downloaded from reprapworld.com
12 years ago
Erik van der Zalm 9be61cdc02 Added redundant temp sensor 12 years ago
Erik van der Zalm 7231a20dba Put #ifdef around servo pins in pins.h. This allows the pins to be used for M42. 12 years ago
Alexander Kasimir e2ff536b03 Fixed typo in Comment 12 years ago
Robert F-C 40eb07bad4 Revert and extend previous change pin check change
Reviert previous change of #if BLAH_PIN > 0 to #if defined(BLAH_PIN) &&
BLAH_PIN > -1. Unfortunately some times pin 0 is used. For my sins I've
gone through and replaced all unsafe checks of #if BLAH_PIN > -1 with
the safe version.
12 years ago
Maik Stohn bd33cf4a9f fixed typo / added "const" to defines for newer gcc compatibility 12 years ago
ErikZalm 567291e734 Merge pull request #485 from Banjer/Panelolu2_Melzi
Add Panelolu2 support for Melzi
12 years ago
Maik Stohn 8d80cbbf4c fix broken LCD commit #dfa549f268 from buildrob - GLCD/DOGM implementation was ignored 12 years ago
xifle 98d0d48191 fixed merge 12 years ago
xifle bbe67fca5a soft tab correction 12 years ago
xifle 9eeb711c96 Merged from Upstream Master 12 years ago
Bas Spaans 424101110c Add Panelolu2 support for Melzi 12 years ago
Robert F-C 0d4a9444c4 Merge remote-tracking branch 'upstream/Marlin_v1' into Marlin_v1 12 years ago
Erik van der Zalm 86cce025f4 Added #ifdef NUM_SERVOS to servo.cpp 12 years ago
xifle 03141a5ef4 LCD: Added Deadzone at 100% Feedrate
This adds a deadzone at 100% Feedrate when changing it at the status
screen/main menu. Prevents from unwanted feedrate-changing when
navigating back to the main menu and makes it easier to return to 100%.
12 years ago
Gord Christmas 28ada096e2 Adding servo documentation 12 years ago
Robert F-C 4121311b9d Change to LCD status indicators
The I2C LCD status indicators now indicate when the hotends or bed are
turned on at all (rather than just when they are in their heating phase)
12 years ago
Robert F-C dfa549f268 Merge remote-tracking branch 'upstream/Marlin_v1' into Marlin_v1 12 years ago
ErikZalm 64360164ad Merge pull request #482 from codexmas/Marlin_v1
servosupport
12 years ago
ErikZalm 86405cdd11 Merge pull request #479 from MStohn/thermocouple
BUGFIXES for temperature.cpp / add RUMBA thermocouple support
12 years ago
Erik van der Zalm 6c45c3f4e7 BariCUDA changes 12 years ago
Gord Christmas 96624f0f31 Forgot to include reference to Servo in makefile 12 years ago
Gord Christmas dc59f07d24 First attempt at refactoring of original servo code. Only adding servo support as a start to keep things simple. 12 years ago
Gord Christmas b668cb0516 Adding in clean copies of Servo library from Arduino 1.0.4 12 years ago
MaikStohn 95dff34b73 fixed wrong compare for min temp check of heater 1 and heater 2 12 years ago
MaikStohn 4cc6f9f6de fixed wrong pin initialization when using temperature 2 pin input 12 years ago
MaikStohn 61a48cc662 Add support for RUMBA thermocouple add on 12 years ago
MaikStohn 9cc15876be Add support for RUMBA thermocouple add on 12 years ago
ErikZalm c9cf2174dd Merge pull request #474 from xifle/Marlin_v1
Fixed "Cooldown" Selection not reseting bed temp
12 years ago
Erik van der Zalm bd2cd4903e Added #ifdef BARICUDA around the BariCUDA changes 12 years ago
Jordan Miller 37f3199df3 fixed problems in planner with solenoids for BariCUDA when set to 0 12 years ago
Jordan Miller fbd899a37d Support for BariCUDA Paste Extruder derived from MakerBot Frostruder. Using Ultimachine RAMBo board. M126/M127 and M128/M129. 12 years ago
xifle 29bb8d7d4f Fixed "Cooldown" Selection not reseting bed temp
- enquecommand with multiple lines "\n" doesn't work -> M140 S0 didn't
get processed. So I wrote a new func for the cooldown which uses
setTargetHotend. In addition this does return to status page after
selection.
    - Added setWatch() to preheat-functions (Temperatur sanity check
would never have worked when preheating from the lcd panel)
12 years ago
Robert F-C 015d0594b0 Optimize menu selection for Viki rotary encoder.
The Viki LCD rotary encoder uses a different number of steps per
rotation. This fixes the seeming "missed" steps when selecting a menu.
12 years ago
gregor 2739c26c4f changes:
- changed the variables from keypad to reprapworld_keypad
- added a missing ifdef check
12 years ago
gregor 6fb9573157 added support for the reprapworld keypad 12 years ago
Tim Anderson 594193c908 Merge remote-tracking branch 'upstream/Marlin_v1' into Marlin_v1 12 years ago
Tim Anderson 1fa61c297e Turning off Control Panel by Default and Updating the link to the LiquidCrystal_I2C library to avoid confusion. 12 years ago
kiyoshigawa b27a59f41e Added support for Elefu RA Board and Elefu Control Panel 12 years ago
midopple a65a26d6b4 If CORE_XY is in use X and Y Axis had to be activated at the same time 12 years ago
midopple db2f157a22 Replace the <= to < in the Command M907, M350 and M351.
The for loop for Axis count over the Array.
Add a break after M907
12 years ago
Scott Lahteine a5cd582665 Support for 10 level deep SD folder hierarchy 12 years ago
Arnoud fc4ab05157 Solved minor bug in controllerFan()
Extruder 2 was checked where extruder 1 should be checked.
12 years ago
Scott Lahteine 0ef54f2f85 Make M303 silent when "S0" is sent
If S is left out perhaps it should be silent, but check the spec for
this M code.
12 years ago
Scott Lahteine a200521eab Added CUSTOM_MENDEL_NAME option to Configuration.h and language.h
Also cosmetic comment changes and spelling corrections in printed
messages
12 years ago
Martin Renold 1a397825f9 fix DEFAULT_AXIS_STEPS_PER_UNIT minor Z rounding error 12 years ago
Robert F-C 289c02eda4 Remove unnecessary pin initialization in stepper.cpp
(duplicates initialization in Marlin_main.cpp)
12 years ago
Robert F-C d5ad7a0814 Rework change to incorporate CONTROLLERFAN
Also refactor extruder auto fan logic to simplify further and now only
check every 2.5 seconds
12 years ago
Robert F-C c3cdaceab3 Merge remote-tracking branch 'upstream/Marlin_v1' into Marlin_v1 12 years ago
Robert F-C 1c127217df Make DOGLCD merge neater. 12 years ago
Robert F-C 7f57f28ccc Add lcd_buzz function to ultralcd.h so that non-LCD code can make use of lcd's buzzer.
Argument order of lcd_buzz was set to mirror that on tone(). Change
default M300 frequency to something audible.
12 years ago
Robert F-C 788d62bcc4 Merge remote-tracking branch 'upstream/Marlin_v1' into Marlin_v1
Conflicts:
	Marlin/Marlin.pde
	Marlin/ultralcd.cpp
	Marlin/ultralcd_implementation_hitachi_HD44780.h
12 years ago
Lukasz Stefanowicz d71f1e9bf6 Add (as an option) slower SD transfer mode 12 years ago
ErikZalm db5bb8546d Merge pull request #452 from MStohn/Marlin_v1
128x64 RepRapDiscount Full Graphic Smart Controller support
12 years ago
daid 4b2ece159b Merge pull request #453 from brackendawson/Marlin_v1
Make Gen7 1.4+ heater temp sensort pins match silkscreen.
12 years ago
Bracken Dawson d5ee2a5a62 Make Gen7 1.4 heater pins match silkscreen 12 years ago
MaikStohn 7ac6d7f78e FIX: Speedup - no explicit display clear needed in u8glib 12 years ago
MaikStohn 13596e8722 Added RepRapDiscount FULL GRAPHIC Smart Controller 12 years ago
MaikStohn 3a6abe1d6e Removed STB custom font hack from u8glib library and moved to marlin project 12 years ago
MaikStohn 16afbf9bfa FIX: adopted latest changes from hitachi implementation 12 years ago
daid303 34bca48b98 Merge branch 'Marlin_v1' of github.com:ErikZalm/Marlin into Marlin_v1 12 years ago
daid303 ac52dcc174 Updated the card menu and watch messages to make it more informative. 12 years ago
Stefanowicz 31bb3fb297 Fix: Build error when EEPROM_SETTINGS is defined and PIDTEMP is undefined 12 years ago
daid303 c80a78bb70 Lower the default max E feedrate a bit. With the stepper fix this is much to high. 12 years ago
Simon Oliver 5d5909fc25 Fix failure to compile with heated bed: remove call to non-existant scaleBedPID(). 12 years ago
Simon Oliver 93f0463b21 Allow Edit menu to call fn after edit; Fix PID Ki and Kd display in menus; Actually use changed PID and Max Accel values
Add new 'callback' edit-menu types that call a function after the edit is done. Use this to display and edit Ki and Kd correctly (removing the scaling first and reapplying it after). Also use it to reset maximum stepwise acceleration rates, after updating mm/s^2 rates via menus. (Previously, changes did nothing to affect planner unless saved back to EEPROM, and the machine reset).

Add calls to updatePID() so that PID loop uses updated values whether set by gcode (it already did this), or by restoring defaults, or loading from EEPROM (it didn't do those last two). Similarly, update the maximum step/s^2 accel rates when the mm/s^2 values are changed - whether by menu edits, restore defaults, or EEPROM read.

Refactor the acceleration rate update logic, and the PID scaling logic, into new functions that can be called from wherever, including the callbacks.

Add menu items to allow the z jerk and e jerk to be viewed/edited in the Control->Motion menu, as per xy jerk.

Conflicts:
	Marlin/language.h
12 years ago
Bart K 4fa2260a59 Fixed cardreader.h to resolve issue #440 (Pull Request #425 missing file) 12 years ago
Erik van der Zalm 038d405254 Corrected #endif in language.h 12 years ago
Dirk Eichel 443aaa30bf Removed GIT fragments
Seems that there was something wrong while merging
12 years ago
ErikZalm 7f622467fc Merge pull request #425 from kefir-/m928_logging
M928 logging
12 years ago
ErikZalm 86867928ac Merge pull request #434 from DDRBoxman/Marlin_v1
Add support for M300: Play beep sound
12 years ago
ErikZalm 9a38cad6f0 Merge pull request #430 from STB3/GLCD_128x64_dots
Final task of the 128x64dots GLCD implementation
12 years ago
ErikZalm 7a5c474d91 Update Configuration.h 12 years ago
Dirk Eichel 4e448b700a Merged fetched files from Marlin_v1 branch
Pull requests: #414 #433 #432 #428
12 years ago
ErikZalm 9f2862ce48 Merge pull request #414 from whosawhatsis/Marlin_v1
regenerated thermistor table 7
12 years ago
ErikZalm 9fb8bd5685 Merge pull request #433 from whosawhatsis/bang-mode
Separate PID_MAX from BANG_MAX
12 years ago
Colin Edwards 0d075378d5 Add LARGE_FLASH define and enable it for some of the beefier boards
The LARGE_FLASH flag allows superfluous features to be excluded
on boards with less memory
12 years ago
Colin Edwards 9a1c90471f Ignore unused beeper pins 12 years ago
Colin Edwards 1a0f889803 Add support for M300: Play beep sound 12 years ago
Robert F-C 9322c408c6 Updated for LiquidTWI2 library version 1.2.3
The new version of the library means that PANELOLU no longer needs to be
defined in LiquidTWI.h (the library file can be used as is) and the new
version of the library also enables the buzzer on the Panucatt VIKI
panel.
12 years ago
whosawhatsis fd5b7e0cec Separate PID_MAX from BANG_MAX
This allows PID_FUNCTIONAL_RANGE to use a maximum duty cycle higher
than PID_MAX. This is useful for powerful heaters to heat quickly in
bang-bang mode, but use a lower duty cycle that is easier to stabilize
in PID mode.
12 years ago
blddk e5a853a3d0 Added automated extruder fan function 12 years ago
blddk 72419f69a9 Added rumba 12 years ago
blddk 91bea43332 Added rumba pinout 12 years ago
blddk d2b00fe486 Removed html and added rumba
Found some unwanted html at the bottom of the file which caused it to not be able to compile.
Also added rumba as machine.
12 years ago
Dirk Eichel 6c66cae694 GLCD init screen cosmetics 12 years ago
Dirk Eichel f3e0e5184d Add include selector between char. LCD and GLCD 12 years ago
Dirk Eichel 5d3862f9d1 Modified u8glib logo on welcome screen 12 years ago
Dirk Eichel 0b320f75e9 Removed debug code, add some comments 12 years ago
Dirk Eichel 5f1cd70122 Add code to lcd_update() for GLCD
This code selects between the routines for the GLCD or the char.
display.
12 years ago
Dirk Eichel a49c09a776 Add variable for animated fan, add float conversion w/o sign
A new variable was introduced to allow fan animation on the GLCD.
Add additional float to string conversion routine without sign
character. This is used for the coordinates visualisation on the GLCD.
12 years ago
Dirk Eichel 26d8863111 Add library selection between GLCD and char. LCD 12 years ago
Dirk Eichel 4a141a694f Marlin code for GLCD display
This contains the menues, status screen etc...
12 years ago
Dirk Eichel 83c790a020 Add bitmap graphics for GLCD
1. Marlin welcome screen
2. Status screen symbols 3 Extruders, heated bed, animated fan logo 1
3. Status screen symbols 3 Extruders, heated bed, animated fan logo 2
12 years ago
Dirk Eichel 233df9cca0 Add missing LF at the end of the file 12 years ago
Dirk Eichel bb0de75a92 Removed umwanted HTML code ath the end of the file
Sorry for that. This does not lead to compile errors. I removed the
unwanted code to make it clean.
12 years ago
Ryan Turner 7c47e7162d Adding Maker's Tool Works heated bed thermistor 12 years ago
daid af78d0cbfa Merge pull request #1 from illuminarti/Fix_E_Speed
Fix step rate bug (especially for retraction)
12 years ago
Dirk Eichel 9a78f321a4 Add pins for Motherboard variant 64
These definition contain also the definition for the graphics LCD.
12 years ago
Dirk Eichel 5de25ccd20 Add Motherboard variant 64 - STB V1.1
Definition for the graphic LCD are already in it, they will not harm the
configuration as they are only defined constants
12 years ago
daid d6ce63c49c Merge pull request #411 from STB3/Marlin_w_STB_Board_support
Add STB board support to Marlin (next step towards graphic LCD implementation)
12 years ago
Ketil Froyn f036be7c4e Clean up tab/whitespace from last commit 12 years ago
Ketil Froyn 07e11c7cf5 Add command M928 to enable logging to file of received gcode commands 12 years ago
daid 92782f9252 Merge pull request #1 from illuminarti/Fix_E_Speed
Fix step rate bug (especially for retraction)
12 years ago
whosawhatsis 6a61a3c0b4 missing comma in last commit 12 years ago
whosawhatsis f0aee4101a regenerated thermistor table 7
Generated with createTemperatureLookup.py. The old table crapped out at
270C, which was a problem for polycarbonate.
12 years ago
Nicolas Rossi aba67e2449 No bed config for RAMPS
The motherboard 35 is a config without bed with this pins setting :
D8 Extruder
D9 Fan
D10 Controller Fan
12 years ago
Nicolas Rossi 6504e96165 Turn off power supply off-load
Disable the high current output and wait a little before to turn off,
because the interrupting capacity of the PSU is unknown.
Could be a function if needed by other.
12 years ago
Nicolas Rossi 86bf911139 Toggle menu for PSU from LCD pannel
From the prepare menu, accessible when is not printing, you have the
possibility to turn off the PSU when is on et vice versa.
From the host, you can turn off or turn on the PSU then the menu is
updated accordingly.
From the LCD message, the printer status is reported ready or off
respectively when the PSU is on or off.
12 years ago
Robert F-C 7bad72359c Support encoder click on PANELOLU2 being read through I2C
This change also handles the case where the pause/stop/restart button on
the VIKI is not used. Make LCD I2C buzz sound the same as the normal
buzz (300ms is too long for quick feedback).
12 years ago
Robert F-C 1daf2f3256 Number of extruders is not an advanced configuration - it is a basic property. 12 years ago
Robert F-C f1263d3f88 Further reduce code by using precompiler logic 12 years ago
Dirk Eichel 140e095c6e Add pins for Motherboard variant 64
These definition contain also the definition for the graphics LCD.
12 years ago
Dirk Eichel b2c1c64fb1 Add Motherboard variant 64 - STB V1.1
Definition for the graphic LCD are already in it, they will not harm the
configuration as they are only defined constants
12 years ago
Dirk Eichel ceb5ee38af Replaced corrupted language.h file on local PC with current from ErikZalm/Marlin 12 years ago
Dirk Eichel 8efd4cfd73 fixed merge conflict 12 years ago
Robert F-C 372e12f83f Implement automatic extruder/cold-end fan control based on temperature
This change allows fan outputs to automatically turn on/off when the
associated nozzle temperature of an extruder is above/below a threshold
temperature.
Multiple extruders can be assigned to the same pin in which case the fan
will turn on when any selected extruder is above the threshold.
It also makes the M42 command compatible with the M106/M107 command.
The majority of the logic in this change will be evaluated by the
compiler at build time (i.e, low code space requirements).
12 years ago
Robert F-C 6beb42cdf6 Attempt to address Bernhard's comments
Refactor configuration to try to make items clearer (what defines a
panel vs what is user changeable).
12 years ago
Robert F-C 839bef6d5d Fix Configuration.h file to not define LCDs be default.
Also fix compile time check in Marlin.pde
12 years ago
Robert F-C 1292d735ba Converge all I2C LCD branches (PANELOLU2, VIKI & PCF8575)
This includes refactoring the buttons code to remove a large amount of
non-pin dependent duplication from pins.h.
12 years ago
daid303 4eb81a69e6 Only compile the new extruder offset code if you have multiple extruders. 12 years ago
daid 3e9cd334a4 Merge pull request #383 from dob71/jeff
Hotend offset handling for multi-extruder machines
12 years ago
MendelMax 67710df9f3 Made i2c mode wok with the hardware I am able to test (ywrobot / sainsmart i2c LCD 2004)
Removed incorrect LiquidCrystal_I2C Library
12 years ago
Bob Clough b6209c86dd Added import of Wire Library to make I2C LCD support compilable 12 years ago
Bob Clough 2b567d1df5 Added I2C port expander support to HD44780 12 years ago
Bob Clough 06272f463d Added Config variables for activating I2C LCDs and setting type and address 12 years ago
daid303 de3dec7215 Also show the tune menu when USB printing. 12 years ago
Denis Bakin 73d41c10b9 Merge branch 'Marlin_v1' of github.com:ErikZalm/Marlin into jeff
Conflicts:
	Marlin/language.h
	Marlin/thermistortables.h
12 years ago
daid 63da4dc59a Merge pull request #398 from DanieleSdei/Marlin_v1
Marlin v1, alignment of the Italian language
12 years ago
Daniele Sdei 82e28851bd Italian language: SD-Card change and SD-Card init 12 years ago
Daniele Sdei aed5965ad8 Italian language: remove space and some fix 12 years ago
codenamepawel d360846dd4 Update Marlin/language.h
Update Polish language 	#define MSG_RESUMING "Wznawiam drukowanie"
12 years ago
daid303 2f60e324dc Fixed #394 12 years ago
daid 5e2abfcdcd Merge pull request #391 from STB3/Marlin_with_SD-Card_Change_Menu
Add SD-Card change and SD-Card init. for electronics equipped with LCD Display
12 years ago
Dirk Eichel a0d4e8e78e Add Messages for SD Card init. & change 12 years ago
mfeherpataky bbf0cc1379 Update Marlin/ultralcd_implementation_hitachi_HD44780.h
Fix to a bug that I just introduced - sorry. Forgot about offset of string length.
12 years ago
Dirk Eichel c8f1fbd9d8 Add SD-Card change and SD-Card init.
Add SD-Card change and SD-Card init. for reprap electronics without
SD-Chard change detect pin.
12 years ago
mfeherpataky 71ddb8dc60 Update Marlin/ultralcd_implementation_hitachi_HD44780.h
Use all available characters in narrow LCDs < 20 characters.
12 years ago
mfeherpataky d2c547c407 Update Marlin/ultralcd_implementation_hitachi_HD44780.h
Fix to a minor bug with hardcoded LCD_WIDTH that draws edited values outside of the 16 characters width LCDs.
12 years ago
Denis B 70871715e4 Added support for extruder offset handling
The extruder offset can be specified in the configuration
file or adjusted on the fly using the "M218 T# X# Y#" command.
The EEPROM support is not yet merged in.
The "T#" command can take option "F#" that specifies the feedrate
at which the printing head should be re-positioned. If not
specified the re-positioning move is not preformed immediately,
but the coordinates are adjusted for the printer to properly
position the head when the next movement happens.
12 years ago
Denis B 49b2ddc8c1 Cleaned up non-standard characters 12 years ago
Bernhard Kubicek f8876a7958 Merge pull request #376 from kintel/skip_longfilenames
Also skip .files and _files with long filenames. I think its better than before. If somebody dislikes it, or wants additional configuration, it can be done in a future step. Thanks, Marius, and nice to have you helping!
12 years ago
daid 18fcc367d2 Merge pull request #371 from Banjer/Melzi_LED_PIN
Chenged LED_PIN for Melzi boards, added comment about broken versions of...
12 years ago
Bas Spaans 19ce90fe02 Added comment about M42 usage (clean) 12 years ago
Bas Spaans 00fed0a703 Revert "Extended comment explaining M42 usage"
This reverts commit 01541ee64c.
12 years ago
Marius Kintel e06d820909 Also skip .files and _files with long filenames 12 years ago
Bas Spaans 01541ee64c Extended comment explaining M42 usage 12 years ago
Marius Kintel f24f02e212 compile fix: quickStop() needs stepper.h 12 years ago
Bas Spaans 12c41423ad Fixed typo in comment 12 years ago
Bas Spaans 0995eaa492 Chenged LED_PIN for Melzi boards, added comment about broken versions of the Sanguino libraries 12 years ago
Bernhard 1d06b10962 Added a feature to have filament change by gcode or display trigger.
[default off for now]
syntax: M600  X[pos] Y[pos] Z[relative lift] E[initial retract] L[later retract distance for removal]

if enabled, after a M600, the printer will retract by E, lift by Z, move to XY, retract even more filament.
Oh, and it will display "remove filament" and beep like crazy.

You are then supposed to insert a new filament (other color, e.g.) and click the display to continue.
After having the nozzle cleaned manually, aided by the disabled e-steppers.
After clicking, the printer will then go back the whole shebang, and continue printing with a fancy new color.
12 years ago
daid303 408b349a84 Fixed #368. Commented out the wrong pin definition, but explained why it is there. 12 years ago
Daniele Sdei 9ecb267b63 Merge remote-tracking branch 'upstream/Marlin_v1' into Marlin_v1 12 years ago
Daniele Sdei 3cf59f6f9a add RepRapPro Huxley thermistor tables 12 years ago
daid c1730e2b08 Merge pull request #363 from yuroller/sanguino_panelolu
Panelolu pin assignment for sanguinololu
12 years ago
Yuri Valentini 86358dd6cd Panelolu pin assignment for sanguinololu from http://reprap.org/wiki/Panelolu 12 years ago
daid303 0f3f5d083d Minor cleanup of the new FAN_KICKSTART code. #334 12 years ago
daid 6ec56fa923 Merge pull request #334 from KevinOConnor/FanKick
Add feature to briefly run the cooling fan at full speed when it first starts.
12 years ago
daid 965baf2683 Merge pull request #362 from daid/Marlin_v1
Finnish language
12 years ago
Kevin O'Connor 3d91bd486c Add "kick fan" feature - briefly run fan at full speed on start.
Add a feature to run the cooling fan at full speed for a small period
(default 100ms) when first starting the fan.  Some fans wont reliably
start spinning at low power, and many fans have issue with the PWM at
low power.  However, once the fan starts spinning it can reliably be
set to a wide range of PWM values.
12 years ago
Kevin O'Connor 3f2f94ef28 Be consistent in setting of the fan PWM.
Always set the FAN PWM value in check_axes_activity() and always use
the value of the active move if a move is active.
12 years ago
Henry Palonen 7f30039d2a + Finnish translation 12 years ago
daid303 14e1d495ef Merge branch 'Marlin_v1' of github.com:ErikZalm/Marlin into Marlin_v1 12 years ago
daid303 bbe7d3d0fe Fixed #312 12 years ago
daid 7ce509b9a7 Merge pull request #361 from yuroller/MakefileSanguino
Makefile sanguino
12 years ago
Yuri Valentini 9c34c4f05b fixes for ramps compilation using installed arduino ide 12 years ago
daid303 442ade15a6 Move Gen6 stuff into a proper location. 12 years ago
daid 5fd4582cc8 Merge pull request #242 from Drakelive/Marlin_v1
Fixes issues # 216 and # 135 for Gen6 and Gen6 Deluxe board
12 years ago
daid303 8b88e3b386 Fixed #345, Fixed #267. 12 years ago
daid 27843388c6 Merge pull request #360 from njprossi/Marlin_v1
Power signal control definitions for other power supplies
12 years ago
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. 12 years ago
Yuri Valentini 7d20ec706e Added libraries from Arduino 1.0.3 for sanguino build 12 years ago
Nicolas Rossi 437eb3bafc Initialize PS_ON at startup 12 years ago
Nicolas Rossi f3c1fc70a9 Power signal control definitions for ATX and others 12 years ago
Yuri Valentini dad7691df9 makefile for sanguino standalone compilation 12 years ago
Erik vd Zalm 6752cb2d9c PID now per extruder. Fixed typo 12 years ago
Erik vd Zalm 0ac452e252 Disable is now multi extruder compatible. M84 got a T option. 12 years ago
Johann Rocholl 9e7b5056a0 {X,Y,Z}_{MIN,MAX}_POS are actually in Gcode coordinates. 12 years ago
Daniele Sdei 5f82f03ff3 Add italian MSG_RESUMING. 12 years ago
daid303 5e3873c8db Add german MSG_RESUMING. 12 years ago
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. 12 years ago
daid303 b69cb9fbd9 Change the end of SD cart print message from minutes/seconds to hours/minutes. 12 years ago
daid 30254e3388 Merge pull request #350 from jcrocholl/Marlin_v1
Automatically set *_MIN_PIN and *_MAX_PIN according to *_HOME_DIR.
12 years ago
daid303 38ee395ac7 Replace the 1ms delay for 2 nops to get a 100ns delay. #259 12 years ago
daid303 5df5e4c4a2 Merge branch 'Marlin_v1' of github.com:ErikZalm/Marlin into Marlin_v1 12 years ago
daid303 a95dcd74e7 Fix some of the duplicated PSTRs, saving 500bytes of flash with LCD on. 12 years ago
Johann Rocholl 8caf5d252d Remove bogus blank line. 12 years ago
Johann Rocholl 1c2ecddae4 Fix typo (# missing before define). 12 years ago
Johann Rocholl 6dfb8a2187 Fix 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. 12 years ago
Johann Rocholl 3b2e5027e5 Merged updates from Marlin_v1. 12 years ago
Johann Rocholl b39f5d614a For boards with only one endstop per axis, automatically set *_MIN_PIN and *_MAX_PIN according to *_HOME_DIR. 12 years ago
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 12 years ago
Sergey Taranenko 5697451c72 fix lcd class 12 years ago
Sergey Taranenko 58e806f3fa Fix the russial translation. 12 years ago
Sergey Taranenko 50a5ce1dc4 deduplicate messages 12 years ago
daid303 6123a00e64 Fix the german translation. 12 years ago
daid303 7c21716886 Fixed #341 12 years ago
daid303 ae1bc83350 Merge branch 'Marlin_v1' of github.com:ErikZalm/Marlin into Marlin_v1 12 years ago
daid303 596a7e1904 Fix compiling for Arduin < 1.0.0 12 years ago
Daid b264317fa0 Reverted the patch by KevinOConnor, as it crashes some versions of avr-gcc and caused linking issues. 12 years ago
Daid 673577a31b Merge branch 'Marlin_v1' of github.com:ErikZalm/Marlin into Marlin_v1 12 years ago
Daid 23022f1a82 Updates to Makefile to compile for Teensy. 12 years ago
daid 96e9db8919 Merge pull request #339 from KevinOConnor/CompilerFlags
Add additional optimization flags to Makefile
12 years ago
daid303 08356361ac Fixing a problem with heated beds not working without PID and BED_LIMIT_SWITCHING 12 years ago
daid303 047d037f8c #ifdef fix for #326 12 years ago
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.
12 years ago
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.
12 years ago
daid303 f30b46b2a8 One more fix for #338, I really should get a heated bed to test with. 12 years ago
daid303 65c3f1ffcd Most likely fixing #338 12 years ago
daid303 7577717b59 Fixed #336 12 years ago
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. 12 years ago
daid303 6731c094ee Fix compiling with just an 16x2 LCD and no buttons. 12 years ago
daid303 b99a928a80 Fix the M117 (display message on LCD) when used over USB with checksums. 12 years ago
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. 12 years ago
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) 12 years ago
daid303 8b58edc70e Merge branch 'Marlin_v1' of github.com:ErikZalm/Marlin into Marlin_v1 12 years ago
daid d0319d45af Merge pull request #335 from jcrocholl/Marlin_v1
Fix endstop pins for Printrboard
12 years ago
Johann Rocholl ca409e5531 Fix X/Y/Z_MIN_PIN for Printrboard. 12 years ago
Johann Rocholl 1f45cb0a51 Fix typo in MANUAL_HOME_POSITION (plural S missing) and improve comments. 12 years ago
Johann Rocholl 931a0052ea Fix typo in MANUAL_HOME_POSITION (plural S missing) and reduce BLOCK_BUFFER_SIZE because 64 wasn't working for some reason. 12 years ago
daid303 46ec4b648c Added some missing Mxxx comments to M commands. Fixed the unsetting of the timer dividers for the fast PWM fan. 12 years ago
Daid 724f5aa36b Update on makefile for moved Arduino addons. 12 years ago
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. 12 years ago
daid303 3fb07d9b8d Add MINTEMP/MAXTEMP error to LCD, and fix temperature bug with more then 1 extruder. 12 years ago
Johann Rocholl 8e2519e88b Add realtime delta geometry in Marlin_main.cpp. 12 years ago
Johann Rocholl cec7283b21 Enable QUICK_HOME for deltabot. 12 years ago
Johann Rocholl 2292441f0c Use X/Y/Z_MAX_PIN instead of X/Y/Z_MIN_PIN for top endstops on deltabot. 12 years ago
Johann Rocholl c430906d3b Deltabot settings and configuration adjustments. 12 years ago
daid303 82c8724b33 Fix compile with PID_DEBUG 12 years ago
daid303 9b160972a1 Merge branch 'Marlin_v1' of github.com:ErikZalm/Marlin into Marlin_v1 12 years ago
daid303 e036750bdf Use the disable macros on initialization. Which fixes a bug when there is no pin defined for stepper enabled (motherboard 4) 12 years ago
Daid fcd9de72ef Merge branch 'Marlin_v1' of github.com:ErikZalm/Marlin into Marlin_v1 12 years ago
Daid 32d4373e0f Add printrboard and brainwave to Makefile. 12 years ago
daid b3ddbcee2a Merge pull request #329 from jcrocholl/Marlin_v1
Add Printrboard and Brainwave to pins.h and fastio.h
12 years ago
Daid 29435dfb4b Proper avr for Sanguino in Makefile. 12 years ago
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. 12 years ago
Daid ca7acbe6d9 Allow specification of which arduino hardware subvariant in Makefile. 12 years ago
Johann Rocholl 33247733e0 Teensylu and Printrboard use different analog pins for thermistors. 12 years ago
Johann Rocholl 621c24a10f AT90USB is only defined after pins.h is included. 12 years ago
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. 12 years ago
Johann Rocholl 4d351b4846 Improved formatting and comments for consistency. 12 years ago
Johann Rocholl a30007caa4 If fastio.h is not messed up then Teensylu and Printrboard are actually using the same pins. 12 years ago
Johann Rocholl 6aa87a7b67 Use the same fastio.h definition for AT90USB1286/7 and AT90USB646/7. 12 years ago
Johann Rocholl b1c38d4c82 Avoid compiler warnings (redefined MOTHERBOARD) in Arduino 1.0 and greater. 12 years ago
Johann Rocholl 42e21bb06e Add support for Printrboard (from https://github.com/lincomatic/Marlin) and Brainwave (from https://github.com/metrix/Sprinter). 12 years ago
Johann Rocholl ce4b5bbeaa Add AT90USB646 support from Sprinter to fastio.h. 12 years ago
Daid f413aa33b3 Small makefile change, posibility to add defines on the commandline, and fix compiling with watchdog enabled when using the Makefile. 12 years ago
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. 12 years ago
daid303 1f27870d41 Fix compiling the watchdog error message when the manual reset watchdog is used. 12 years ago
daid303 c5d4225804 Mistake there, not sure why I did that. My bad. 12 years ago
daid303 529748894c Minor changes in the temperature code for some cleanup. 12 years ago
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. 12 years ago
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. 12 years ago
daid303 16078e47d4 Fixed #325 12 years ago
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. 12 years ago
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. 12 years ago
daid303 6c51fe5039 Fix the bug where the SD percentage calculation is wrong when the file is larger then 42MB 12 years ago
brupje 57429cb9fe Fix for keypad 12 years ago
daid303 97fa2a9c30 Few simple fixes that save RAM, as static strings are stored in RAM by default. 12 years ago
Daid c94ca24adc Fixed #317 12 years ago
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. 12 years ago
Erik vd Zalm dbbf050005 More rambo fixes 12 years ago
Erik vd Zalm f934d0ef5b Merge remote-tracking branch 'tonokip/Marlin_v1' into Marlin_v1
Conflicts:
	Marlin/Configuration.h
12 years ago
Erik vd Zalm e48dfcc2b3 Tmp copy before merge 12 years ago
Erik vd Zalm b98fb17fe9 Small FREQUENCY_LIMIT changes 12 years ago
daid bce67ec2c9 Merge pull request #312 from gege2b/Marlin_v1
Added french translation
12 years ago
Gege 9b1d2483a0 I hope last changes to french translation 12 years ago
Gege b1adc567da Correction to french translation (non-ASCII chars only) 12 years ago
Gege 0807d82af0 Correction to french translation (plain text only) 12 years ago
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.
12 years ago
gege2b bb119739b0 Added french translation 12 years ago
daid df8dd5ac21 Merge pull request #306 from nothinman/Marlin_v1
Added automatic build numbering.
12 years ago
MaikStohn 2b7b1e52b1 allow marlin internal 0°C represenation 12 years ago
Martin Lukasik 2f771b3979 Added automatic build numbering. 12 years ago
daid 9bebe9b631 Merge pull request #302 from nothinman/Marlin_v1
Added Polish translation. Cosmetic changes to English.
12 years ago
daid303 a2032afa3a Fixed #303 12 years ago
Martin Lukasik 6a55ca8370 Added Polish translation. Cosmetic changes to English. 12 years ago
daid303 8f20562f49 Fix some of the crowded code style. And fixed the conditional. #300 12 years ago
daid303 43018a48c4 Fix for a few -Wextra warnings. 12 years ago
daid303 72586eb30a Solved few warnings. 12 years ago
daid303 7a02ba361c Header multiple include protection should match the filename, not just _ARDUINO_H, which is almost bound to go wrong some day. 12 years ago
daid303 f4a89ec776 SDCARDINSERTED is always defined, and thus we do not need the #ifdefs. 12 years ago
daid303 57834776ad Made the 2nd speed lookup table condition more explicit. 12 years ago
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 12 years ago
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. 12 years ago
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). 12 years ago
daid303 40ce057a3e Fixing issue #297 12 years ago
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! 12 years ago
daid303 ffc69537aa Update on some comments, make the MOTHERBOARD list complete again. 12 years ago
daid303 71efcfc648 Most likely fixing issue #295. 12 years ago
daid303 04be9d6001 God damn. Sorry, my mistake, forgot to add this file. 12 years ago
daid303 c17da4b707 Add ConfigurationStore to the Makefile. 12 years ago
daid ccd9fd0dc3 Merge pull request #292 from jothan/lcdfix
Lcd fixes
12 years ago
Jonathan Bastien-Filiatrault 46b9988e26 Search and replace failure. 12 years ago
Jonathan Bastien-Filiatrault 0f73afb0b0 Avoid defining overriding definitions for the RepRapDiscount Smart
Controller. Remove common definitions. Harmonize declaration order.
12 years ago
Jonathan Bastien-Filiatrault 36b452c7ac Remove abbrs. 12 years ago
YanFM 332344bd43 Update Marlin/language.h
Included Portuguese language
12 years ago
daid303 e6c1cadea0 Set the watchdog to a 4 second timeout, as with 1 second it can timeout during SD card init. 12 years ago
daid faea7d72b8 Merge pull request #290 from buildrob/Marlin_v1
Clean up special serial port cases
12 years ago
daid303 12a4d60e18 Fix the EEPROM storage, no longer inline it at multiple locations, and remove the template. 12 years ago
Jonathan Bastien-Filiatrault 9606f4d04f Include Marlin_main.cpp in source files. 12 years ago
Jonathan Bastien-Filiatrault 3cbaad9288 RepRapDiscount Smart Controller pin definitions. 12 years ago
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.
12 years ago
daid303 5a998558a9 Update suggested by Robert F-C. #289 12 years ago
daid303 f6ff0ab767 signed/unsigned fixes. 12 years ago
daid303 5d471e0f34 Also reset the PID values to defaults. Fixes #281 12 years ago
daid303 d3ebc34958 Hopefully also support chips with a single UART in MarlinSerial now. 12 years ago
daid303 b6ff45254e Better explain the watchdog "problem" and rename the config define so it explains that the feature belongs to the watchdog. 12 years ago
daid303 7e348fcb5f By mistake enabled the watchdog by default. This should be off by default. 12 years ago
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. 12 years ago
daid 539f3b3fe4 Merge pull request #284 from brackendawson/Marlin_v1
Use the right pins for Gen7 1.4
12 years ago
Robert F-C 65c9a0728f Set default serial port back to 0. 12 years ago
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.
12 years ago
Bracken Dawson f5631a89e8 Add dummy Emergancy Pin to Gen7 1.4
Change required after pulling from ErikZalm.
12 years ago
Bracken Dawson a4f9e1ebf2 Merge git://github.com/ErikZalm/Marlin into Marlin_v1 12 years ago
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.
12 years ago
ErikZalm a7e40b2903 Merge pull request #276 from setar/Marlin_v1
Fix num of digits on LCD for E and Z axis.
12 years ago
MaikStohn 6ed02c86be Fixed wrong code (will not even compile when EXTRUDERS>2) 12 years ago
Sergey Taranenko 2a67363e27 Fix ‘prog_uchar’ definition in LiquidCrystalRus.cpp 12 years ago
Sergey Taranenko 205304ddee Merge git://github.com/ErikZalm/Marlin into Marlin_v1 12 years ago
Erik vd Zalm 58bca87c72 fix LCD temp bed artifacts on power up ' B022/0.) -> B022/000 ' 12 years ago
Erik vd Zalm febeb43197 Revert "fix LCD temp bed artifacts on power up ' B022/0.) -> B022/000 '"
This reverts commit cb02c2f9d8.
12 years ago
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
12 years ago
ErikZalm 70f57a6844 Merge pull request #273 from setar/Marlin_v1
fix LCD temp bed artifacts on power up ' B022/0.) -> B022/000 '
12 years ago
ErikZalm ff14199e58 Merge pull request #270 from jothan/Marlin_v1
Create an explicit rule for building applet/Marlin.cpp.
12 years ago
Daniele Sdei 695938ba3f Italian language support 12 years ago
Sergey Taranenko cb02c2f9d8 fix LCD temp bed artifacts on power up ' B022/0.) -> B022/000 ' 12 years ago
Jonathan Bastien-Filiatrault e4a5e333ef Generalize. 12 years ago
Jonathan Bastien-Filiatrault e10d3136c8 Create an explicit rule for building applet/Marlin.cpp.
It would seem that the pattern matches do not work when the source
file is created when make is running. The result of this is that it is
necessary to run "make" twice to build the firmware.

This adds an explicit rule without a pattern match for building
applet/Marlin.cpp it corrects the make behaviour at the cost of adding
a little redundancy in the Makefile.
12 years ago
ErikZalm 9f089756b7 Merge pull request #265 from setar/Marlin_v1
Added Russian translation
12 years ago
brupje 326423719f Add support for Megatronics 12 years ago
brupje d07b6e93d5 Add support for Megatronics 12 years ago
Sergey Taranenko efcc28d347 Fix check for include LiquidCrystalRus.h 12 years ago
Sergey Taranenko cfc193cdac Enables support the Cyrillic alphabet for LCD 12 years ago
Sergey Taranenko 24bcc9647d Added Russian translation 12 years ago
Mark Finn bf7e453d02 Unwanted artifacts from unclean merge of bed-pid tree 12 years ago
ErikZalm 36a746d7d5 Merge pull request #244 from markfinn/pidbed
PID for heated bed
12 years ago
elgambitero df09e2adce Spanish updated 12 years ago
elgambitero ddf6603d81 Spanish language updated. Bug fixes on dialogs. 12 years ago
elgambitero 4bf8b1aeee fesfas 12 years ago
drakelive be1e099f1b Union whit Erick version 12 years ago
elgambitero 7afd202b89 New dialogs translated to spanish. Bug fixes.
Dialogs from M119 translated, and "Set Preheat" dialogs adapted to the
screen size.
12 years ago
elgambitero ebc4601185 Some new dialogs translated to Spanish 12 years ago
drakelive c8ea9b0e58 Merge branch 'Marlin_v1' of https://github.com/Drakelive/Marlin 12 years ago
drakelive ca7ca4572e primo commit 12 years ago
johnnyr 8016f058bc fix max endstop pins 12 years ago
Mark Finn d197f8504b clean up and changes from testing 12 years ago
Mark Finn eb06a886c4 missed 12 years ago
Mark Finn 04631d2250 cleanup for pull 12 years ago
Mark Finn 0a5ad3ab85 move comment to correct place 12 years ago
ZetaPhoenix 8ac5b29e02 Changes to M119 response for easier visual comparison
Changed to report on individual lines with "TRIGGERED" or "open" instead of "H" or "L" on one line as H&L could be confused with logic levels High and Low which may be wrong if using inverted logic.  Added strings to language.h.

Fixed typo "deu" in English language that was fixed in #134 but got added back in via 9f7f7354f5
12 years ago
ZetaPhoenix c6caa45ae2 Limit Switch locations based on MIN/MAX limits and homing direction
fixes #246
Added statements to set the limit switch positions to the maximum travel if homing in the positive direction as well as bed center at (0,0) if defined.
Relocated code based on feedback.
12 years ago
ZetaPhoenix dc566d654f fixes #246
Added statements to set the limit switch positions to the maximum travel if homing in the positive direction as well as bed center at (0,0) if defined.
12 years ago
ErikZalm ba898faa7d Merge pull request #249 from gwelchc/patch-2
Slight modification for byte savings
12 years ago
ErikZalm 0152ee71a5 Merge pull request #248 from gwelchc/patch-1
Binary representation for characters in ultraldc.pde
12 years ago
G. W. C. 6ccbfeb80c Update Marlin/Marlin.pde
Added function 'setTargetedHotend' that turns into a function an operation repeated 3 times through the M-codes processing.

This modification saves a few bytes that can be used to add support for new commands.
12 years ago
G. W. C. c433142abf Update Marlin/ultralcd.pde
The joris' char drawins are expressed in binary so to show their content's in a more visual fashion.

This is not a code modification as much as a readibility modification.
12 years ago
andrey-vasilyev 1d389ad3a8 Fix M81 not working reliably on Gen7
Some discussion of the issue is here http://forums.reprap.org/read.php?181,118329,page=1
12 years ago
Mark Finn 9698f4ea64 bed pid
Conflicts:

	Marlin/Configuration.h
12 years ago
drakelive e5c39b7c2a commit 12 years ago
ZetaPhoenix e8c92e0a95 Missing #else in temperature.cpp prevented reading bed temp when TEMP_BED_PIN <7. Thanks to Leland Wallace for helping me track this down via "Sesame Street" coding (what is not like the other) 12 years ago
drake bf2071871c Merge branch 'Marlin_v1' of https://github.com/Drakelive/Marlin 12 years ago
drake fc32e20881 first commit 12 years ago
Erik vd Zalm abf0693e8e Added KILL_PIN -1 to gen7 boards 12 years ago
Erik vd Zalm 47319cf64e Fixed typo in SF arc fix code. 12 years ago
Erik vd Zalm e358a2d7af Added fix for SF Arc Point fillet procedure 13 years ago
ErikZalm 044a64a1fb Merge pull request #225 from Justblair/Marlin_v1
Added PDF file containing Menu Tree for documentation purposes.
13 years ago
Drakelive d728e35658 Update Marlin/pins.h 13 years ago
tonokip 1c1fddc7ac Added support for the Rambo reprap electronics board. Added Mcodes to set
motor current and microstepping pins.
13 years ago
Blair Thompson dcd3e8a211 Tidy up 13 years ago
Blair Thompson ddd9d0cfd4 Added PDF file containing Menu Tree for documentation purposes. Source xlsx document included. 13 years ago
Erik vd Zalm 0e58ef6805 Some dialogs are corrected 13 years ago
Erik vd Zalm 0e89022cc3 Correct temptable_55 name. 13 years ago
Bracken Dawson 47d4f55bc0 Fix Gen7 1.4 pinout
Gen7 1.4 uses very different pin assignments, might as well make a new
section and remove some of the conditionals from each. It's easier to change
your pin assingment this way if like me you don't wire it exactly to plan.
13 years ago
elgambitero 6cd150842f Update Marlin/language.h
Some dialogs corrected and Default language set to 1
13 years ago
elgambitero 299c18596f Update Marlin/language.h
Some dialogs are corrected
13 years ago
ErikZalm b86336c3f5 Merge pull request #221 from daid/Marlin_v1
Long filename support for LCD display
13 years ago
daid b69e75c89a Added long filename support. 13 years ago
stohn 1d224cc031 merged with upstream and FIXED AGAIN bad translation commit
PLEASE BE MORE CAREFUL WHEN SUBMITTING NEW TRANSLATIONS

When you add new menu items / messages always copy them to ALL
languages (just use english)
13 years ago
stohn 06c03fe2f0 new method for message for making KILLED message visible
The cli(); at the start of the kill() function also stops the internal
arduino timer which stops updating of millis() which prevents the
display of the "KILLED." message.
The new function updates the display directly without checking any
timers.
13 years ago
daid 87ff61a8a6 Fix for #201 13 years ago
Blair Thompson aacbebbebe Added Menu Options to the Main-> Control->Temperature Submenu that allow the user to set new values for the ABS and PLA preheat function. EEPROM updated so that these settings can also be committed to EEPROM memory. 13 years ago
stohn 31873ec707 changed int to long to overcome overflow of number display
- related bug reports: Issue #201, Issue #213
13 years ago
stohn de0448343f added KILL_PIN support / cleaned up manage_inactivity function definition 13 years ago
stohn 69961dbba3 fixed incorrect menu messages from last commit...
- removed several multiple definitions of same message
- fixed definition of missing messages in german and spanish
- tweaked german translation (a lot)
- added note about changing and testing this file
13 years ago
Blair Thompson 6c050b8440 Fixes error introduced at commit aee475aa55 which caused the sketch not to comile for language option 1. Several defines were removed but still referenced in ultralcd.pde 13 years ago
Blair Thompson b9f9f8f7d3 The pre-heat ABS and PLA options in the LCD Menu were broken a while back. The pre-heat worked fine, but the cooling fans were not switching on as intended. This is now fixed. 13 years ago
elgambitero d38b96fff1 Update Marlin/language.h 13 years ago
Erik vd Zalm 9f7f7354f5 Set default language 1 13 years ago
elgambitero aee475aa55 Update Marlin/language.h
Spanish language included. It features the LCD screen messages and a small part of the Serial messages.
13 years ago
Erik vd Zalm 9083966c22 Do not use feedrate multiiply on Z and E only moves. 13 years ago
Erik vd Zalm 5406c533db Disable FAST_PWM by default. On some systems it does not work ok. 13 years ago
Erik vd Zalm f92dc91c3d Enable M503 also when eeprom is disabled 13 years ago
James Adams 35a1dd081f no message 13 years ago
James Adams 5131ab19ca Fixed Retract in LCD Menu 13 years ago
James Adams 96f4f90cb3 Added pause and retract lcd menu items 13 years ago
James Adams e10355500d Updated Language.h with pause, resume, and retract 13 years ago
ErikZalm a97c006bbf Merge pull request #195 from kobaan/Marlin_v1
Updated german translations in language.h
13 years ago
ErikZalm f062794a0d Merge pull request #208 from Enchiridion/Marlin_v1
Added support for dual Z axis stepper drivers
13 years ago
ErikZalm 57468d3c21 Merge pull request #210 from Dabble63/Marlin_v1
Add Duty Cycling to the Heater Bed
13 years ago
Dabble63 6b45e9f167 Add Duty Cycling to the Heater Bed 13 years ago
Ian Jackson adee81170d M206: save values in eeprom
Really, we should have a way to adjust the XYZ homing of a machine in
the eeprom.  So as the second stage of this, make the M206 home offset
parameters subject to the M500/M501/M502/M503 eeprom commands.

Bump the eeprom version to "V06".

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
13 years ago
Ian Jackson 1dba212e18 HOMEAXIS: make into a function
Replace the large macro HOMEAXIS with a function.  This avoids the
compiler generating three copies of largely identical code.  The
saving is 724 bytes of program memory.

We make use of XYZ_CONSTS_FROM_CONFIG to provide convenient
array-shaped access to MAX_LENGTH, HOME_RETRACT_MM and HOME_DIR.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
13 years ago
Ian Jackson 7bb326d389 eeprom: provide smaller code for SERIAL_ECHOPAIR
SERIAL_ECHOPAIR implies, eventually, two calls to MYSERIAL.print.  One
of these has FORCE_INLINE for a per-character loop, and both involve
constructing a method call rather than a simple function call.

Produce better and smaller code by providing three specialised
functions serial_echopair.  This saves 672 bytes of program memory
(with EEPROM_SETTINGS and SDSUPPORT enabled).

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
13 years ago
Ian Jackson 957e966d2d M206: always use homing ("homeing") offsets
Previously the parameters set in M206 would only be used if a G82
command was sent with specific axis home values.  This limits its
usefulness.

Really, we should have a way to adjust the XYZ homing of a machine in
the eeprom.  So as the first stage of this, make M206 affect every
home command.  The values set using M206 are now added to the
configuration variables [XYZ]_HOME_POS.

This is achieved by replacing all uses of [XYZ]_HOME_POS in the code
by a new home_pos[] which includes the adjustment.  We also have to
adjust the uses of [XYZ]_{MIN,MAX}_POS similarly - see below.


To allow axis_is_at_home to be written as a function taking an axis
index rather than a macro taking an axis letter, we provide
constant arrays in program memory containing the values of
[XYZ]_{MIN,MAX,HOME}_POS from the compiled-in configuration.

This is done with some helper macros to deal with the declaration
(XYZ_CONSTS_FROM_CONFIG) and definition of the inline function which
does the program memory access.

We also introduce the overloaded function read_pgm_any, whose
instances are produced with DEFINE_PGM_READ_ANY, which allows the
access functions to automatically produce the correct type.

The type- and pointer-massaging code in the access function boils
down, when compiled, to a simple program memory access.


A question arises: if the M206 offset is set, should this adjustment
to the home position shift or change the possible range of movement
permitted by the software endstops ?

The documentation in Configuration.h describes these limits as:
    // Travel limits after homing
Since this is a file containing physical limits, and actual suggested
values for these configuration parameters appear to include a certain
amount of slop, I've taken the view that these should be regarded as
nominal physical distances from the limit switches, and that the
permissible travel should be unaffected by M206.

So for example with the (rather unrealistic)
  #define X_HOME_DIR -1
  #define X_MIN_POS -20
  #define X_HOME_POS 0
  #define X_MAX_POS 100
no matter the setting of M206 X, the machine would be permitted
to move from 20mm "beyond" the limit switch trigger point in
the negative X direction and 100mm away from the limit switch in
the positive X direction, for a total travel of 120mm.

With M206 X-10 that would be considered to correspond to X coordinates
-30 to +90.  With M206 X+10 that would be considered to correspond to
X coordinates -10 to +110.


fixes #200 (in ErikZalm/Marlin).

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
13 years ago
Ian Jackson faccb35850 software_endstops: use *_MIN_POS and *_MAX_POS for arcs
If [XYZ]_HOME_POS and [XYZ]_MIN_POS aren't 0, these corrections are
wrong.  Use the same logic as in Marlin.pde:prepare_move: ie, clamp to
[XYZ]_{MIN,MAX}_POS.

While we're here, put this cut-and-paste code in a function
clamp_to_software_endstops.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
13 years ago
Ian Jackson 3f15b7c7b8 Makefile: Better display of size (device memory usage)
Run avr-size with the --mcu=... -C option as well.  That reports how
much actual device program and data memory is used along with a
percentage fullness.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
13 years ago
Ian Jackson 0c35facc94 Makefile: support V=1
Often it can be useful to see the actual commands being run by make.
Other projects (eg, the Linux kernel) support this with a "V=1" make
parameter.  Do the same here.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
13 years ago
Ian Jackson 71404eef29 .gitignore: Add *~, *.orig, *.rej, move to root directory
Move the .gitignore out of the Marlin subdirectory so it applies to
the whole tree, and add some missing patterns.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
13 years ago
Ian Jackson a873541ef6 Marlin.pde: include comment for emacs mode
Emacs by default doesn't recognise a ".pde" file as C++ source code.
Add the annotation to the top of the file to make it work.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
13 years ago
Enchiridion 50cde90324 Added support for dual Z axis stepper drivers 13 years ago
kobaan 603a5e25b3 Updated german translations in language.h and eliminated a few double lines. 13 years ago
Chris Palmer 538189cc19 Fixed soft limits when the origin is in the middle.
HOME_POS is now always where the endstop is and can be outside the limits.
The limits are now defined by MIN_POS and MAX_POS rather than HOME_POS and MAX_LENGTH.
The Z is axis now homed first if direction is away from the bed.

Saguinololu limit pins change from MIN to MAX according to the homing direction.
13 years ago
ErikZalm 686011a548 Fixed typo 13 years ago
Erik van der Zalm cd57bf305b Merge git://github.com/daid/Marlin into Marlin_v1
Added invert step pins to corexy code
13 years ago
Erik van der Zalm ea2c19f978 Added CoreXY support (Thanks Ilan Moyer) 13 years ago
Erik van der Zalm aa65fe22ed decoupled axes sucessfully at least on pure x or y jog 13 years ago
daid 12de8fff81 Support step motor controllers with active low step pins. 13 years ago
Erik van der Zalm b67dacdc8f Fixed AD595 define 13 years ago
Bernhard d3002ef741 corrected retract 13 years ago
Bernhard 0c123950e9 __ header file replace 13 years ago
Bernhard bf077125b9 added firmware retract. disabled by default 13 years ago
Bernhard 0e5e249ab5 added individual pullup setting option to have finer control in case there is a special z-min sensor, for example 13 years ago
Bernhard Kubicek 6b14f95b3e Merge pull request #170 from linagee/Marlin_v1
Marlin v1
13 years ago
Bernhard Kubicek c7ce99d495 Merge pull request #172 from daid/Marlin_v1
Add M401 - Wait for user to press button on LCD (with optional timeout) minor fix in M115.
13 years ago
Bernhard Kubicek b7fc14bc65 repaired thermistortable_6 by graphcial fitting of the off-slope values. see issue 179. Erik, I know you asked for no changes, but this file probably is not related and hopefully allright. 13 years ago
ErikZalm 9e1021efbe Fixed SL bug. 13 years ago
Daid e9bec9b6fe Fixed E1_ENABLE pin for Ultimaker. This was wrong for the 1.5.4 and 1.5.3 PCB (I cannot check the 1.5.6) 13 years ago
linagee fbd282b3ba Update Marlin/Configuration.h 13 years ago
linagee 2e8c5049c5 Update Marlin/thermistortables.h 13 years ago
linagee 2d0d8e5272 Small correction. 13 years ago
Daid 4d7fe7115f Changed M401 to M0/M1 as suggested, so they match normal CNC stop commands. 13 years ago
linagee 9e9db65c3f Update Marlin/thermistortables.h 13 years ago
linagee bd966ef389 Update Marlin/thermistortables.h 13 years ago
linagee 775da3f103 Added top ratings and extended to ADC=1 for table 3 and 5. 13 years ago
linagee 96a4baa0be Update Marlin/thermistortables.h 13 years ago
linagee 2aa9f7b131 Update Marlin/thermistortables.h 13 years ago
linagee c4490f5f3d Update Marlin/Configuration.h 13 years ago
linagee dd9144994e Tested May 19 - It works! Verified with separate thermocouple TM-902C also. 13 years ago
linagee 4c37d0d9f1 Extended range above 250C. (Operating range states up to 300C) 13 years ago
Daid b59724e42b Add strigification for extruder amount in M115 report. 13 years ago
Daid 16413bb8f2 Last M401 update, refresh the LCD during an M401 wait. 13 years ago
Daid b3941fce5c Update after testing 13 years ago
Daid d494688565 Do not initialize in the header file. 13 years ago
Daid 516ec90242 Add M401 - Wait for user on LCD button press 13 years ago
Daid 7244aa7eb7 Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into Marlin_v1 13 years ago
linagee de2ca3b2e8 Grammar correction. 13 years ago
linagee c2fc466e1b Update Marlin/Configuration.h 13 years ago
linagee 241f5a4c0e Update Marlin/thermistortables.h 13 years ago
linagee 9f9f498491 Update Marlin/Configuration.h 13 years ago
Erik van der Zalm e31bef31ad Limit PID autotune PWM to PID_MAX 13 years ago
ErikZalm b2a9ccdb97 Merge pull request #159 from MaikStohn/Marlin_v1
Marlin v1 - BUG FIXES / CORRECTIONS
13 years ago
Erik van der Zalm d459fb41b7 Merge branch 'Marlin_v1' of github.com:ErikZalm/Marlin into Marlin_v1 13 years ago
ErikZalm 804e0d6117 Merge pull request #164 from guanix/Marlin_v1
Melzi support
13 years ago
Erik van der Zalm ba96059203 add additional dropsegments test 13 years ago
zittix fbd91ab0b5 Fixes #153 for bad call to abs() 13 years ago
MaikStohn b51c06e2b3 Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into Marlin_v1 13 years ago
MaikStohn 159ae90874 bug fix for scrolling of main menu when using SMALL_DISPLAY (2 lines only) 13 years ago
MaikStohn e48f5aa6a7 fixed typo 13 years ago
MaikStohn 1efe9ab497 changed encoder pos from int to long to fix problems setting x/y/z/e stepps_per_mm using the lcd menu 13 years ago
Guan Yang 602c8ee02b Melzi support 13 years ago
Daid 279d00da9f Fixed #if for Ultimaker. 13 years ago
Bernhard Kubicek 451f9cc6d1 Residual in the comments: there are no more mm/minutes but only mm/sec in the planner buffer. 13 years ago
Erik de Bruijn e3fe1f0d00 Made a more granular configuration possible PREVENT_LENGTHY_EXTRUDE. You can now decide to allow/disallow large length of extrusions to be executed.
Turning off the protection might be beneficial to those who want to do fast and long reversals.
13 years ago
Erik de Bruijn d88205d89d Suggestion to improve (TODO), no actual code changed 13 years ago
Erik de Bruijn 5aa80e6c05 Made language.h more flexible. Automatically do the right defines based on MOTHERBOARD == 7 ? "Ultimaker" : "Mendel" 13 years ago
MaikStohn b657a18449 Revert "magic PROGMEM defines to avoid hundreds of wrong GCC warnings"
This reverts commit 3682d9bd5b.
13 years ago
MaikStohn d188ae4c9d added missing declaration of buttons_init()
This is required when moving the buttons_init() function to the
lcd_init() function
13 years ago
MaikStohn 3682d9bd5b magic PROGMEM defines to avoid hundreds of wrong GCC warnings 13 years ago
MaikStohn 032df0b2c6 Moved LCD initialization out of constructor
Since the class "MainMenu" was used within a static variable the
initialization of the object (constructor call) was done before Arduino
library startup. It always caused a crash when using AVRStudio with
JTAG debugger (caused from calling the LCD initialization / the lot of
I/O work / the stack used during this calls). By moving the LCD_INIT
out of the constructor and using an explicit call inside of Arduino
setup() implementation immediately fixed all problems and the JTAG
debugger runs fine.
13 years ago
MaikStohn bd1ad7c76a explicit includes to make it compile with AVRStudio/Eclipse 13 years ago
MaikStohn 060b38de5c delete obsolete and wrong code
"i" runs from 0 to 4 but "add_homeing" array size is 3 only. On the
other hand the calculated value gets overwritten by either one of the
if choice.
13 years ago
MaikStohn 789ba02d43 fixed typo in comment 13 years ago
Erik van der Zalm 1874cb71a6 Added option to increase the FAN PWM frequency. 13 years ago
Erik van der Zalm 6a5a34e0ff Small cleanup 13 years ago
Erik van der Zalm e3821bd86f Merge branch 'Marlin_v1' of github.com:ErikZalm/Marlin into Marlin_v1 13 years ago
Erik van der Zalm 02af69911e Added temperature window to M109. This is needed for systems with no overshoot PID. 13 years ago
ErikZalm e203b8c754 Merge pull request #154 from daid/Marlin_v1
Added 2nd extruder temperature LCD readout and setting.
13 years ago
ErikZalm 362ddc4efc Merge pull request #155 from Atntias/patch-1
adding M120 and 121 for turning on and off the endstops only for homing
13 years ago
sefi c27081aa4a Fix to allow M120/M121 13 years ago
sefi e11e072eca adding M120 and 121 for turning on and off the endstops only for homing function 13 years ago
Daid 8e68c6cf89 Show proper temperature for extruder 2 13 years ago
Daid 8503b78876 Added support for 2nd extruder temperature to UltraLCD 13 years ago
Logan Bowers 3eacb4c16d Wrap the call to turn off the bed heater in a #if to prevent a compile error on boards that do not have a bed heater 13 years ago
Bernhard e4d2138dbd reinitialize the lcd, if the SD card is inserted or removed. It seems that LCDs can confused by electrical discharges from time to time.
Since a removal or insert of the sd card takes a long time in firmware, just reinitializing the lcd does not hurt.
actually, it solves a problem with the UltiControlle
13 years ago
Bernhard 464b755918 added support for the UltiController 13 years ago
Bernhard 44fd8d46d2 fixed quickhome 13 years ago
Bernhard 33bb044d7c fixed catsting to (int)e in serial error messages.
see https://github.com/ErikZalm/Marlin/issues/148
13 years ago
ErikZalm c2557abc03 Merge pull request #138 from triffid/fix-makefile
make should rebuild if configuration or Makefile is changed
13 years ago
Erik van der Zalm 67cf105bc6 Fixed AUTOTEMP (M109 S215 B260 F1 starts autotemp)
Changed SLOWDOWN. IF this does not work ok OLD_SLOWDOWN is the old algo.
13 years ago
Erik van der Zalm 8aee9d51b6 Disabled disable_heater in PID_autotune. 13 years ago
Daid 414408b2d0 Fix for wrong systax in #ifdef. 13 years ago
Michael Moon 77d503fa13 Fix Makefile 13 years ago
Erik van der Zalm cf7c8c458f Fixed MAX6675 13 years ago
grrf 03b0850e63 This breaks temperature readout for pronterface! 13 years ago
tgiphil ad8bc71d3e - Fixed a typo 13 years ago
Erik van der Zalm 46feae79c6 Fixed typo in arc 13 years ago
Erik van der Zalm 4ca2f336f0 Changed default MINIMUM_PLANNER_SPEED -> 0.05
Fixed small bug in arcs
M105 prints now actual_temp/target_temp
13 years ago
Erik van der Zalm ae0bf8068b Fixed arc offset. 13 years ago
Erik van der Zalm 0c1b863755 Ignore ":" in comments. 13 years ago
Erik van der Zalm 63aec3c56e Replaced Kill by Stop. If the printer is stopped. Fix the error and use M999 to restart.
Moved the PID_dT in the Ki and Kd calculation from the configuration.h to temperature.cpp
13 years ago
ErikZalm 8b785f75a6 Merge pull request #123 from buserror-uk/for-upstream
For upstream
13 years ago
Tommy Cheng 520f1a54a8 Fix compilation error when PIDTEMP is undefined and ULTIPANEL is defined. 13 years ago
Michel Pollet 5550e893d5 New board variant, Open Motion Controller
Open Hardware board currently used by the group build of http://tvrrug.org.uk
The board can be found at http://solderpad.com/folknology/open-motion-controller/

Signed-off-by: Michel Pollet <buserror@gmail.com>
13 years ago
Michel Pollet aa6e6e914e Makefile: Redone
+ Removed most explicit pathnames, use the standard make "VPATH" to let
make find the files for itself.

+ Added a "hardware variant" variable that allows compiging Sanguino and
Gen7 as well as "generic" arduino.

+ Allows overriding the MOTHERBOARD define from the Makefile

+ Removed the 'preprocessor' bit that wasn't needed, now just "include" the
files that are needed, since it allows gcc to show the right file/line
when displaying error/warnings.

+ Uses gcc's own dependency generator to generate the .d files, and
and include these instead of self-patching the makefile

Signed-off-by: Michel Pollet <buserror@gmail.com>
13 years ago
Bernhard 0183e6332a made prepare->autostart independent of current folder. 13 years ago
Bernhard 1532200435 found error in filenames.
One array was too short. This had nothing to do with long filenames, other than if they were 12 characters exactly, which could only happen if the extension and the text before were filled completely
13 years ago
Erik van der Zalm b985e4a134 Fixed compile errors in ultralcd when no ultra_lcd is selected. 13 years ago
Erik van der Zalm 2e749d60c3 Added DISABLE_MAX_ENDSTOPS 13 years ago
Erik van der Zalm 33f5697888 PPID tune exports more constants. 13 years ago
Erik van der Zalm b44055cc51 Merge branch 'Marlin_v1' of github.com:ErikZalm/Marlin into Marlin_v1 13 years ago
Erik van der Zalm f5eae52098 Added more manage_inactivity checks 13 years ago
ErikZalm 19a47dae4a Merge pull request #99 from Justblair/master
Better pin configuration for rotary encoder in RAMPS boards
13 years ago
Erik van der Zalm 910f4e77a2 Added 20MHz support. 13 years ago
ErikZalm 7cefad3744 Merge pull request #106 from bgamari/Marlin_v1
Make F_CPU dependence of stepper.cpp more explicit
13 years ago
Erik van der Zalm 87ff2f8867 Added CONTROLLERFAN. (Controlling a fan to cool down the steppper drivers) 13 years ago
Erik van der Zalm 387fe51a56 Do not disable steppers when there are moves in the queue. 13 years ago
Erik van der Zalm 421264e58a Fixed typo 13 years ago
Erik van der Zalm 15ad923310 Removed !!!. Stupid arduino bootloader can't handle this. 13 years ago
Erik van der Zalm 61e09e6be2 Added FAN_PIN -1 checks 13 years ago
Erik van der Zalm 87c4e06c24 Corrected active_extruder when autotemp is used. 13 years ago
Erik van der Zalm 7b1e295f34 Merge branch 'Marlin_v1' of github.com:ErikZalm/Marlin into Marlin_v1 13 years ago
Erik van der Zalm c077316b2b Added PID autotune. (experimental)
M303 Starts autotune. Wait till the Kp Ki and Kd constants are printed.
Put these values in Configuration.h
13 years ago
Ben Gamari 49b228c4b3 Add instructions to regenerate speed_lookuptable when changing F_CPU 13 years ago
Ben Gamari 96509494f0 stepper: Clarify comment on timer-counter configuration 13 years ago
Ben Gamari 6d7e6a11fc Add create_speed_lookup 13 years ago
Tommy Cheng ce07c9186d While Waiting for hotbed to warm up via M190, LCD Display and Click Encoder input freeze until target temperature is reached. 13 years ago
Erik van der Zalm 116dc86b8a Fixed type in e-jerk 13 years ago
Blair Thompson 02ee9e3d30 Changed Pin Assignment for the RAMPS motherboard so that LCD and Rotary encoder are all wired to AUX-4
This simplifies wiring for those with RAMPS 1.3 and 1.4 boards.
13 years ago
Erik van der Zalm e056bf8081 Added E-Jerk 13 years ago
Erik van der Zalm 4deeffbc88 Added missing defines to the german section.
Translation still needed.
13 years ago
Erik van der Zalm 632528aa95 merging with SCUBA82 13 years ago
Erik van der Zalm aac7aa3bf0 Queued fan control. Issue #90 13 years ago
Christian Thalhammer fde51084f3 set SD file delete to M30; switch printime output to M31 13 years ago
Erik van der Zalm 21e2bae063 Changed (corrected?) SD_card comment handling. 13 years ago
Erik van der Zalm e509bbf636 Merge branch 'Marlin_v1' of github.com:ErikZalm/Marlin into Marlin_v1 13 years ago
Erik van der Zalm 072011a3ef Added current_block = NULL to quickStop() 13 years ago
ErikZalm 2422a857a1 Merge pull request #96 from haxar/Marlin_v1
make analog2tempBed return a precise celsius reading for BED_USES_THERMISTOR, ...
13 years ago
Erik van der Zalm f598077af3 Removed vc files 13 years ago
Erik van der Zalm cb0c84e075 Merge remote-tracking branch 'justblair/master' into Marlin_v1 13 years ago
ErikZalm 1d5809d458 Merge pull request #88 from daid/Marlin_v1
Made plan_buffer_line arguments const...
13 years ago
Erik van der Zalm ed951b1977 Fixed RAMPS 1.2 support (Found and fixed by rrhb) 13 years ago
Blair Thompson 4879de08e8 The percent complete for the SD file statistic sits squint. Changed "lcd.Setcursor (7,2);" to "lcd.Setcursor (10,2);".
The percent complete now lines up with the temperatures and Z-axis position figures, nicer to read and nicer to look at IMHO.
13 years ago
Blair Thompson f278e1c00f This is in my opinion a much better way of dealing with SD cards than my previous fix.
Instead of adding a momentary switch to fake the insertion of the card I have modified the ultralcd menu item:

Card Menu -> Refresh

to reinitialise the card providing that the SDCARDDETECT pin has been set to -1 in the pins.h file.  This requires one less switch on the front panel and the refresh menu item is in the most relevent place for a user who wishes to inert a card and then print from it.

It also means that the "Card inserted" messages do not bother the users of these card readers (they dont make sense for users without SCCARDDETECT)
13 years ago
Blair Thompson 046a8e0039 Added more defines to the language.h file so that nowe most of the text strings are now configured via this file. Still got some hunting down to do to complete this task. 13 years ago
haxar 79a466ca26 make analog2tempBed return a precise celsius reading for BED_USES_THERMISTOR, complementing changes to analog2temp in d15f01e 13 years ago
Christian Thalhammer 5f3a422e68 added M31 - delete file from sd card 13 years ago
Christian Thalhammer fa2e3a40e9 fixed LCD manual z axis move Feedrate to 70 (was 1700) 13 years ago
Christian Thalhammer a92b3afe64 added german translation;Menue should be in english.. sounds better 13 years ago
Christian Thalhammer 9fa586bbed fixed languages; Preheat_PLA and Preheat_ABS was not defined for non
english
13 years ago
Daid 00d33e6b82 Typo fix 13 years ago
Daid 7d124478fa Only protect the heater pins for the defined extruders.
Changed the way the extruder pins are defined so it doesn't create extra -1 entries in the list.
13 years ago
Daid 3d83109028 Fixed general 16x2 LCD build without SD support. 13 years ago
Christian Thalhammer cb02914687 Merge remote-tracking branch 'upstream/Marlin_v1' into Marlin_v1 13 years ago
Christian Thalhammer 10bf2bb8e1 - 13 years ago
Daid d47b666630 Merge branch 'Marlin_v1' of git://github.com/ErikZalm/Marlin into Marlin_v1 13 years ago
Daid 88d289caa1 Made plan_buffer_line arguments const, which optimizes better and fixes the RUNOUT_PREVENTION feature. 13 years ago
Erik van der Zalm b4833d55c2 Fixed HOME_POS in combination with G28 X0 or G28 Y0 13 years ago
Erik van der Zalm c6f2ec3c82 remove stop_heating_wait 13 years ago
Erik van der Zalm b48d67ce10 Fixed homing 13 years ago
ErikZalm 071eec7aa7 Merge pull request #81 from phord/09469add5560ca8a676c42e4bcd499868c33f0dd
Clean up and add some trace info
13 years ago
ErikZalm 1ebe7d1ab6 Merge pull request #83 from phord/tempfix
Add explicit #define for bogus temp override
13 years ago
Phil Hord b65ef8d66c Add support for upcoming Gen7 v1.4
V1.4 moves thermistor power to the always-on 5v line.
The BOGUS_TEMPERATURE_FAILSAFE_OVERRIDE is no longer
needed on this board.  Add a new motherboard type to
support this feature.
13 years ago
Phil Hord 740f0c7690 Add explicit #define for bogus temp override
The code to ignore the "bad thermistor reading failsafe"
suicide function depends on the existing of the PS_ON pin
feature.  But in some boards this shouldn't be the case
Fix this by adding an explicit definition to make our
intentions more clear and separable.
13 years ago
Phil Hord ba8500a236 pins.h: Define Z_MAX_PIN for Gen7 board
The Z_MAX_PIN value was defined as no-value, but this causes
the compile to fail.  Fix this by setting the Z_MAX_PIN to the
correct value (which happens to be 0 for pin PB0/DIO0/0).
13 years ago
Phil Hord 09469add55 Add board reset reporting (from Repetier-Firmware) 13 years ago
Phil Hord f3101e96d9 Add suitable .gitignore to avoid build noise 13 years ago
Phil Hord 245dca4bee Makefile: generic pde=>cpp rule
This adds flexibility to the makefile by allowing different pde
targets to be specified for different needs.
13 years ago
Erik van der Zalm 97d42ca2b2 SDSUPPORT default disabled 13 years ago
Changwoo Ryu 7b14953c99 Fix build on Sanguino based boards with ATmega1284P 13 years ago
Daid 286d5003fa Fixed compiler warning for Sanguino compile 13 years ago
ErikZalm 66d50562b6 Merge pull request #76 from iXce/Marlin_v1
Fix Makefile
13 years ago
Erik van der Zalm 27f595a444 Changed version => RC2 13 years ago
Erik van der Zalm 018c567abf Moved SLOWDOWN function. (jetty840)
Included AD595 calibration options. (daid)
13 years ago
Erik van der Zalm 4fbda5c3f5 Merge remote-tracking branch 'daid/Marlin_v1' into Test 13 years ago
Erik van der Zalm ce714fe306 Fixes in pins.h 13 years ago
Erik van der Zalm 35e57bf149 Added gen6 deluxe. 13 years ago
Erik van der Zalm 84ea2d61e8 Moved gen7 boards to motherboard type 10, 11 and 12.
Split ramps1.3 in Sprinter like config and multiextruder config.
13 years ago
Guillaume Seguin adc108d79e Correctly build the produced applet/Marlin.cpp source 13 years ago
Erik van der Zalm 5aa9c41ab1 Changed comment mode for detection.
Added M221 extuder multiply factor.
13 years ago
Erik van der Zalm 00690f7ffd Fix cast warning in Gen7 13 years ago
Erik van der Zalm 01d28c18ab Fixed casting warning in sanguino 13 years ago
Blair Thompson 2fd8c248fe Added Fan control to the pre-heat settings.
I find that the PID routine works better when the cooling fan is switched on
at the beginning of a warm up routine.  Otherwise when you enable the fan
just before a print, you have a delay as the PIDre-adjusts.

This should also be safer as most cooling fans are directed at the hot -ends
thermal barrier!
13 years ago
Blair Thompson d9f2f509d5 Added new menu items under the prepare submenu.
Instead of a single pre-heat, now there is pre-heat ABS and PLA options
Added defines to the configuration file to adjust preheat temperatures for both
13 years ago
Erik van der Zalm ae3e7586c6 Added HOME_POS. This adds the posibility to make the center 0
Updated the Xsteps ... settings via the LCD menu
13 years ago
Erik van der Zalm df1437bd86 Changed display format for some numbers. 13 years ago
Erik van der Zalm 8816ef1c64 Small fixes after merge 13 years ago
Erik van der Zalm d298dd121f merged SBUBA82 and Justblair 13 years ago
Erik van der Zalm 2cc9a89830 Merge remote-tracking branch 'SCUBA82/Marlin_v1' into Marlin_v1 13 years ago
Erik van der Zalm a0a1f81913 various changes 13 years ago
Christian Thalhammer 8a8ea50f33 fixed manual axis movement lcd option 13 years ago
Blair Thompson b976692d0f Removed VS project files for tidyness stakes 13 years ago
Blair Thompson fe940a142d Added a structure that will allow easy translations/modifications to the LCD menu.
Signed-off-by: Blair Thompson <mail@justblair.co.uk>
13 years ago
Christian Thalhammer b3fb09a20c change preheat to ABS values of nozzle 227 and be 105 C
next try for manual axis movement
13 years ago
Blair Thompson a05a261b72 Added a workaround. Ramps SD card does not have sdcarddetect. My temporary solution is to add a momentary swtich
that pulls down the SDCARDDETECT pin and mimicking the pull and reinsert ofa a SD card
13 years ago
Blair Thompson 1b6765ed12 Updated the pin config for RAMPS 1.3 to include ultimaker new style LCD/Rotary Encoder interface 13 years ago
Christian Thalhammer 1ff99ae25f ATMega1284P support for Arduino IDE
replace $ARDUINO_HOME/hardware/tools/avr/etc/arduino.conf with this file
13 years ago
Christian Thalhammer e661578c84 support for GEN7 1.1,1.2 and 1.3 13 years ago
Daid 73344e69c1 Added temperature offset/gain settings for AD595. 13 years ago
Christian Thalhammer d309565b56 Merge remote-tracking branch 'upstream/Marlin_v1' into Marlin_v1
Conflicts:
	Marlin/Configuration.h
13 years ago
Christian Thalhammer 0e3631ff4b smaller changes 13 years ago
Erik van der Zalm fa2e1be0ca changed default EXTRUDE_MINTEMP to 170. 13 years ago
Erik van der Zalm 7699f250e3 Fixed small merge bug 13 years ago
Erik van der Zalm 11518a987f merged with triffid fork 13 years ago
Erik van der Zalm 13e185d330 removed unused HEATING_EARLY_FINISH_DEG_OFFSET
Simplified stepper inactive time
13 years ago
Erik van der Zalm b58eae7657 Corrected e-length calculation in planner 13 years ago
daid 2a77c84c8f Updated SERIAL define to MYSERIAL, because Arduino 1.0 defines SERIAL as 0. 13 years ago
Erik van der Zalm d47a3e5950 Changed check i mtion_conrol
if (millimeters_of_travel == 0.0) => if (millimeters_of_travel < 0.001)
(thanks mooselake)
13 years ago
Erik van der Zalm f87c80889f Fixed M109 timer overflow (reported by triffid) 13 years ago
Erik van der Zalm 154de69c02 Print configuration.h version during startup (thanks hairykiwi) 13 years ago
Erik van der Zalm 6ef8459494 Corrected distance calculation. (thanks jv4779) 13 years ago
Erik van der Zalm 598eb1d4f1 Fixed compilation for gcc-4.6.2 with avr-lib-1.8.0 (thanks daid) 13 years ago
Erik van der Zalm 9173a5713b Teensylu support. 13 years ago
Erik van der Zalm da040fd393 Fixed ultimaker heater 1 pins. (Thanks daid) 13 years ago
Erik van der Zalm bdb70c0509 Warning for 10k thermistor 13 years ago
Erik van der Zalm 5113513cb2 RC 1 13 years ago
Erik van der Zalm d8a0c6450f Split the configuration file in two parts.
One for common settings.
One for advanced settings.
13 years ago
Christian Thalhammer 4cc8e37bf1 lcd menue "move_axis" added 13 years ago
Christian Thalhammer b5fae1104b fixed sUICIDE_PIN disable 13 years ago
Erik van der Zalm f9c5333f97 Made "stop heating wait" optional.
Default off.
13 years ago
Erik van der Zalm 292ddd2edb Fix Z_LATE_ENABLE 13 years ago
Christian Thalhammer 25cd8af536 added arduino ide GEN7 support Files 13 years ago
Christian Thalhammer 14702089ee -disable TEMP Min MAX Kill while using PS_ON Pin
ON GEN7 there is no temperature reading when power is off.. so Marlin
would kill itself. There seems to be an update from "Traumflug" on GEN7
using standby VCC for thermistors.
13 years ago
Christian Thalhammer b51e8bf7e5 -disabled CARDDETECT if PIN is set to -1
- redo disable Beeper if PIN is set to -1
13 years ago
Christian Thalhammer 3183a14755 -added Configuration for GEN7 which worked for me 13 years ago
Christian Thalhammer 5edef148fe -disalbe beeper if BEEPER_PIN = -1 13 years ago
Christian Thalhammer 13e2ad2831 - added info for using GEN7 configuration 13 years ago
Christian Thalhammer 59cc5f889e - added support for ATMega1284P 13 years ago
Christian Thalhammer a11f3b2d2f - Pins for modified GEN7 assigned
- Added support for ATMega1284
13 years ago
Erik van der Zalm abb7e63906 fixed z-disable bug. 13 years ago
Erik van der Zalm 9f139d6e0e Added MAX6675 support. (Thanks to gregfrost)
Needs some work to remove the blocking in read max6675.
13 years ago
Erik van der Zalm e45e5c68bb Added support for Gen3+ (Pins file only)
Added late z enable. (blddk request)
Only calculate look ahead if >2 moves in buffer.
Removed some FORCE_INLINE to save memory.

Signed-off-by: Erik van der Zalm <erik@vdzalm.eu>
13 years ago
Michael Moon 9c918a497b more work on Makefile - actually rebuilds if Makefile or Configuration.h are altered, also much cleaner output 13 years ago
Michael Moon ab01658fd2 local configuration stuff- WATCHPERIOD causes breakage, disable. few other misc changes 13 years ago
Michael Moon 42bedb3f60 PROGMEM elements must be const 13 years ago
Michael Moon a991bde523 enable auto-reset before programming, disable afterwards 13 years ago
Michael Moon 3e575533c5 get M81 working 13 years ago
Michael Moon 2ae2ead97b help residency not overflow 13 years ago
Michael Moon 71dc82e0b4 my local configuration 13 years ago
Michael Moon 5aadc2f5ca cardreader needs to include some other files 13 years ago
Michael Moon 8d0916af13 allow Marlin to actually compile with Makefile pulled from Sprinter and a few other modifications 13 years ago
haxar 6cc6029d7a M109 EOL fix when TEMP_RESIDENCY_TIME is undefined; printer interface (pronterface) could not see target extruder heater temperature to continue print 13 years ago
Bernhard 157aa7f2fd m115 eol fix 13 years ago
Bernhard 7aeb45303d small mistake 13 years ago
Bernhard cee5f9020a added suicide pin for a power supply to the arduino that is only active if the arduino is holding high for an output. 13 years ago
Bernhard 3814bbb529 made sd code only compile with SDSUPPORT defined. safes 10k of codespace 13 years ago
Bernhard 729cde4475 fix autostart failure if in wrong directory 13 years ago
Bernhard 396270a0de fix duplicated definition of MOSI MISO pins in case motherboard==33 13 years ago
Bernhard 11f2dafc4e one step closer to a functional makefile.. 13 years ago
Bernhard 8463e39a4a starting with sanguino arduino 1.0 compatibility 13 years ago
Bernhard 2bc160a978 add wiring.h, that can be used to overwrite:
arduino-0023/hardware/arduino/cores/arduino/wiring.h
this is necessary if the avr libraries are recent, but arduino is old. Alternative: newer arduino
13 years ago
Bernhard 57f9359a41 simplified the includes, makefile now works with arduino23 13 years ago
Bernhard 3c1a4aac2b header file simplification 13 years ago
Bernhard 212515148e added m240 photography support. default off 13 years ago
Bernhard 6735025428 cooldown 13 years ago
Bernhard 415aadf704 lcd panel bed support
advance and ultipanel not any more in default config
13 years ago
Erik van der Zalm 554cc1718d Fiexed E_ENABLE_PIN errors 13 years ago
Erik van der Zalm 617968ab76 G92 fix 13 years ago
Erik van der Zalm 84d9cf7339 merging 13 years ago
Erik van der Zalm e017228569 Merged multiple extruder support.
Soft PWM. (Sanguinololu can also have PID temperature control)
Interrupt save WRITE for addresses > 0x0FF
13 years ago
Bernhard 3320a5b37d make autotemp compatile for use without pid 13 years ago
Bernhard 06411d5c9e ultralcd can now also stop the wait loop for the hot-end m109 heating when stopping sd prints. 13 years ago
Bernhard 82c99625fa instant stop of sd prints from the panel. 13 years ago
Bernhard 01001b89d2 repaired nozzle runout prevention to not collide with automatic stepper disabeling. 13 years ago
Bernhard 88ee053af0 heating up santity, formarly knows as "watchdog", but renamed due to the existance of the real watchdog, works now. 13 years ago
Bernhard b1d84d879b st_synchronize back to normal.. 13 years ago
Bernhard Kubicek f6fe7143e4 Merge pull request #29 from k-eex/Marlin_v1
Fix M201 not saving settings in all places, so the changes did not get written into EEPROM
13 years ago
Bernhard dde4b40fa9 disable steppers in runout prevention 13 years ago
Bernhard 2bc5e7ec9e prevent too long extrudes, or too cold extrudes 13 years ago
Bernhard aa4f9a6474 better values. 13 years ago
Bernhard 87fd249c43 made runout prevention independent of tempeorarily set esteps 13 years ago
Bernhard 1ec0c3b68a extruder runout prevention. 13 years ago
Bernhard 5b4625f79c added a partial release option to "m84" aka "stepper release". If you do tiny layers, you might want to keep the z-axis powered to not loose height positioning after homeing. 13 years ago
Bernhard cc4a9cdb69 added autostart procedure trigger to the ultralcd menu 13 years ago
Bernhard 61c943b4bf fixed the st_synchronize. it would have continued if there is only the last move of the buffer being stepped. 13 years ago
Keegi bae1e422f6 Fix M201 not saving settings in all places, so the changes did not get written into EEPROM 13 years ago
Bernhard 754d2d69b2 z homing sound fix, for now until the actual cause is found.. 13 years ago
Bernhard 986f0ba76c moved <stdio.h> to more dominant location. 13 years ago
Bernhard 460b788d78 repaired homing position setting. 13 years ago
Denis B 4fd75dc813 Working version of multiple extruders (up to 3)
- The temperature control is pretty much complete
  (not sure what to do w/ autotemp though)
  Changed the pins assignment to clearly separate bed and extruder heaters
  and temp sensors, changed a bit how termistor tables are handled.
- The steppers control is rudimentary
  (only chanages what pins it uses depending on the active_extruder var,
   but that's enough for switching extruder in the start.gcode in the
   the profiles)
- Tested only w/ RAMPS 1.4
13 years ago
Bernhard 12e8edcac3 Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into Marlin_v1 13 years ago
Bernhard cf50ba140f added M503 to display eeprom storage, and renamed eeprom routings. This version is compatible with the qtmarlin eeprom-tab. 13 years ago
Erik van der Zalm 89e832c295 Update endstops only for homing. (use less resources when not used) 13 years ago
Erik van der Zalm b99c49ec3b Add option to only check endstop when homing 13 years ago
Erik van der Zalm 95a0b28acb Merge branch 'Marlin_v1', remote-tracking branch 'origin/Marlin_v1' into Marlin_v1 13 years ago
Erik van der Zalm af22e9cd38 Some advance modifications 13 years ago
Bernhard 7714b98da7 solved some compiler warnings that are now visible in arduino 1.0.
Found a couple of unused variables, that I commented.
Tried to solve the program memory warning message, and failed.
13 years ago
Bernhard dfd240b260 overworked autotemp, removed one layer of nesting from the ultralcd. 13 years ago
Bernhard 4f909963e4 make QUICKHOME configureable 13 years ago
Erik van der Zalm 6b86f15686 More 2nd extruder implementation. (Not usable)
Advance (not tested)
13 years ago
Bernhard 0bc9daa4f7 make it compile with arduino 1.0 ; function is still untested. 13 years ago
Bernhard b0c3871750 more fixing of the sanguino math round problem 13 years ago
Bernhard 9c57453168 removed stream.h referenece from marlinserial. 13 years ago
Bernhard 59205ac5fc preliminiary implementation for the early heating finish.
Might be replaced by something more clever, e.g. by erik, and does not yet support the second extruder or the bed.
its kind of not so cool, because you need 6 more ints.
Maybe isheating() should use the degrees directly, as it is not used in time-critical anyways.
Then it would be much easier. to have the offsets without additional variables.
13 years ago
Bernhard 7a4be21b4f made it compile if arduino decides to include files in a differnt order. DEC HEX and stuff now defined in MarlinSerial.h 13 years ago
Bernhard 716e89b87c first homing move diagonal towards home switches. 13 years ago
Bernhard d00b7e5587 repaired compiliation in windows 13 years ago
Bernhard e4ab0e5982 more inlines 13 years ago
Bernhard 8cb29921a0 possible stepper release after sd printing 13 years ago
Bernhard 044886b4a0 Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into Marlin_v1 13 years ago
Bernhard b19c8b74b9 force inline 13 years ago
Erik van der Zalm 6d95644c0d Moved M88 into M84. (M84 E) 13 years ago
Bernhard 311627141b Merge branch 'smallopt' into Marlin_v1
Conflicts:
	Marlin/temperature.h
13 years ago
Erik van der Zalm 7216a12856 Disabled M88 for boards that don't have seperate enable pins. 13 years ago
Erik van der Zalm 98805c9228 Added M88 command. (Request from Action68) 13 years ago
Bernhard 85da81e673 inlineing of small functions in serial 13 years ago
Bernhard b9ad0bb2ce removed unecessary indirect register adressing in serial. 13 years ago
Bernhard dd5ca68c87 get rid of indirect ringbuffer calls, made some inlines, removed virtual and streaming class requirements. 13 years ago
Erik van der Zalm dd5296ad4d Fixed temperature reading bug.
(When using the lower and upper adc input bank)
13 years ago
Erik van der Zalm f75f426dfa Removed interrupt nesting in the stepper ISR.
Add serial checkRx in stepper ISR.
Copied HardwareSerial to MarlinSerial (Needed for checkRx).
13 years ago
Bernhard 2d9a715655 first naive attempt to have a offset in the homeing procedure. Does not enable to move into regions not allowed by endstops. 13 years ago
Bernhard d2f034ba84 lcd message from gcode, m117 13 years ago
Bernhard 6aecf80278 add autotemp support to the lcd 13 years ago
Bernhard b128d25f27 overlooked some inlines.. 13 years ago
Bernhard 26a1de1e44 force inline 13 years ago
Bernhard f8e170a44b planner optimization by inline functions 13 years ago
Erik van der Zalm aad4b75b94 First parts 2nd extruder 13 years ago
Bernhard a0dc66f7bf Home retract distance configureable per axis. 13 years ago
Bernhard 6d6f323535 make an option if sd-card stop should release the steppers. 13 years ago
Bernhard 4d6a5c29df disable steppers as routine in stepper.cpp 13 years ago
Bernhard 74d0032e25 cooldown blocking selectable by #define. 13 years ago
Bernhard 191f36b493 slowdown 13 years ago
Bernhard c54a807824 overworked ultralcd a bit 13 years ago
Bernhard a6823a84e1 another typo 13 years ago
Bernhard 57e163e989 typo 13 years ago
Bernhard b58787a367 now velocities are also set in mm/sec in gcode. 13 years ago
Bernhard 71ca78982b Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into Marlin_v1 13 years ago
Bernhard 235051253a overworked lcd+eeprom to have only mm/sec and PID including pid_dt 13 years ago
Erik van der Zalm 27654bfe69 Fixed variable (removed 0x) 13 years ago
Erik van der Zalm cdf0bd4e63 Fixed config bug when EEPROM was disabled 13 years ago
Erik van der Zalm 6ac9b2e761 Fixed residency time bug. (Thanks to Sound :-) ) 13 years ago
Erik van der Zalm ac8adabb2b Small nominal speed improvement. 13 years ago
Erik van der Zalm 0e0e4945d8 Removed ISR overtaken message from ISR routine 13 years ago
Erik van der Zalm c0f8c9fd72 Seperate ENDSTOP_INVERTING for X Y and Z
Added simple endstop filter.
Corrected M114 count display.
13 years ago
Bernhard Kubicek 5535e51bf6 Yes, thats the beta. 13 years ago
Bernhard Kubicek 8b14a8ad34 Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into Marlin_v1 13 years ago
Bernhard Kubicek 924bab1a03 less lcd flickering 13 years ago
Bernhard Kubicek 379ea642e1 make tuneing sub-menu. 13 years ago
Erik van der Zalm 959d82e81e Small temperature disable bug. 13 years ago
Erik van der Zalm 15bb3f284e Merge branch 'Marlin_v1', remote-tracking branch 'origin/Marlin_v1' into Marlin_v1 13 years ago
Erik van der Zalm 4e5becfc51 Added endstop reporting 13 years ago
Bernhard Kubicek eeb4f029db Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into Marlin_v1 13 years ago
Bernhard Kubicek b21d5193f2 made ultralcd compatible with folders. 13 years ago
Erik van der Zalm 2e43f9c809 Changed min max temperature code. 13 years ago
Bernhard Kubicek cd2268f10a code cleanup in ultralcd. 13 years ago
Erik van der Zalm 0e7fee9a9b Merge branch 'Marlin_v1', remote-tracking branch 'origin/Marlin_v1' into Marlin_v1 13 years ago
Erik van der Zalm 915ef2d4a1 Added software endstops 13 years ago
Bernhard Kubicek e87df99e22 update mcode documentation 13 years ago
Bernhard Kubicek 8a1e719a3f overworked config file 13 years ago
Bernhard Kubicek 5ad1d19384 make it compile without sd_support 13 years ago
Bernhard Kubicek 7a2d1f5aeb add M17, so the enable stepper button works in repg. 13 years ago
Erik van der Zalm e02af3e66a Merge remote-tracking branch 'origin/Marlin_v1' into Marlin_v1 13 years ago
Erik van der Zalm 537b5c155d Fixed arc flowrate. 13 years ago
Bernhard Kubicek 953d830bba Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into Marlin_v1 13 years ago
Bernhard Kubicek 2a6afee832 make it compile without autotemp 13 years ago
Bernhard Kubicek f52e1a9571 autotemp working, default=disabled. 13 years ago
Erik van der Zalm 6e6fdb9a4e Merge remote-tracking branch 'origin/Marlin_v1' into Marlin_v1 13 years ago
Erik van der Zalm 6841a10446 Fixed max/min temperature bug 13 years ago
Bernhard Kubicek 8a08b8e07e trying to get autotemp to work. 13 years ago
Bernhard Kubicek f0154de5b3 found bug that disabled printing from root. 13 years ago
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 13 years ago
Bernhard Kubicek 9d90220537 Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into Marlin_v1 13 years ago
Bernhard Kubicek 869cee74e6 host-based sd card printing seems now to work with folders 13 years ago
Bernhard Kubicek 70abca195a overworked cardreader for folder support; not finished yet. 13 years ago
Erik van der Zalm ff69e0a772 Changed max/min temp init. Removed second uart from sabguino core 13 years ago
Bernhard Kubicek 1e5e141ac9 Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into Marlin_v1 13 years ago
Bernhard Kubicek edb5ea7efa the normal config again.. 13 years ago
Bernhard Kubicek 5df5727e93 removed some debugging comments 13 years ago
Bernhard Kubicek 64f2121ab1 updated to sdfatlib2010902 13 years ago
Erik van der Zalm b15902d3b5 Fixed bug in configuration.h 13 years ago
Erik van der Zalm e63e224a33 Merge remote-tracking branch 'origin/Marlin_v1' into Marlin_v1
Conflicts:
	Marlin/Configuration.h
	Marlin/Marlin.pde
13 years ago
Erik van der Zalm e7dca8614b Advance experiments. Not working yet. 13 years ago
Bernhard Kubicek 46f80e82d9 Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into Marlin_v1
Conflicts:
	Marlin/ultralcd.h
13 years ago
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
13 years ago
Bernhard Kubicek 02b9eceead show sd% 13 years ago
Bernhard Kubicek 7919a40d06 watchdog,percent done, 13 years ago
Erik van der Zalm 805d37f77b Fixed some small planner bugs 13 years ago
Erik van der Zalm 5fd41ae872 Some fixes in planner 13 years ago
Erik van der Zalm 95126c09c0 Added slowdown 13 years ago
Erik van der Zalm 331e82dcd3 Buffer size > 16 13 years ago
Erik van der Zalm 2643ae93d6 Added modified Sanguino files 13 years ago
Erik van der Zalm c00eefb824 Merge remote-tracking branch 'origin/Marlin_v1' into Marlin_v1 13 years ago
Erik van der Zalm 1d0452f10c 250000 baud 13 years ago
Bernhard Kubicek c57906b627 fixed bug with adjusting ki in realtime. 13 years ago
Erik van der Zalm ac82411c73 Merge remote-tracking branch 'origin/Marlin_v1' into Marlin_v1 13 years ago
Erik van der Zalm 65934eee9c A lot of changes in the planner code 13 years ago
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.
13 years ago
Bernhard Kubicek ff592b056a heater power repair. 13 years ago
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 "@:"
13 years ago
Bernhard Kubicek 36958ee305 minor changes and first not-well working version of autotemp 13 years ago
Bernhard Kubicek ba8a53a40f Streaming.h is gone. It conflicted with PROGMEM. And saving memory is more important than nicer code, imho 13 years ago
Bernhard Kubicek 27361e7cd0 beautified the config. ordered it into thematic sections. 13 years ago
Bernhard Kubicek ab154d5592 project progmem finished: total change with ultipanel: 2456 byte free ram initial. now: 4374 ram. 13 years ago
Bernhard Kubicek 7b70caab7c made progmem mainly, found one bug in cardreader, added a empty class for cardreader in case no sd support. 13 years ago
Bernhard Kubicek 72ace55e6a better visibility of public/private/imported variables 13 years ago
Bernhard Kubicek 977fd2b2c7 Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into Marlin_v1 13 years ago
Bernhard Kubicek 907daa49af made loop counters uint8_t most were int(16_t) before 13 years ago
Erik van der Zalm e3af73ee0c Thermistor name problem 13 years ago
Bernhard Kubicek 0b43761c3a preprocessor magic to have a single source principle 13 years ago
Bernhard Kubicek 156763d027 Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into Marlin_v1 13 years ago
Bernhard Kubicek fc0064e525 made cardreader more selfsustained 13 years ago
Erik van der Zalm d3bfffcb6e Corrected thermistor naming 13 years ago
Bernhard Kubicek 01df04e02c first compile with the cardreader class 13 years ago
Bernhard Kubicek 163efdf1c7 Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into Marlin_v1 13 years ago
Bernhard Kubicek 87aaf0f70a static'ified Marlin.pde. 13 years ago
Erik van der Zalm 5cf349a24a Fixed some arc bugs 13 years ago
Bernhard Kubicek 79d1bfb5c0 made many possible variables static, so they cannot be used extern. 13 years ago
Erik van der Zalm 76b3f805c0 Added teensylu pins 13 years ago
Bernhard Kubicek 1d171e9e52 reformating and some minor bugs/things found on the way. 13 years ago
Bernhard Kubicek 900e0c9bf2 overworked the serial responses. Quite difficult, since many texts are Pronterface protocol. 13 years ago
Bernhard Kubicek 1740a83e11 correcting commit errors. 13 years ago
Bernhard Kubicek 7cc358b56b wrong file location 13 years ago
Bernhard Kubicek e8092898b1 watchdog into dedicated file 13 years ago
Bernhard Kubicek 2afb7bd4cf refactured temperature.cpp so that there are now abstract functions to access temperatures. 13 years ago
Erik van der Zalm 0b82465168 First arcs version. (Arcs not working ok) 13 years ago
Erik van der Zalm 2e8e8878e5 Corrected temp variables. 13 years ago
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
13 years ago
Erik van der Zalm d15f01e1b4 Temperature changes 13 years ago
Bernhard Kubicek ea86a5e10f moved the variables in the ISR, thats the most normal use case of static. 13 years ago
Bernhard Kubicek b9ea0651ec Revert "this is not working. Do you maybe know why?"
This reverts commit 8bcdb9f5f0.
13 years ago
Bernhard Kubicek 8bcdb9f5f0 this is not working. Do you maybe know why? 13 years ago
Bernhard Kubicek 40e8081623 changed end of line to windows, which seems to be the majority of developers main platform. 13 years ago
Bernhard Kubicek 00674af3a8 merge from the branch bkubicek/Marlin/zalmmerge 13 years ago
Erik van der Zalm d7c4f0780b Added M42, M80 and M81 13 years ago
Erik van der Zalm 95d3d9847c M109 now equal to sprinter 13 years ago
Erik van der Zalm bf879ceaa9 Added thermistor tables 13 years ago
Erik van der Zalm 094afe7c10 Merged Marlin, Marlin non gen6 and Ultimaker changes 13 years ago
Erik van der Zalm 0b1423c303 Fixed crashes. 13 years ago
Erik van der Zalm 27664c6da6 Software endstps added 13 years ago
Erik van der Zalm 8e017b81ab Sync with non-gen6 version 13 years ago
Erik van der Zalm b5f6482dce Fixed small feedrate bug.
Copied Camiels comments in the Configuration.h file
14 years ago
Erik van der Zalm 0024a26ccf Fixed lookup table bug. 14 years ago
Erik van der Zalm 5a1787b2f4 Fix M109 14 years ago
Erik van der Zalm 26bf57e22c first-commit 14 years ago
Erik van der Zalm f850af5c1c Signed-off-by: Erik van der Zalm <erik@vdzalm.eu> 14 years ago
Erik van der Zalm 750f6c33e3 first commit 14 years ago