MPCNC/Firmware
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
1,622 Commits 1 Branch 0 Tags 96 MiB
842da54e68
Commit Graph

1362 Commits

Author SHA1 Message Date
Cameron Lai
3a8e36f19e Add Digipot config for 5DPrint D8 Driver Board 2014-04-24 12:56:46 +08:00
Cameron Lai
eea3ba5588 Fix for stepper microstepping 2014-04-24 12:56:06 +08:00
Cameron Lai
1cbcbb0971 Add makibox machine information 2014-04-24 12:55:21 +08:00
Cameron Lai
2fa514e88a Add port for 5DPrint D8 Driver board 2014-04-24 12:55:00 +08:00
nothinman
b9126ab497 Merge pull request #894 from MyMakibox/Marlin_v1 
Update Marlin_main.cpp
 2014-04-23 16:23:56 +01:00
MyMakibox
21ec6b88c3 Update Marlin_main.cpp 
Added description of autotemp flags to M109
 2014-04-23 17:33:26 +08:00
MyMakibox
e4dc80d3d3 Update Configuration_adv.h 
Corrected error in AUTOTEMP instructions
 2014-04-23 17:30:07 +08:00
Neil Darlow
6adbdf42e0 Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into Marlin_v1 2014-04-21 15:10:57 +01:00
whosawhatsis
27d544ac25 Speed up QUICK_HOME feedrate for diagonal move 
Speed up the diagonal move while still keeping each individual axis at
or below its homing feedrate.
 2014-04-19 17:29:20 -07:00
nothinman
013793bbe9 Merge pull request #878 from koldoartola/Marlin_v1 
Added new language (Basque-Euskera)
 2014-04-13 22:37:39 +01:00
koldo artola
e5b70237c7 Added new language (Basque-Euskera) 
Added:
* new language (Basque-Euskera)
* some minor corrections for Spanish
* added 2 new constants for every language (required for a minor change
I am preparing to ultralcd.cpp)
 2014-04-13 22:19:38 +02:00
Nutz95
ed6f4a71c5 fix wrong temptable index 2014-04-13 18:00:55 +02: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
nothinman
086ff1644f Merge pull request #852 from pixatintes/patch-1 
Update language.h
 2014-04-13 00:46:17 +01:00
nothinman
3ffc9651b1 Merge pull request #845 from DerSchultze/Sanguinololu-servo 
Added servo pin assignments to Sanguinololu
 2014-04-13 00:37:28 +01:00
nothinman
357b87b498 Merge pull request #826 from paciotti/patch-1 
Configuration_adv.h
 2014-04-13 00:22:25 +01:00
neildarlow
95ad6ec9a1 Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into Marlin_v1 2014-04-12 22:20:45 +01:00
Gabe Rosenhouse
27a7cf9fcf use existing strings 2014-04-07 05:01:48 -05: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
Neil Darlow
73b380d8d2 Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into Marlin_v1 2014-04-06 19:15:29 +01:00
nothinman
c23376f2e7 Merge pull request #837 from whosawhatsis/fwretract 
FWRETRACT in mm/s
 2014-04-04 11:47:58 +01:00
nothinman
dfb98101e4 Change CONTROLLERFAN_PIN for board 35 to -1, as it would conflict with board's 33 extruder pin, causing burnout (it's the same board, just different number of fans/extruders, therefore should be pin-compatible) 2014-04-03 18:05:48 +01:00
nothinman
f1501317ca Merge pull request #860 from drf5n/therm3950 
thermistortables.h: Add comments that table 60 uses beta=3950.
 2014-04-02 18:29:57 +01:00
nothinman
9a5d23d96f Merge pull request #866 from sakunamary/Marlin_v1 
fix bug for dual extruders not working
 2014-04-02 18:27:42 +01:00
nothinman
303ee67896 Merge pull request #864 from whosawhatsis/M200 
fix bug in M200 with multiple extruders
 2014-04-02 18:26:15 +01:00
Tim
8759508319 fix bug for dual extruders not working 
some guy find that marlin not working good for dual extruders delta .
when type T0 or T1 to active extruder and  E0 or E1  move causing XYZ
motion . so i locales the bugs and fix it , I have dry run the fix.
 2014-04-01 09:26:19 +08:00
whosawhatsis
a65564eef6 fix bug in M200 with multiple extruders 2014-03-30 11:42:22 -07:00
whosawhatsis
aeaf9b9312 fix bug in M200 with multiple extruders 2014-03-30 11:41:57 -07:00
Neil Darlow
89f78b0b80 Allow use of either SD Card slot when LCD Panel is configured. 
Preference is for Controller SD slot before LCD Panel slot when both are occupied.
 2014-03-27 17:02:17 +00:00
David Forrest
b0093a1513 thermistortables.h: Add comments that table 60 uses beta=3950. 2014-03-26 23:41:10 -04:00
pixatintes
a3530d1141 Update language.h 
Updated to latest version.
 2014-03-23 18:06:48 +01:00
pixatintes
990e770e15 Update language.h 
Added catalan language
 2014-03-23 10:30:08 +01:00
Dan Nixon
f643f4d674 Test and refactor 2014-03-21 20:42:00 +00:00
neildarlow
bbe8fbe13d Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into Marlin_v1 2014-03-21 18:27:14 +00:00
Dim3nsioneer
c8cdd1fc6f Bugfixes for language option 6 (russian) 2014-03-19 14:27:38 +01:00
Dim3nsioneer
7395dafc1e semantic changes in language.h 2014-03-19 12:30:50 +01:00
Dim3nsioneer
fad2a60ce6 Corrections for preheat extension in language.h 2014-03-19 12:23:35 +01:00
Ralf Schultz
eecda434fb Sanguinololu servo pins set default disabled 2014-03-18 08:25:20 +01:00
Dim3nsioneer
944ced87c5 Extended Preheat options 
Preheat LCD menus base on code by D-Base
 2014-03-17 18:37:46 +01:00
Ralf Schultz
06709ad60e Added servo pin assignments to Sanguinololu 2014-03-17 15:45:13 +01:00
Dim3nsioneer
3906f27c46 Individual extruder flow rate 
Extension of M221, Tune menu
 2014-03-15 18:09:46 +01:00
Dan Nixon
a38c90ee84 Added estop handling 2014-03-15 15:56:15 +00:00
ErikZalm
a00cec8b71 Merge pull request #833 from mattsch/optional_feedrate_multiplier 
Add support for disabling encoder control for feedrate multiplier
 2014-03-15 15:41:45 +01:00
neildarlow
af8be9013b Merge branch 'lcd_detected' of https://github.com/whosawhatsis/Marlin into Marlin_v1 2014-03-15 07:24:47 +00:00
whosawhatsis
0ddee3c7db Prevent SD card insertion from causing a hang when using LiquidTWI2 device detection 2014-03-14 18:46:25 -07:00
Dan Nixon
272072fa20 Added M112 2014-03-14 23:19:43 +00:00
whosawhatsis
aab61e63c3 FWRETRACT in mm/s 
Firmware retraction now stores the retract and recover speeds in mm/s
instead of mm/min. This makes it match the units of the maximum
feedrate, and fixes problems with modifying the value via LCD control
panel. From gcode, the values are still taken in mm/min to match the
units of G1 and similar, and they are converted to mm/s before they are
stored.

I also lowered the default retract feedrate to make it less likely to
cause problems for geared extruders when the user hasn’t bothered to
set a reasonable maximum feedrate, though users should be setting both
of these values to suit their hardware.
 2014-03-14 15:17:28 -07:00
Matthew Schick
6cd85e6008 Add support for disabling encoder control for feedrate multiplier 
Signed-off-by: Matthew Schick <matthew.schick@gmail.com>
 2014-03-12 18:13:50 -04:00
blddk
09af1b90b8 Added CHDK support 
Added CHDK support to take pictures instead of doing an IR command, see more about how to use it here http://captain-slow.dk/2014/03/09/3d-printing-timelapses/
 2014-03-10 21:57:08 +01:00
blddk
765b2da3d4 Added CHDK support 
Added so M240 can be used to trigger CHDK instead of sending an IR signal, see more about CHDK here http://captain-slow.dk/2014/03/09/3d-printing-timelapses/
 2014-03-10 21:52:33 +01:00
paciotti
881e348eed Update Configuration_adv.h 
Increase Z_HOME_RETRACT_MM to 2mm default to avoid end stop not switching during retract.
 2014-03-08 22:35:05 +01:00
neildarlow
5a332df47e Merge https://github.com/ErikZalm/Marlin into Marlin_v1 2014-03-06 20:56:44 +00:00
Tommi Lamberg
15d1b8d719 Fixed finnish translation 
- Fixed Few finnish transalations
- Removed duplicate contrast define
 2014-03-05 14:02:52 +02:00
neildarlow
7325d7102e Activate LiquidTWI2 device detection and space-pad LCD status line. 2014-03-03 21:01:27 +00:00
ErikZalm
7f76a0e064 Merge pull request #813 from drf5n/PID_DEBUG 
temperature.cpp: Fix PID_DEBUG compile error.
 2014-02-26 17:31:48 +01:00
Erik van der Zalm
fcd8524b6e Only increase EEPROM version for DELTA printers. 2014-02-26 17:29:27 +01:00
Jim Morris
8ea5665ee2 Merge remote-tracking branch 'origin/Marlin_v1' into add/M665-set-delta-configuration 
Conflicts:
	Marlin/Marlin_main.cpp
 2014-02-26 00:19:28 -08:00
David Forrest
8c4377dd63 temperature.cpp: Fix PID_DEBUG compile error. 2014-02-26 00:44:22 -05:00
ErikZalm
fde8c2c310 Merge pull request #807 from Cylindric3D/typofixes_upstream5 
Various typo fixes #5 - only in comments, no code changes.
 2014-02-25 18:49:41 +01:00
Cylindric
fdce91192e Various typo fixes - only in comments, no code changes. 2014-02-25 10:01:15 +00:00
Cylindric
d819c55395 Various typo fixes - only in comments, no code changes. 2014-02-25 09:52:58 +00:00
ErikZalm
fd4542f33a Merge pull request #805 from whosawhatsis/M200 
autretract fix
 2014-02-24 22:35:08 +01:00
ErikZalm
e8291ed728 Merge pull request #802 from Makers-Tool-Works/Marlin_v1 
Clarify which PID values to enter
 2014-02-24 22:31:13 +01:00
ErikZalm
465b654d24 Merge pull request #797 from Cylindric3D/update_menu_plan 
Update menu plan
 2014-02-24 22:30:19 +01:00
ErikZalm
88506a80c3 Merge pull request #789 from smiler/Marlin_v1 
Fixed typo.
 2014-02-24 22:26:31 +01:00
ErikZalm
b514d3c87f Merge pull request #781 from Cylindric3D/typofixes_upstream 
Various typo fixes #3 - only in comments, no code changes.
 2014-02-24 22:25:38 +01:00
whosawhatsis
77df0d689a autretract fix 
I made these changes previously, but I can’t find the commit now. This
reapplies the changes to get auto retract working again.

Conflicts:
	Marlin/Configuration_adv.h
	Marlin/Marlin_main.cpp
 2014-02-24 13:24:38 -08:00
ErikZalm
cc5f1d475c Merge pull request #772 from ellensp/Marlin_v1 
Updated gen3+ board pins names to current convention
 2014-02-24 22:22:15 +01:00
Cylindric
91759dede6 Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into typofixes_upstream 2014-02-24 17:29:37 +00:00
Cylindric
557217fc05 Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into update_menu_plan 2014-02-24 17:29:24 +00:00
RoyOnWheels
aee63afccd Clarify which PID values to enter 
Users can be confused as to which values to enter after a PID tune. Updating the message to help clarity it.
New message: "PID Autotune finished! Put the last Kp, Ki and Kd constants from above into Configuration.h"

Old message: "PID Autotune finished! Put the Kp, Ki and Kd constants into Configuration.h"
 2014-02-23 14:36:50 -08:00
Gabe Rosenhouse
99f6326544 Remove unnecessary dependency on time.h from qr_solve.cpp 
Fixed compiler errors on Ubuntu using arduino-core
 2014-02-20 16:43:37 -08:00
Cylindric
ea669cb504 Fix some extra and some missing tabs, to make the file consistent. 2014-02-20 14:28:29 +00:00
Cylindric
b46a1b6360 Update the menu plan document with the current menu as per ultralcd.cpp. 2014-02-20 14:20:27 +00:00
Cylindric
3cc7626d1f Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into update_menu_plan 2014-02-20 14:12:10 +00: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
Cylindric
541155ea87 Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into typofixes_upstream 2014-02-19 15:52:18 +00:00
alexborro
9fa328e5c8 Merge pull request #793 from MissionSt/use_axis_enums 
Use constants instead of numeric literals
 2014-02-19 10:15:57 -03:00
Gabe Rosenhouse
f308a8af91 update comment 2014-02-19 01:06:24 -08:00
Gabe Rosenhouse
357e31270a Prevent G29 without first homing in X and Y 
If position is unknown, then G29 can be dangerous.
 2014-02-19 00:51:43 -08:00
Gabe Rosenhouse
d2d7d186b5 Use descriptive constants, more 2014-02-19 00:10:17 -08:00
Gabe Rosenhouse
2ccdf4f36d Use descriptive constants instead of numeric literals 2014-02-19 00:02:59 -08:00
Christian Axelsson
c00383f286 Fixed typo. 2014-02-18 18:50:12 +01:00
Cylindric
60f72a78a9 Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into typofixes_upstream 2014-02-18 17:31:58 +00:00
nothinman
abba7a0003 Merge pull request #782 from marcovannoord/Marlin_v1 
Added dutch to language.h
 2014-02-18 16:19:50 +00:00
Cylindric
b868d668fa Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into typofixes_upstream 2014-02-18 12:11:01 +00:00
Marco
8212d8d543 Revert "Fixed small typo that would prevent compiling" 
This reverts commit 51ae4881ab.
 2014-02-18 10:40:25 +01:00
daid
46bae30573 Merge pull request #776 from whosawhatsis/fwretract 
Fwretract fixes, cleanup
 2014-02-18 10:39:28 +01:00
Marco
51ae4881ab Fixed small typo that would prevent compiling 2014-02-18 09:47:36 +01:00
Marco
498d76fd79 Fixed some messages where the text shown on the screen was more than 17 characters 2014-02-18 09:40:10 +01:00
Jim Morris
af9395ac2e Add M605 to dynamically set delta configuration 
Save above configs in eeprom
fix docs in createTemperatureLookupMarlin.py
add missing azteegX3pro digipot settings in delta example config
 2014-02-17 20:50:59 -08:00
nothinman
fd42f0d226 Merge pull request #783 from MissionSt/fix/syntax-error 
Fix compile error
 2014-02-17 20:59:43 +00:00
nothinman
96217bf36a Merge pull request #777 from PxT/M114 
Add whitespace to M114 output
 2014-02-17 18:07:47 +00:00
Marco
cf5c3b6610 Added dutch to language.h 2014-02-17 17:00:50 +01:00
Gabe Rosenhouse
d1c64b9dc4 Fix syntax error introduced in 477b6fa1d 2014-02-17 07:56:19 -08:00
Cylindric
5d50819791 Various typo fixes - only in comments, no code changes. 2014-02-17 13:04:44 +00: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
4ddedb3b27 Merge pull request #780 from Cylindric3D/typofixes_2 
Various typo fixes #2 - only in comments, no code changes.
 2014-02-17 11:29:18 +00:00
nothinman
d4ba23bc28 Merge pull request #770 from josefpavlik/Marlin_v1 
Marlin v1
 2014-02-17 11:27:05 +00:00
nothinman
bbb424bd2f Merge pull request #779 from MissionSt/makefile-fix-abl 
Makefile fixes
 2014-02-17 11:22:34 +00:00
Cylindric
8f0cee2a14 Various typo fixes - only in comments, no code changes. 2014-02-17 10:58:36 +00:00
Cylindric
08263ae66e Merge branch 'Marlin_v1' into typofixes_1 2014-02-17 10:28:20 +00:00
Gabe Rosenhouse
5bd09d26e2 Makefile works with auto bed leveling 2014-02-16 23:23:29 -08:00
Gabe Rosenhouse
b45beeffd6 typo fix in Makefile 2014-02-16 23:23:29 -08:00
Paul Telford
306588925d Add whitespace to M114 output 2014-02-16 21:01:19 -08:00
whosawhatsis
c43838bb1e disable auto retract by default 
This should make it safe to enable FWRETRACT by default, with
autoretract (which should now be fixed) only enabled by M209. FWRETRACT
should probably now default to enabled (to make G10/G11 and M207-209
available, without changing functionality when they are not used), but
I’ll save that for another pull request/discussion.
 2014-02-16 19:04:54 -08:00
whosawhatsis
99f0e44864 Move FWRETRACT defaults to configuration_adv.h 2014-02-16 19:00:28 -08:00
whosawhatsis
66e3869138 Fix autoretract 
This takes the (now working) G10/G11 code and moves it to a function,
which is called by G10 and G11, and also called by G1 if autoretract is
enabled and a retract/recover move is detected.
 2014-02-16 18:59:04 -08:00
whosawhatsis
2f2459c0db Fix G10/G11 Z-lift 2014-02-16 18:15:34 -08:00
Gabe Rosenhouse
8c5675c290 Use language.h instead of English literals for "bed" 2014-02-16 17:16:00 -08:00
Gabe Rosenhouse
0f7393a13e Refactor 'accurate' auto bed leveling to use probe_pt() 2014-02-16 10:44:15 -08:00
Gabe Rosenhouse
c4fbb44d6d Refactor 3-point auto bed leveling to use probe_pt() 2014-02-16 10:44:08 -08:00
Gabe Rosenhouse
ad2c6488c7 Add probe_pt(), useful for auto bed leveling 2014-02-16 10:38:29 -08:00
Peter
c9c83a4560 Updated gen3+ board pins names to current convention 2014-02-16 00:47:06 +13:00
Mark Hanford
ab0d3c4fb3 Various typo fixes - only in comments, no code changes. 2014-02-14 11:48:24 +00:00
Josef Pavlik
477b6fa1df move engaged from lcd console refreshes power off timeout 2014-02-14 12:37:21 +01:00
Josef Pavlik
831fc2a952 Pt100 and Pt1000 temperature sensors handling 2014-02-14 12:26:27 +01:00
nothinman
7dcd350941 A few changes to Russian, changed LCD strings to be <=17 characters. 2014-02-13 11:58:14 +00:00
daid
c31bb2b7ad Only show the ZProbe offset when auto-bed-leveling is enabled. 2014-02-13 11:48:55 +01:00
daid
46f5bea19f Add configurable beep for UltiPanel. 2014-02-13 11:17:33 +01:00
daid
d16a770855 Ultimainboard 2.x does not has a PS_ON pin. 2014-02-13 10:57:03 +01:00
daid
71bb3a8133 Add comments for Ultimainboard 2.0 configuration. 2014-02-13 10:53:46 +01:00
daid
9b7d87e885 Remove duplicate contrast define. 2014-02-13 10:50:17 +01:00
daid
816f0a678a Merge pull request #768 from whosawhatsis/Marlin_v1 
multiple FWretract fixes
 2014-02-13 09:14:57 +01:00
whosawhatsis
6e43398509 G10/G11 bugfixes 
Previous version was broken by using G92 E0 between retract and recover.
 2014-02-12 13:03:00 -08:00
whosawhatsis
d6c5c503d4 correct feedrate units in comments for M207/M208 2014-02-12 13:02:47 -08:00
nothinman
15d6116188 Merge pull request #689 from cajun-rat/tidy 
Use C++ initialization list
 2014-02-12 16:38:11 +00:00
Martin Lukasik
0b9ecf3824 Language cleanup, part 1. 2014-02-12 13:21:26 +00:00
whosawhatsis
b5ba5c1465 Merge branch 'Marlin_v1' of https://github.com/whosawhatsis/Marlin into Marlin_v1 2014-02-11 19:06:03 -08:00
whosawhatsis
78e7654601 Keep FWRETRACT values in terms of millimeters when using M200 
for volumetric E units
 2014-02-11 19:05:35 -08:00
whosawhatsis
3f6d44d40b Keep FWRETRACT values in terms of millimeters when using M200 for volumetric E units 2014-02-11 18:50:11 -08:00
Cylindric
363dc2f0e8 Merge branch 'Marlin_v1' into update_menu_plan 2014-02-12 00:51:16 +00:00
nothinman
5f797ca29f Updated Polish, changed default firmware URL to Marlin. 2014-02-11 22:38:01 +00:00
Mark Hanford
0778f5f028 Add missing entries to the new Aragonian language. 2014-02-11 14:40:53 +00:00
Mark Hanford
54bab3e0d0 Merge branch 'Marlin_v1' into localisation 
Conflicts:
	Marlin/language.h
 2014-02-11 14:35:28 +00:00
Mark Hanford
bdd0211aeb Move strings in ultralcd.cpp into language.h. 2014-02-11 13:54:43 +00:00
Daniel Martinez
c8e5a82d49 keep English as default lang. 2014-02-09 18:24:24 +01:00
Daniel Martinez
f64592e362 Add Aragonese translation 2014-02-09 18:19:37 +01:00
ErikZalm
ac74f45dc0 Merge pull request #752 from MatixYo/patch-3 
Update language.h
 2014-02-09 17:52:26 +01:00
MatixYo
36086d3ca4 Update language.h 
Updated Polish translations.
 2014-02-07 19:15:51 +01:00
Cylindric
1781031f2d Update LCD Menu Tree with current options, based on ultralcd.cpp and language.h. 2014-02-07 01:52:44 +00:00
Jim Morris
d485988bec fix typo 2014-02-05 14:39:45 -08:00
Jim Morris
8a1fd25363 Default is to not define digipot_i2c 2014-02-05 14:28:23 -08:00
Jim Morris
5097c57d3a Added pins for Azteeg X3 Pro under motherboard 68 2014-02-05 14:25:42 -08: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
whosawhatsis
b2c11ba980 Change diameter code to 'D' 
For some reason that I can’t figure out, the decimal is dropped when
using ’S’ for the code.

Also some minor code improvements to M200.
 2014-02-01 18:49:25 -08:00
ErikZalm
61059385a3 Merge pull request #737 from whosawhatsis/M200 
M200 implementation
 2014-02-01 10:37:49 -08:00
whosawhatsis
856edfcc0d Fixed math 
This is why I wanted to sleep on the code I wrote while falling asleep
rather than immediately submitting a pull request.
 2014-01-31 08:43:11 -08:00
ErikZalm
0d81ae77bc Merge pull request #727 from drf5n/oversampling 
temperature.cpp: Actually use OVERSAMPLENR in the oversampling calculation.
 2014-01-31 07:09:10 -08:00
ErikZalm
84df13f7d1 Merge pull request #721 from drf5n/lcdOnly 
Enable basic ULTRA_LCD screen w/o encoders and menus.
 2014-01-31 07:07:12 -08:00
ErikZalm
4c7e9502ad Merge pull request #718 from drf5n/temptableRes 
createTemperatureLookupMarlin.py: Add resolution comments and format for...
 2014-01-31 07:06:02 -08:00
ErikZalm
652a0f6b5a Merge pull request #717 from drf5n/tpins2 
fastio.h: Add AT90USBxx_TEENSYPP_ASSIGNMENTS for teensyduino/Lincomatic/...
 2014-01-31 07:05:20 -08:00
ErikZalm
96a0cdc541 Merge pull request #716 from drf5n/maketeensy 
Makefile: Update for Arduino 1.0.5 and Teensyduino dependent boards (HAR...
 2014-01-31 07:04:29 -08:00
whosawhatsis
d24df7af2c M200 implementation 2014-01-31 00:54:19 -08:00
David Forrest
f0b8d5ba3d createTemperatureLookupMarlin.py: Change comment to refer to actual program name. 2014-01-29 23:34:22 -05:00
David Forrest
50f44d9249 createTemperatureLookupMarlin.py: Truncate to short after application of OVERSAMPLENR for improved resolution. 2014-01-29 23:24:07 -05:00
David Forrest
f5b5dd8038 createTemperatureLookupMarlin.py: Add output of Steinhart-Hart coefficients. 2014-01-29 22:59:47 -05:00
David Forrest
76cf07c3f7 Configuration.h: Use OVERSAMPLENR in dT_PID definition. 2014-01-21 23:25:51 -05:00
David Forrest
476c7193d8 temperature.cpp: Use OVERSAMPLENR in oversampling calculation. 2014-01-21 16:49:03 -05:00
whosawhatsis
f08bb8bb6a Previous commit borked. 2014-01-19 22:06:45 -08:00
whosawhatsis
b1f8f492c6 Remove previous_millis_cmd update from extruder runout prevention code 
This seems to defeat the purpose of previous_millis_cmd, preventing the
time elapsed from previous_millis_cmd from ever reaching
max_inactive_time or stepper_inactive_time while the heat was on.
 2014-01-19 19:22:08 -08:00
whosawhatsis
8a5eaa3c9b Fix crash after home bug 
Fixes a bug in the Extruder Runout Prevention feature that caused the
extruder to move back to “current_position” after a move if it was
activated while the move was in progress. For long home moves (which
are longer than the dimensions of the machine’s working area), this
would cause the machine to crash into the far end of its travel after
homing. This usually occurred on the Z axis, which could result in
damage to the machine if you don’t hit the reset button in time.
 2014-01-19 19:11:51 -08:00
David Forrest
61a7256d42 Enable basic ULTRA_LCD screen w/o encoders and menus. 2014-01-17 17:00:47 -05:00
l.lefebvre
fdac8f6cec Update ConfigurationStore.cpp 
Unable to compile if ENABLE_AUTO_BED_LEVELING is not set (not set by default).
 2014-01-17 16:09:58 +01:00
Alex Borro
05932e4458 Add Z Probe Offset to EEPROM and Ultra LCD 2014-01-16 18:13:46 -02:00
David Forrest
7216583b8b createTemperatureLookupMarlin.py: Add resolution comments and format for Marlin. 2014-01-16 12:40:15 -05:00
David Forrest
e8e0697e48 fastio.h: Add AT90USBxx_TEENSYPP_ASSIGNMENTS for teensyduino/Lincomatic/Printrboard compatibility. 2014-01-16 11:23:29 -05:00
David Forrest
75f39fadfc Makefile: Update for Arduino 1.0.5 and Teensyduino dependent boards (HARDWARE_MOTHERBOARD=={8,81,82,83,84}) 2014-01-16 10:58:35 -05:00
daid
df194f75e1 Added PT100 support for Ultiboard2 2014-01-06 11:20:03 +01:00
daid
380144c20f Add Ultiboard2 electronics. With PWM current settings. For the few people that have this new board as experiment in their UM-Original. 2014-01-06 11:05:02 +01: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
Phil Wise
17d6d965dc Use C++ initialization list 
This is the recommended approach for object initialization. The change
doesn't affect binary size (although in theory it could make it smaller).
 2013-12-19 21:21:46 +00:00
Joseivaldo Benito Junior
ce8b9c4fc5 Correct missing parameter from last upmerge 
Signed-off-by: Joseivaldo Benito Junior <jrbenito@benito.qsl.br>
 2013-12-19 00:50:44 -02:00
Joseivaldo Benito Junior
8e48e24c7f Update Delta example files 
Signed-off-by: Joseivaldo Benito Junior <jrbenito@benito.qsl.br>
 2013-12-18 00:04:36 -02:00
ErikZalm
46d2443c7d Merge pull request #676 from IVI053/Marlin_v1 
Minor improvements for encoder configuration, LCD entry for PSU controll and thermistor pins on RAMPS
 2013-12-17 02:28:28 -08:00
-
eed053dffb Revert "Made numbering of heat bed thermistor more logical as D8 is bed, D9 is Extruder 2 and D10 is Extruder 1, so T0 should be E1, T1 E1 and T2 bed to be sequential as MOSFET-Outputs" 
This reverts commit b7eadb9f37.
 2013-12-16 12:22:06 +01:00
Erik van der Zalm
8349fc89a4 Fixed planner bug 2013-12-16 11:40:23 +01:00
Francesco Santini
da2a6f9a31 Accurate bed leveling: x loop inside y and zigzag motion 2013-12-13 10:31:19 +01:00
RicardoGA
d29615dc0c Z and Y dual stepper drivers error 
if you try to enable Z_DUAL_STEPPER_DRIVERS the error "You cannot have dual drivers for both Y and Z" shows even if you don't have defined Y_DUAL_STEPPER_DRIVERS and don't let you compile the firmware

to solve this problem i change this line:

#ifdef Z_DUAL_STEPPER_DRIVERS && Y_DUAL_STEPPER_DRIVERS

to:

#if defined (Z_DUAL_STEPPER_DRIVERS) && defined (Y_DUAL_STEPPER_DRIVERS)

now the error only show if you define both Z_DUAL_STEPPER_DRIVERS and Y_DUAL_STEPPER_DRIVERS
 2013-12-11 14:37:43 -06:00
fsantini
5bde7fcb28 Minor code and comment polishing 2013-12-11 21:27:43 +01:00
-
20faff5935 Incorporate PS_DEFAULT_OFF for starting state on LCD menu entry 2013-12-08 21:35:57 +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
-
b7eadb9f37 Made numbering of heat bed thermistor more logical as D8 is bed, D9 is Extruder 2 and D10 is Extruder 1, so T0 should be E1, T1 E1 and T2 bed to be sequential as MOSFET-Outputs 2013-12-08 21:30:42 +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
fsantini
b64661070e Fixed the plane vector equation to a simpler one (only dependent on the normal) 
Removed the calculation of the inverse matrix since the rotation matrix is orthogonal, therefore inverted == transposed.
Much simpler and mathematically robust.
 2013-12-06 21:32:21 +01:00
Alex Borro
5c44f6c434 Bed Heater monitoring in Controller Fan 
In some cases the Bed Heater FET heats up more then stepper drivers, so
this change add the bed monitoring to the controller fan. As soon as the
bed heater is turned on, the controller fan will run as well.
 2013-11-27 23:23:06 -02: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
Alex Borro
35905ea4f9 Allow heaters to stay full On when PWM=127 
In previous version, even with PWM = 127, the system turns the FET off
and then on in the next cycle. This bevavior may increase the FET heat
dissipation.
It was fixed keeping the FET always On when PWM=127.
 2013-11-27 18:13:38 -02:00
Erik van der Zalm
a94e588765 Changed slow buttons behavior. 2013-11-17 17:41:30 +01:00
Erik van der Zalm
69af392554 Added HEATERS_PARALLEL (Request from reifsnyderb) 
This allows a hot end with two heaters and a FET for each heater. This is useful if the FET is not capable of heating two heaters.
 2013-11-17 13:29:02 +01:00
Erik van der Zalm
48a185d004 Fixed compile errors from bad commits. 2013-11-10 16:36:37 +01:00
ErikZalm
24d1f480b6 Merge pull request #647 from shaggythesheep/newfeature-M226 
Implement M226 - GCode Initiated Pause
 2013-11-10 07:27:01 -08:00
ErikZalm
95b41413e6 Merge pull request #641 from hugokernel/master 
M80 - ATX Power On related modification
 2013-11-10 07:26:35 -08:00