994 Commits (8a08cca0f2c16d6863bacefa41966cee17ee5b26)

Author SHA1 Message Date
Erik van der Zalm c4a2077951 M109 and M190 now wait when cooling down if R is used instead of S.
M109 S180 waits only when heating.
M109 R180 also waits when cooling.
12 years ago
ErikZalm 8a2a3ef91d Merge pull request #531 from iXce/Marlin_v1_lcd
Only clamp panel movements if software endstops are enabled
12 years ago
Erik van der Zalm 6397b3339c restored configuration.h defaults 12 years ago
Erik van der Zalm cdaaad3df1 Merge branch 'Marlin_v1' of https://github.com/makr3d/Marlin into makr3d-Marlin_v1 12 years ago
Erik van der Zalm e3bdefd873 fixed missing #endif 12 years ago
Erik van der Zalm a5be0c52c6 no message 12 years ago
Michael Mayer e509cdbeb0 added contrast control function for gLCDs 12 years ago
Michael Mayer 99b7e926e7 added MaKr3d Melzi board 12 years ago
Gabino Lopez 68be33b1fc Update language.h
I update the spanish Messages, now this compile for spanish language.
12 years ago
daid acb3271c9a Merge pull request #534 from xifle/Marlin_v1
Fixes compiler warning for feedrate deadzone
12 years ago
xifle 61fe430d4f Should fix compiler warning for feedrate deadzone 12 years ago
Gord Christmas fde17d5720 Fix for ugly code compilation errors in SERVO_ENDSTOP checks 12 years ago
Guillaume Seguin aa65c20d1f Only clamp panel movements if software endstops are enabled 12 years ago
Erik van der Zalm ecf3ab5de4 Added thermistor 60 to configuration.h 12 years ago
Nicolas Rossi 2daa85918e Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin.git into Marlin_v1
Conflicts:
	Marlin/Configuration.h
	Marlin/Marlin_main.cpp
	Marlin/language.h
	Marlin/pins.h
	Marlin/ultralcd.cpp
12 years ago
Erik van der Zalm 2015989f84 Added DISABLE_MIN_ENDSTOPS 12 years ago
Christian Inci 648d45cfb2 Fix Pin Description Typo
Reverse 'Bed' and 'Fan' at the RAMPS 33 Description.

Signed-off-by: Christian Inci <chris.pcguy.inci@gmail.com>
12 years ago
ErikZalm 171719f18c Merge pull request #525 from lajos/ultralcd_pid
ultralcd.cpp compile errors when !defined(PIDTEMP)
12 years ago
lajos b519af4f05 fixed another !defined(PIDTEMP) compile in ultralcd.cpp 12 years ago
lajos 7d03c52511 fixed compile error in ultralcd.cpp when PIDTEMP undefined 12 years ago
lajos 02dee80fa5 added Azteeg X1 motherboard 12 years ago
Henrik Brix Andersen 47dc70e3ec Fix location of avrdude.conf 12 years ago
Henrik Brix Andersen 1d258903bb Allow command line compilation when using BEEPER. 12 years ago
Erik van der Zalm e34c9981ab Delta disabled by default 12 years ago
Erik van der Zalm 26a441fc7d More 3Drag controller patches. 12 years ago
Erik van der Zalm ac975ed8c2 Merge branch 'deltabot' into Marlin_v1 12 years ago
Jim Morris caa848f943 fix homing for deltas 12 years ago
Erik van der Zalm 7ad12be763 Merge branch 'Marlin_v1' of https://github.com/codexmas/Marlin into codexmas-Marlin_v1
Conflicts:
	Marlin/Configuration.h
	README.md
12 years ago
Erik van der Zalm 408169aef4 Merge branch 'Marlin_v1' of https://github.com/BorisLandoni/Marlin into BorisLandoni-Marlin_v1
Conflicts:
	Marlin/Configuration.h
	Marlin/language.h
	Marlin/pins.h
12 years ago
Erik van der Zalm bd96d22bfb Merge branch 'Marlin_v1' into thinkyhead
Conflicts:
	Marlin/Configuration.h
	Marlin/Configuration_adv.h
	Marlin/Marlin.h
	Marlin/Marlin_main.cpp
	Marlin/Servo.cpp
	Marlin/language.h
	Marlin/pins.h
	Marlin/planner.cpp
	Marlin/ultralcd_implementation_hitachi_HD44780.h
	README.md
12 years ago
Erik van der Zalm 73f21cd5d6 Spanish updated so far. 12 years ago
Erik van der Zalm 6f4a6e531c Merge branch 'deltabot' into Marlin_v1 12 years ago
Erik van der Zalm 01edf22a10 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
Erik van der Zalm ff6fa09ecf Moved corexy implementation from stepper to planner
(Thanks iquizzle)
12 years ago
Erik van der Zalm c8dcc7c208 Allow increasing the software PWM frequency. 12 years ago
Erik van der Zalm 8b0d82e9db Removed "awaiting translation" for french 12 years ago
Erik van der Zalm 1e05d192ab Make the beep tone less offensive 12 years ago
Erik van der Zalm 373f3ecab3 Merge branch 'deltabot' of https://github.com/jcrocholl/Marlin into deltabot
Conflicts:
	Marlin/Configuration.h
	Marlin/Marlin_main.cpp
	Marlin/pins.h
12 years ago
kiyoshigawa f295712008 Trying to fix weird diff on ultralcd_implementation_hitachi_HD44780.h 12 years ago
kiyoshigawa 69b02031ca Fixed small error in lcd define statements. 12 years ago
kiyoshigawa 6a81291c57 Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into Marlin_v1
This should fix issues with pull request 467, I hope.

Conflicts:
	Marlin/Configuration.h
	Marlin/Marlin.pde
	Marlin/ultralcd_implementation_hitachi_HD44780.h
12 years ago
BorisLandoni c1cb5977ee Update Configuration.h 12 years ago
BorisLandoni 8a5bd8a808 Update Configuration.h 12 years ago
BorisLandoni c1d7cf939e Update language.h 12 years ago
BorisLandoni 4c7d1436e9 Update pins.h 12 years ago
BorisLandoni 6588933c04 Update Configuration.h 12 years ago
Scott Lahteine 5dabc95409 Apply all changes from latest Marlin_V1
Diffed and merged, preserving my updates
12 years ago
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