MPCNC/Firmware2
1
0
Fork 0
Code Issues 1 Pull Requests Releases Wiki Activity
1,277 Commits 1 Branch 0 Tags 129 MiB
d1c64b9dc4
Commit Graph

1277 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Gabe Rosenhouse
d1c64b9dc4 Fix syntax error introduced in 477b6fa1d 2014-02-17 07:56:19 -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
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
nothinman
3b193d1b5f Merge pull request #775 from MissionSt/lang-fix/bed 
Use language.h for "bed"
 2014-02-17 10:26:23 +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
Gabe Rosenhouse
8c5675c290 Use language.h instead of English literals for "bed" 2014-02-16 17:16:00 -08:00
nothinman
a466c8ef68 Merge pull request #774 from MissionSt/cleanup/probe_pt 
Refactor of z probing for auto bed leveling
 2014-02-17 01:08:58 +00: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
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
nothinman
5f797ca29f Updated Polish, changed default firmware URL to Marlin. 2014-02-11 22:38:01 +00:00
nothinman
1a6d21bb60 Merge pull request #761 from Cylindric3D/localisation 
Move strings in ultralcd.cpp into language.h.
 2014-02-11 15:39:18 +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
nothinman
b18b40feff Merge pull request #760 from danielmartinez/aragonese_trans 
Aragonese translation
 2014-02-11 14:28:03 +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
ErikZalm
8ebcc9dc3a Merge pull request #748 from wolfmanjm/add/azteegx3pro 
Add/azteegx3pro
 2014-02-09 17:50:15 +01:00
nothinman
19530c9945 Revert "Merge pull request #756 from danielmartinez/aragones" 
This reverts commit 6f76066ab3, reversing
changes made to e1ae7952eb.
 2014-02-09 16:21:00 +00:00
nothinman
6f76066ab3 Merge pull request #756 from danielmartinez/aragones 
Add Aragonese translation
 2014-02-09 13:42:36 +00:00
Daniel Martinez
8b67f6f3e8 Add Aragonese translation 2014-02-09 12:54:05 +01:00
MatixYo
36086d3ca4 Update language.h 
Updated Polish translations.
 2014-02-07 19:15:51 +01: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