bissen21/Marlin_Firmware
1
0
Fork 0
Code Issues Pull Requests Projects Releases 4 Wiki Activity
2,801 Commits 1 Branch 4 Tags 151 MiB
369a497300
Commit Graph

404 Commits

Author SHA1 Message Date
andrewsil1
269ec9f87f Fix grammar/typos in new Configuration.h option 
(For the SLOW_PWM_HEATERS option)
 2015-01-07 12:41:09 -08:00
Dino Del Favero
5cfe13f240 Correct some mistakes 2015-01-06 21:55:08 +01:00
DinoMesina
6730335657 Update Configuration.h 2015-01-06 18:06:02 +01:00
Lane Roberts
2701dd8a17 Due to the fix for #1248, X and Y probe offsets must not be floats. 
The compiler does not support comparing float values: "error: floating constant in preprocessor expression"
The loss in X/Y precision shouldn't matter for Z probes, as most microswitches or inductive sensors are larger than 1mm square anyway.
 2014-12-31 12:34:59 -06:00
Caleb Anderson
991a74b75b Move delta calibration menu to sample delta configuration. 
Turn off by default.
 2014-12-29 18:03:56 -07:00
Caleb Anderson
5b336a4cdb Delta calibration menu based on http://minow.blogspot.com/index.html#4918805519571907051 
To test/enable, uncomment the #define DELTA_CALIBRATION_MENU in Configuration.h
 2014-12-29 10:13:00 -07:00
fmalpartida
ec33df0554 Merge branch 'SAV-MkI_merge' into Development 
Tested for SAV MKI and SAV 3D LCD on lewihe.
 2014-12-28 19:54:06 +01:00
alexborro
3afe66bb0c Fix issues #1248, #1240 
- Fixed issue when BAL area probing is shorter than it should be for
grid probing
- Warning when BAL activated with Delta Kinematics
- Fix XY_TRAVEL_SPEED when homing Z axis
 2014-12-28 13:27:39 -02:00
David Forrest
cf52c48d19 Configuration.m: Set PID_INTEGRAL_DRIVE_MAX from PID_MAX from BANG_MAX. 
Current defaults are all 255.  If it makes sense to reduce them, they should come down together, and
be in a  PID_INTEGRAL_DRIVE_MAX <= PID_MAX <- BANG_MAX relationship.
 2014-12-27 15:26:09 -05:00
alexborro
d74aabf259 Revert "Change Auto_Bed_Leveling to Auto_Bed_Compensation" 2014-12-21 10:06:05 -02:00
John Davis
81568c3c6d Update Configuration.h 
Changed Auto Bed Level to Auto Bed Compensation
 2014-12-19 17:06:56 -05:00
Scott Lahteine
3b1f186c0c Clean up configs 2014-12-18 13:59:31 -08:00
Scott Lahteine
f83d0f2a68 Defines for electronics boards 
Added boards.h which contains defines for all the board numbers, plus
some shorthand macros for less typing.
 2014-12-18 13:59:31 -08:00
Bo Herrmannsen
280504e2e0 Merge pull request #908 from alromh87/Marlin_v1 
Support for Gen3 Monolithic electronics
 2014-12-17 22:28:07 +01:00
Bo Herrmannsen
91d740e128 Merge pull request #1141 from filipmu/Filament-Sensor 
Display filament sensor data on a 20x4 LCD or Graphical LCD
 2014-12-17 20:38:30 +01:00
Filip Mulier
d84934d8c5 Display Filament Sensor data on 20x4 LCD 
Changes to support displaying the real-time filament width and the
volume factor on a 20x4 LCD.  The data is displayed on the 4th line.
First the status message is displayed for 5 seconds, and then the
filament data is displayed.  The status message can be seen by
re-selecting the info screen in the menu.
 2014-11-10 21:43:58 -06:00
Filip Mulier
5c8107bcdd Commented out FILAMENT_SENSOR #define 
Commented out the FILAMENT_SENSOR define so that it is not enabled by
default.  Code does not work on all hardware variants.
 2014-11-09 13:26:02 -06:00
Erik van der Zalm
058e446531 Merge pull request #1037 from filipmu/Filament-Sensor 
Support for a filament diameter sensor
 2014-10-11 22:56:01 +02:00
Erik van der Zalm
aaaf8fe8dd Merge pull request #1068 from darkjavi/Marlin_v1 
Added profile for RAMPS with 2 extruders and 1 fan, no heated bed
 2014-10-06 13:41:38 +02:00
Erik van der Zalm
ce85515428 Merge pull request #1082 from Fourmi/Marlin_v1 
Add thermistor table
 2014-10-06 13:39:36 +02:00
Scott Lahteine
f989bd5435 Simple code cleanup. Rename "homeing" to homing. 2014-10-05 13:20:53 -07:00
Fourmi
b5dc228a7a Update configuration.h 
Add another comment for thermistor 13 ,use with Hotend "Simple ONE & All In ONE"
 2014-09-27 09:02:58 +02:00
Fourmi
3cbb2f56c6 Update configuration.h 
Add another comment on configuration.h for the value of thermistor.
I make a pull request on thermistortables.h with my thermistor (12),but y see there is a comment on configuration with number 12 but it's not present on thermistortables.h ?

Thx
 2014-09-26 22:01:06 +02:00
Javi
40ba644bb4 Added profile for RAMPS with 2 extruders and 1 fan. 
modified:   Marlin/Configuration.h
	modified:   Marlin/pins.h
 2014-09-06 02:53:36 +02:00
Filip Mulier
fe3a09bbcf Correct analog sampling time for additional A to D sample 
Adjusted the  #define PID_dT to reflect 10 A to D sample steps, vs
original 8.
 2014-09-01 06:26:19 -05:00
Erik van der Zalm
018b68a5c4 Merge pull request #976 from cocktailyogi/SCARA_by_Yogi 
Implemented SCARA-Maths
 2014-08-28 16:32:52 +02:00
Erik van der Zalm
0fbfb1bf82 Merge pull request #991 from bonm014/patch-1 
Leapfrog controller board support
 2014-08-28 16:27:52 +02:00
Erik van der Zalm
68dd5e635e Merge pull request #1024 from oliasmage/Marlin_v1 
Adding Z Probe via sled mounted endstop
 2014-08-28 16:15:54 +02:00
Filip Mulier
e3c88a5120 Filament sensor changes to config file 
Update the config file for improvements and clarifying what diameter to
use in the slicer software.
 2014-08-16 07:08:09 -05:00
Roxy-3DPrintBoard
0adbc79571 Fix Default Configuration so Auto Bed Leveling is off 
This snapshot has the Auto Bed Leveling turned off because most Marlin
users do not have that feature.
 2014-08-10 10:18:54 -05:00
Roxy-3DPrintBoard
0091865583 Z_PROBE_REPEATABILITY test 
Z_PROBE_REPEATABILITY test for Auto Bed Leveling.
Implemented as M48 with extra user specified options.
Full support at
http://3dprintboard.com/showthread.php?2802-Auto_Bed_Leveling-Z-Probe-Repeatability-code
 2014-08-09 15:37:23 -05:00
Filip Mulier
85649a4549 Real-time filament diameter measurement and control 
This feature allows the printer to read the filament diameter
automatically and adjust the printer in real time.  Added code to read
an analog voltage that represents a filament diameter measurement.  This
measurement is delayed in a ring buffer to compensate for sensors that
are a distance away from the extruder.  The measurement is used to
adjust the volumetric_multiplier for the extruder.  Some additional g
codes (M404, M405, M406, M407) are used to set parameters and turn
on/off the control. g code M221 is updated.  Pins for RAMPS1.4, RAMBO,
and Printrboard are identified for analog input.  The configuration file
is updated with relevant user parameters.
 2014-08-06 19:30:57 -05:00
Charles Bell
e7707aedbc Commented out new #defines in Configuration.h. 2014-08-04 10:18:25 -04:00
Charles Bell
0a8dc0e96b Added documentation to the README.md for the sled Z probe option. CAB 2014-08-04 10:07:43 -04:00
cocktailyogi
2f4a20257c imported last Marlin changes 2014-07-20 13:49:26 +02:00
alexborro
50b4e86f75 Add "Thermal Runaway Protection" feature 
This is a feature to protect your printer from burn up in flames if it
has a thermistor coming off place (this happened to a friend of mine
recently and motivated me writing this feature).

The issue: If a thermistor come off, it will read a lower temperature
than actual. The system will turn the heater on forever, burning up the
filament and anything
else around.

After the temperature reaches the target for the first time, this
feature will start measuring for how long the current temperature stays
below the target minus _HYSTERESIS (set_temperature -
THERMAL_RUNAWAY_PROTECTION_HYSTERESIS).

If it stays longer than _PERIOD, it means the thermistor temperature
cannot catch up with the target, so something *may be* wrong. Then, to
be on the safe side, the system will he halt.

Bear in mind the count down will just start AFTER the first time the
thermistor temperature is over the target, so you will have no problem
if your extruder heater takes 2 minutes to hit the target on heating.
 2014-07-18 15:28:01 +02:00
bonm014
b5417be109 Update Configuration.h 
Leapfrog added to the board list
 2014-07-03 21:03:22 +02:00
alexborro
43c298a7a9 Add "Thermal Runaway Protection" feature 
This is a feature to protect your printer from burn up in flames if it
has a thermistor coming off place (this happened to a friend of mine
recently and motivated me writing this feature).

The issue: If a thermistor come off, it will read a lower temperature
than actual. The system will turn the heater on forever, burning up the
filament and anything
else around.

After the temperature reaches the target for the first time, this
feature will start measuring for how long the current temperature stays
below the target minus _HYSTERESIS (set_temperature -
THERMAL_RUNAWAY_PROTECTION_HYSTERESIS).

If it stays longer than _PERIOD, it means the thermistor temperature
cannot catch up with the target, so something *may be* wrong. Then, to
be on the safe side, the system will he halt.

Bear in mind the count down will just start AFTER the first time the
thermistor temperature is over the target, so you will have no problem
if your extruder heater takes 2 minutes to hit the target on heating.
 2014-06-30 15:22:49 -03:00
cocktailyogi
512f2a3136 restore Branch from Backup 
sorry for that
 2014-06-23 17:09:57 +02:00
Greg Tan
6e6e4e2143 Added thermistor table for the 500C thermistor shipped with the Pico hot end. 2014-06-08 09:35:04 +08:00
Dim3nsioneer
8a32c5395b renaming the disable inactive extruder feature 2014-06-02 14:07:02 +02:00
Dim3nsioneer
29e7639933 Add switch unused feeder(s) off 
Having the non-active feeder motors powered on all the time is not
necessary. A feature to deactivate the unused feeder motors has been
implemented. The feature is enabled on default but can be switched off
in the configuration.
 2014-06-02 08:13:09 +02:00
David Forrest
09b84faa00 Configuration.h, pins.h: Add MOTHERBOARD 84 for Teensy++2.0 2014-05-29 17:19:16 -04:00
Alejandro Romero
1c9a70cee9 Support for Gen3 Monolithic electronics 
Techzone Monotronics support, ignoring the tip manager and using fan connector as on Sprinter FW
TODO: Add support for tipmanager
 2014-05-06 19:24:20 -05:00
daid
2acd3792fc Merge branch 'Marlin_v1' of github.com:ErikZalm/Marlin into Marlin_v1 2014-05-01 12:03:47 +02:00
daid
8b4c4aa5c3 Add feature to check&retry CRC read errors on SD. 2014-05-01 12:03:41 +02:00
Cameron Lai
da6b536182 Add 5DPrint D8 Driver Board info and temperature table for Makibox hot bed 2014-04-24 16:49:42 +08:00
Nutz95
3161740df9 This table is made for thermistor 3950 (can be found on ebay for cheap) 
it's caracteristics are :

R25℃ ;100KΩ±1%

B Value(R25/50℃)：3990K 1%
Dissipation Factor(mW/℃)：1.1~1.6 In still Air
Thermal Time Constant(S)：10~17 In Still Air
Operating temperature range：  (-50~+260°C)
Dimension：  1.8mm Dia X4.1mm
Lead Length  ：30mm

This table was found on the following blogs:
http://cae2100.wordpress.com/2014/03/08/beta3950-thermistor-table-for-marlin/

and

http://microfabricator.com/articles/view/id/531ad7e59aad9d3131000000/beta-3950-thermistor-table-for-marlin
 2014-04-13 17:03:20 +02:00
Gabe Rosenhouse
d3f305332a Allowable range now includes default value 2014-04-06 19:45:56 -05:00
Gabe Rosenhouse
b0aeac117f Adjustable Z probe offset, via custom M-code 2014-04-06 19:45:56 -05:00
David Forrest
b0093a1513 thermistortables.h: Add comments that table 60 uses beta=3950. 2014-03-26 23:41:10 -04:00
Gabe Rosenhouse
174b8d99d5 Simplify 3-point probing using new code only 2014-02-19 21:48:05 -08:00
Gabe Rosenhouse
3b718b816c better documentation 2014-02-19 14:04:37 -08:00
Gabe Rosenhouse
34fd59c370 ABL at any points 2014-02-19 13:18:21 -08:00
nothinman
3f455889d0 Merge pull request #769 from Cylindric3D/typofixes_1 
Various typo fixes - only in comments, no code changes.
 2014-02-17 11:30:01 +00:00
nothinman
d4ba23bc28 Merge pull request #770 from josefpavlik/Marlin_v1 
Marlin v1
 2014-02-17 11:27:05 +00:00
Mark Hanford
ab0d3c4fb3 Various typo fixes - only in comments, no code changes. 2014-02-14 11:48:24 +00:00
Josef Pavlik
831fc2a952 Pt100 and Pt1000 temperature sensors handling 2014-02-14 12:26:27 +01:00
daid
71bb3a8133 Add comments for Ultimainboard 2.0 configuration. 2014-02-13 10:53:46 +01:00
Jim Morris
b819fc53ca Add Azteeg X3 Pro as motherboard 68 
Add digipot i2c control for MCP4451
Allow M907 to set i2c digipot currents in amps
Fix Makefile to allow Azteeg motherboards
Fix Makefile to allow Wire libraries only
Add beeper pin for Azteeg X3 Pro
 2014-02-05 01:47:12 -08:00
ErikZalm
e1ae7952eb Merge pull request #743 from Opticalworm/Marlin_v1 
Improved support for panelolu2 encoder and buzzer
 2014-02-03 12:33:10 -08:00
David Forrest
a5f53f0cf3 Heater wattage reporting for M105 using EXTRUDER_WATTS and BED_WATTS 2014-02-03 14:50:28 -05:00
Ronald
8d162e5bd7 Improved support for panelolu2 encoder and buzzer 
I added #define for LCD_FEEDBACK_FREQUENCY_HZ and
LCD_FEEDBACK_FREQUENCY_DURATION_MS  which is used to alter the default
buzzer sound.

When selecting Panelolu2 in configuration.h:
- it automatically sets the correct ENCODER_PULSES_PER_STEP and
ENCODER_STEPS_PER_MENU_ITEM.
- if LCD_USE_I2C_BUZZER is defined it will also set the default
LCD_FEEDBACK_FREQUENCY_HZ and LCD_FEEDBACK_FREQUENCY_DURATION_MS

When selecting the sanguinololu 1284p the following is true:
- its now enables  LARGE_FLASH
- It enables the gcode M300 when the panelolu2 LCD_USE_I2C_BUZZER is
defined
 2014-02-03 07:45:03 +00:00
David Forrest
76cf07c3f7 Configuration.h: Use OVERSAMPLENR in dT_PID definition. 2014-01-21 23:25:51 -05:00
fsantini
6ae7f7870d Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into ErikZalm 
Conflicts:
	Marlin/Configuration.h
	Marlin/Marlin_main.cpp
 2013-12-23 12:20:32 +01:00
-
e5d3044801 Added posibility to set ENCODER_STEPS_PER_MENU_ITEM in Configuration.h like ENCODER_PULSES_PER_STEP as it depends on it for usability 2013-12-08 21:34:56 +01:00
Michal Dyntar
e8786bf110 Added support for Cheaptronic v1 electronic 2013-12-07 13:29:47 +01:00
fsantini
cc2925b705 Implemented a least squares fit of the bed equation for auto bed leveling. 
The code for the LSQ solver (qr_solve) is copyrighted by John Burkardt and released under LGPL here:
http://people.sc.fsu.edu/~%20jburkardt/c_src/qr_solve/qr_solve.html
(see qr_solve.cpp for further copyright information)
 2013-12-06 21:46:25 +01:00
Alex Borro
b33375d438 Z Axis Safe Homing when using Z Probe 
Recommended for those who are using the Z Probe for Z Homing (as
Z-Endstop)

This feature has two changes:

1) Allow user to choose where the Z Probe will touch the bed when homing
all axis together (G28) by setting below defines:

Z_SAFE_HOMING_X_POINT
Z_SAFE_HOMING_Y_POINT

2) Prevents the user to perform Z Axis Homing when the Z Probe is
outsite bed.
 2013-11-27 22:37:35 -02:00
Erik van der Zalm
48a185d004 Fixed compile errors from bad commits. 2013-11-10 16:36:37 +01:00
ErikZalm
59b96e323e Merge pull request #640 from fmalpartida/SAV-MkI 
Added support for BT on AT90USB devices, corrected LCD bug, added new board and LCD
 2013-11-10 07:26:08 -08:00
fmalpartida
7b556d2e96 Added BT support on AT90USB devices 
Added AT90USB device BT connectivity support using second UART.
 2013-11-03 19:57:06 +01:00
Kaz Walker
a5e8575829 Add UUID support to M115 responses. 2013-11-01 14:51:50 -06:00
fmalpartida
b5a964fcc5 Initial SAV MkI (RepRap CloneWars board) integration. 
Included support for BT dongle on AT90USB boards.
Added LCD Shift Register LCD control
Included support for RepRap Clone Wars project board (SAV MKI).
 2013-10-30 11:45:32 +01:00
dumle29
f941203172 PS_ON configurable boot state 
Allows the user to select wheter or not the PSU should be turned on or
kept in standby when marlin boots
 2013-10-29 18:44:56 +01:00
Erik van der Zalm
8a08cca0f2 Added temperature status less. 
Hopefully fixed viky button handling without braking other boards
 2013-10-20 12:12:35 +02:00
ErikZalm
6a803ba9c5 Merge pull request #590 from timkoster/Marlin_v1 
Added BlinkM support over i2c
 2013-10-20 00:51:35 -07:00
Alex Borro
6f85a8c7aa Bed auto Leveling change: Raise Z before homing 
- Added "Z_RAISE_BEFORE_HOMING" for raising Z the defined distance
before homing. This is useful to avoid Z-Probe collision when hotend is
near bed.

- Fixed the issue of Z not going bellow Z_PROBE_OFFSET when
"min_software_endstops" is true.
Now the Z_PROBE_OFFSET is not set in Z_MIN_POS, it is added after
homing.
 2013-10-12 17:28:11 -03:00
Alex Borro
253dfc4bc1 Bed Auto Leveling feature 
Check the Readme for instruction how to enable and configure the feature
 2013-09-29 13:20:06 -03:00
phq1910
57173739a1 Update Configuration.h 
Include CPU Sethi 3D
 2013-09-26 11:29:44 -03:00
Erik van der Zalm
0dca49a7c0 Added Azteeg X3 board. 2013-09-24 17:31:16 +02:00
Erik van der Zalm
d8c2c810b4 Added info to the delta configuration files in the configuration.h file 2013-09-23 23:29:46 +02:00
Erik van der Zalm
9bc88f8bab Placed optional ENCODER_PULSES_PER_STEP in the configuration.h file 2013-09-23 23:25:11 +02:00
Tim Koster
61db046b32 Added #ifdef BLINKM around new code. Also refined BlinkM.h. 2013-09-20 10:57:42 +03:00
Erik van der Zalm
3626b5ad8b Removed Delta from the default config file. 
Changed EEPROM CHITCHAT behavior. M503 is always enabled.
 2013-09-14 13:50:09 +02:00
Tim Koster
88dfeefca3 Define BlinkM default disabled 2013-09-10 12:32:21 +03:00
Tim Koster
5350faf2a2 Merge https://github.com/timkoster/MarlinBlinkM into Marlin_v1 2013-09-10 12:27:26 +03:00
Tim Koster
7016cc9511 Added BlinkM support over i2c 2013-09-10 12:18:29 +03:00
Tim Koster
3b315b3da0 Added BlinkM support over i2c 2013-09-06 22:25:39 +03:00
Nicolas Rossi
a54fe2d73c Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin.git into Marlin_v1 
Conflicts:
	Marlin/Marlin_main.cpp
 2013-08-03 13:05:56 +02:00
hg42@gmx.net
2ca983568d separate INVERTING for MIN and MAX endstops (6 #defines instead of 3) 2013-08-01 15:06:39 +02:00
Nicolas Rossi
9bf1cf1b22 Pre-calculate diagonal rod length squared 2013-07-30 14:09:21 +02:00
Nicolas Rossi
4623e78ce0 Added Honeywell thermistor 135-104LAF-J01 2013-07-30 14:02:18 +02:00
Guillaume Seguin
34da3a0a3f Merge github.com:ErikZalm/Marlin into Marlin_v1 
Conflicts:
	Marlin/language.h
 2013-07-23 21:46:41 +02:00
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.
 2013-07-14 21:10:24 +02:00
Erik van der Zalm
6397b3339c restored configuration.h defaults 2013-07-14 15:49:03 +02:00
Michael Mayer
e509cdbeb0 added contrast control function for gLCDs 2013-07-14 15:28:26 +07:00
Michael Mayer
99b7e926e7 added MaKr3d Melzi board 2013-07-14 15:17:55 +07:00
Erik van der Zalm
ecf3ab5de4 Added thermistor 60 to configuration.h 2013-06-27 23:25:51 +02:00
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
 2013-06-20 23:59:56 +02:00
Erik van der Zalm
2015989f84 Added DISABLE_MIN_ENDSTOPS 2013-06-18 19:20:26 +02:00
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>
 2013-06-16 23:35:33 +02:00
lajos
02dee80fa5 added Azteeg X1 motherboard 2013-06-15 16:58:17 -04:00
Erik van der Zalm
e34c9981ab Delta disabled by default 2013-06-11 22:33:58 +02:00
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
 2013-06-09 23:10:41 +02:00
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
 2013-06-09 22:57:40 +02:00
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
 2013-06-09 22:26:47 +02:00
Erik van der Zalm
6f4a6e531c Merge branch 'deltabot' into Marlin_v1 2013-06-09 13:55:18 +02:00
Erik van der Zalm
ff6fa09ecf Moved corexy implementation from stepper to planner 
(Thanks iquizzle)
 2013-06-09 13:10:06 +02:00
Erik van der Zalm
c8dcc7c208 Allow increasing the software PWM frequency. 2013-06-09 12:52:49 +02:00
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
 2013-06-09 00:51:58 +02:00
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
 2013-06-08 08:48:18 -06:00
BorisLandoni
c1cb5977ee Update Configuration.h 2013-06-08 14:37:39 +02:00
BorisLandoni
8a5bd8a808 Update Configuration.h 2013-06-08 14:37:17 +02:00
BorisLandoni
6588933c04 Update Configuration.h 2013-06-07 18:36:16 +03:00
Scott Lahteine
5dabc95409 Apply all changes from latest Marlin_V1 
Diffed and merged, preserving my updates
 2013-06-06 15:49:25 -07:00
Gord Christmas
f4f30c9d64 Added servo actuated enstop coding to allow G28 command to engage and retract a servo to specified angles. 2013-06-06 07:36:52 -07:00
Erik van der Zalm
79374f0b93 Merge branch 'reisnyderb' of https://github.com/ErikZalm/Marlin into Marlin_v1 2013-06-05 17:44:48 +02:00
kiyoshigawa
4b19c8552e Fixing changed Configuration.h settings to be default values per ErikZalm Request. 2013-06-04 12:01:55 -06:00
Erik van der Zalm
5090c56651 More redundant temp sensor changes. (After testing and debugging by reifsnderb) 2013-05-29 19:29:30 +02:00
Gatulibu
b78fa6bb70 Added support for Megatronics v2.0 and Minitronics v1.0 
merged from code downloaded from reprapworld.com
 2013-05-28 14:03:31 +02:00
Erik van der Zalm
9be61cdc02 Added redundant temp sensor 2013-05-26 17:57:49 +02:00
Alexander Kasimir
e2ff536b03 Fixed typo in Comment 2013-05-22 16:02:03 +03:00
Robert F-C
0d4a9444c4 Merge remote-tracking branch 'upstream/Marlin_v1' into Marlin_v1 2013-05-19 08:50:58 +10:00
Gord Christmas
28ada096e2 Adding servo documentation 2013-05-18 06:01:58 -07:00
Robert F-C
dfa549f268 Merge remote-tracking branch 'upstream/Marlin_v1' into Marlin_v1 2013-05-18 21:59:39 +10:00
Gord Christmas
dc59f07d24 First attempt at refactoring of original servo code. Only adding servo support as a start to keep things simple. 2013-05-16 07:03:01 -07:00
Erik van der Zalm
bd2cd4903e Added #ifdef BARICUDA around the BariCUDA changes 2013-05-14 23:56:32 +02:00
gregor
2739c26c4f changes: 
- changed the variables from keypad to reprapworld_keypad
- added a missing ifdef check
 2013-05-10 22:20:02 +02:00
gregor
6fb9573157 added support for the reprapworld keypad 2013-05-10 21:57:17 +02:00
Tim Anderson
1fa61c297e Turning off Control Panel by Default and Updating the link to the LiquidCrystal_I2C library to avoid confusion. 2013-05-06 23:23:54 -06:00
kiyoshigawa
b27a59f41e Added support for Elefu RA Board and Elefu Control Panel 2013-05-06 08:44:38 -06:00
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.
 2013-05-02 09:55:15 -07:00
Scott Lahteine
a200521eab Added CUSTOM_MENDEL_NAME option to Configuration.h and language.h 
Also cosmetic comment changes and spelling corrections in printed
messages
 2013-05-02 09:22:58 -07:00
Martin Renold
1a397825f9 fix DEFAULT_AXIS_STEPS_PER_UNIT minor Z rounding error 2013-05-01 08:30:24 +02:00
Robert F-C
c3cdaceab3 Merge remote-tracking branch 'upstream/Marlin_v1' into Marlin_v1 2013-04-29 22:13:55 +10:00
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
 2013-04-29 21:13:46 +10:00
Lukasz Stefanowicz
d71f1e9bf6 Add (as an option) slower SD transfer mode 2013-04-24 10:50:57 +02:00
MaikStohn
13596e8722 Added RepRapDiscount FULL GRAPHIC Smart Controller 2013-04-16 14:21:39 +02:00
daid303
c80a78bb70 Lower the default max E feedrate a bit. With the stepper fix this is much to high. 2013-04-12 13:54:38 +02:00
ErikZalm
7a5c474d91 Update Configuration.h 2013-03-28 21:27:50 +01:00
ErikZalm
9fb8bd5685 Merge pull request #433 from whosawhatsis/bang-mode 
Separate PID_MAX from BANG_MAX
 2013-03-25 13:11:34 -07:00
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.
 2013-03-24 18:19:58 +11:00
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.
 2013-03-22 18:16:26 -07:00
blddk
72419f69a9 Added rumba 2013-03-22 18:41:54 +01:00
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
 2013-03-05 15:51:24 +01:00
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).
 2013-03-03 18:47:50 +11:00
Robert F-C
1daf2f3256 Number of extruders is not an advanced configuration - it is a basic property. 2013-03-02 16:14:19 +11:00
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
 2013-03-01 17:39:54 +01:00
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).
 2013-03-01 01:17:07 +11:00