MPCNC/Firmware
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
3,992 Commits 1 Branch 0 Tags 96 MiB
adc25db8c4
Commit Graph

226 Commits

Author SHA1 Message Date
Richard Wackerbarth
f4599143eb Allow M115 to better reflect the build 2015-04-02 09:20:24 -05:00
Richard Wackerbarth
34c7d45879 Hook for Auto-generated Build Version 
The automatic versioning system extracts a
build version number from the SCM system

That versioning information is written to the file
_Version.h, a file that is NOT preserved in the SCM.

If such a file will be present,
we include it here to utilize the parameters
that are defined therein.
 2015-04-02 09:20:24 -05:00
Chris Roadfeldt
916f59e35f Spaces not tabs in language.h. 
Catch unlikely but possible error and head crash when using
Z_PROBE_REPEATABILITY_TEST
 2015-04-01 19:22:05 -05:00
croadfeldt
06f767d608 Merge remote-tracking branch 'upstream/development' into development 2015-03-30 02:10:49 -05:00
Chris Roadfeldt
fd823449ad Added serial message for Z Probe trigger. 2015-03-28 05:42:38 -05:00
Scott Lahteine
ba871e46bf Fix compiler warnings 
- Patched up for most included configurations
 2015-03-27 20:29:05 -07:00
Scott Lahteine
ffe0df4b36 Latest upstream commits 2015-03-27 18:30:56 -07:00
Scott Lahteine
19d418cd6a Fix up the code to eliminate warnings 2015-03-27 00:32:58 -07:00
AnHardt
20f909567a Merge https://github.com/MarlinFirmware/Marlin into tm-utf-minus-kanji 
Conflicts:
	README.md
Solved
 2015-03-26 10:05:00 +01:00
alexborro
0ce3576685 New Feature: Z_DUAL_ENDSTOPS 
Z_DUAL_ENDSTOPS is a feature to enable the use of 2 endstops for both Z
steppers - Let's call them Z stepper and Z2 stepper.
That way the machine is capable to align the bed during home, since both
Z steppers are homed.
There is also an implementation of M666 (software endstops adjustment)
to this feature.
After Z homing, this adjustment is applied to just one of the steppers
in order to align the bed.
One just need to home the Z axis and measure the distance difference
between both Z axis and apply the math: Z adjust = Z - Z2.
If the Z stepper axis is closer to the bed, the measure Z > Z2 (yes, it
is.. think about it) and the Z adjust would be positive.
Play a little bit with small adjustments (0.5mm) and check the
behaviour.
The M119 (endstops report) will start reporting the Z2 Endstop as well.
 2015-03-24 14:06:44 -03:00
AnHardt
9d589cbb2a Merge https://github.com/MarlinFirmware/Marlin into tm3-utf-minus-kanji 
Conflicts:
	Marlin/example_configurations/delta/generic/Configuration.h
	Marlin/example_configurations/delta/kossel_mini/Configuration.h
	Marlin/language.h

Conflicts solved
 2015-03-24 16:59:15 +01:00
Scott Lahteine
670006b919 Remove invariant code from Configurations 
- Add `Conditionals.h` with calculated configuration values
- Add `SanityCheck.h` with checks for configuration errors
- Remove equivalent code from all configurations
- Move error checks from some sources to `SanityCheck.h` also
- Fix initialization of count_direction in stepper.cpp
 2015-03-19 22:22:23 -07:00
AnHardt
1883e1bb60 Applied thinkyheads corrections from 2015-03-17 2015-03-17 11:23:44 +01:00
AnHardt
00b162a993 Merge remote-tracking branch 'origin/utf-kanji' into tm-utf-minus-kanji 
Conflicts:
	Marlin/language.h
Conflict cleaned
 2015-03-16 17:13:49 +01:00
AnHardt
2f374f1465 Removed Kanji. 2015-03-15 16:44:37 +01:00
AnHardt
96f8d20f2f Change selection logic another time 
Automatic selection was to unflexible.

Updated documentation

Updated language files to new logic and documentation.

Updated bdf2u8g.exe
 2015-03-13 14:26:58 +01:00
AnHardt
2d5134b0ed Introduce - clean - prepae language files 2015-03-10 17:46:25 +01:00
Scott Lahteine
9eed8c8cf0 Make sure a ROM is selected for ULTRA_LCD 2015-03-06 15:37:54 -08:00
AnHardt
3024f6c706 Undubble MSG_MIN &MSG MAX 2015-03-06 00:25:44 +01:00
Scott Lahteine
dfb38874f8 Some suggested changes for #1555 2015-03-03 00:48:20 -08:00
Scott Lahteine
fd1ea9d56f Move literal strings to language files 2015-02-24 23:03:08 -08:00
AnHardt
3aac2df057 Now the oter way around. 
Include of language_en.h now behind national language.

All "#define MSG_STR_*" now surrounded by #ifndef and #endif.
 2015-02-08 20:41:20 +01:00
AnHardt
488633bf44 #include "language_en.h" before the national language in language.h 
+ May decrease the workload for feature developers. They may omit to
update all the language files but "language_en.h". When loading _en
first, all new features give some display, but the new in English.

- May throw some additional warnings about redefinition during compile.
 2015-02-08 14:26:24 +01:00
Scott Lahteine
b3973ed224 Fix HD44780 misspelled as HD44870 2015-02-02 22:33:58 -08:00
AnHardt
2dd43a82b1 Ups. #else added 2015-02-01 14:16:35 +01:00
AnHardt
8dce5a6644 Improve new charset featur. 
Select DOGM-displays automaticly.
Give hint where to find charsets.
Add '²' and '³' characters.
 2015-02-01 13:09:59 +01:00
Scott Lahteine
c009c81e65 make marlin-main the default 2015-01-31 23:11:28 -08:00
Scott Lahteine
f4ebc02555 marlin url 2015-01-31 23:09:12 -08:00
Scott Lahteine
0af9a0bf57 url to firmware downloads 2015-01-31 22:19:45 -08:00
Scott Lahteine
3f3ad9b3ad typo 2015-01-31 21:42:53 -08:00
Scott Lahteine
07639053fb Add support for BQ Prusa i3 "Hephestos" 2015-01-31 21:38:30 -08:00
AnHardt
76bf93efcb Revert "get STR_THERMOMETER from ultralcd_implementation_hitachi_HD44780.h" 
This reverts commit 4d5b0e2037.
 2015-01-30 22:42:44 +01:00
AnHardt
4d5b0e2037 get STR_THERMOMETER from ultralcd_implementation_hitachi_HD44780.h 2015-01-30 22:20:10 +01:00
AnHardt
6e6e3cf443 merged https://github.com/MarlinFirmware/Marlin.git 2015-01-30 11:05:29 +01:00
AnHardt
e045034c3f Included Configuration.h to read the defined charsets. 
Defined the charsets plus a default.
 2015-01-30 10:31:58 +01:00
Scott Lahteine
073c59c50a Clean up some formatting 
- Also partial cleanup of Marlin_main.cpp with a smidgen of Doxygen.
 2015-01-29 18:52:21 -08:00
Scott Lahteine
1258980832 Merge pull request #1429 from bq/Development 
Add bq Witbox 3D printer
 2015-01-29 01:14:18 -08:00
Victor Andueza
766762a4dc Change url link 2015-01-29 09:28:50 +01:00
Scott Lahteine
9bc9051405 Flag EEPROM write errors on serial output 
- Also adds a language string for the error.
- Also adds SERIAL_EOL as an alias for SERIAL_ECHOLN(“”)
 2015-01-28 21:19:51 -08:00
Victor Andueza
13118cde33 Add bq Witbox 3D printer 2015-01-28 16:52:36 +01:00
Scott Lahteine
0a21727c0a Portuguese (pt) and Brazilian Portuguese (pt-br) 2015-01-27 21:45:21 -08:00
CONSULitAS
3b50a5e2e6 Add: Board for Vellemann K8200 (derived from 3Drag) 
## Add: Board for Vellemann K8200 (derived from 3Drag)

* Boards.h: updated comment for board 3Drag - K8200 removed
* Boards.h: added `BOARD_K8200` with ID 78

* language.h.: machine name and firmware URL for new board

* pins.h: added `K8200` to any `#if` with `3Drag` and corresponding
comments
 2015-01-20 20:46:20 +01:00
Luis E Alvarado
7ae548cf34 Update Marlin Firmware URL 2015-01-07 05:26:47 -06:00
Caleb Anderson
236db44669 Fix spacing 2014-12-29 10:44:55 -07:00
Caleb Anderson
e6774fb7d2 Using the new language implementation wasn't behaving as expected. 
No matter what LANGUAGE_CHOICE was set to it would always take the en branch.
I revamped it a bit to use a macro to create the language include file name. This required a slight tweak to the RU declaration since it's special-cased in a couple places in code.

This is an attempt to pull my changes from #1222 over.
 2014-12-29 10:43:19 -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
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
Scott Lahteine
e970461adb Clean up, move unused to the bottom, add headings 2014-12-18 10:33:00 -08:00
Scott Lahteine
0c06e97e98 Split up languages.h, use ISO codes 
Breaking up languages.h makes it easier to translate. Using language
codes makes it easier to select a language and sets the naming standard.
 2014-12-18 09:31:19 -08:00
Scott Lahteine
3ebfd29312 Print a message when printing is aborted 
Messages in gcode files like “M117 Printing…” were not being cleared on
Stop Print.
 2014-12-13 06:01:46 -08:00
elgambitero
433ac29d31 Updated a bit of spanish language 2014-11-27 22:02:49 +01:00
Erik van der Zalm
c40c7b589b Merge pull request #1095 from thinkyhead/codeclean 
Simple code cleanup. Rename "homeing" to homing.
 2014-10-06 13:36:48 +02:00
Scott Lahteine
2f6c57eadc Proposed feature: Set Home Offsets 
Add an item to the LCD menu that applies the current axis position to
the “add_homeing” offset.
 2014-10-05 13:35:45 -07:00
Scott Lahteine
f989bd5435 Simple code cleanup. Rename "homeing" to homing. 2014-10-05 13:20:53 -07:00
Gina Häußge
1e9dc85148 Do not use translations for the serial console messages 
The serial protocol has to stay machine readable, without having
to cope with a ton of different human language variants. So
just leave it at the original english version.

Should fix ErikZalm/Marlin#1052
 2014-08-29 18:02:59 +02:00
Dim3nsioneer
3c927901a4 Implementation of FW extruder change retract 
FW retraction is extended onto swap retraction invoked by 'G10 S1'.
Bookkeeping of the retract state of all extruders allows for having one
extruder fw standard retracted while another extruder is swap retracted.
An LCD menu item for the swap retract and recover length was added.
 2014-06-02 17:02:10 +02:00
Cameron Lai
1cbcbb0971 Add makibox machine information 2014-04-24 12:55:21 +08: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
nothinman
086ff1644f Merge pull request #852 from pixatintes/patch-1 
Update language.h
 2014-04-13 00:46:17 +01:00
nothinman
c23376f2e7 Merge pull request #837 from whosawhatsis/fwretract 
FWRETRACT in mm/s
 2014-04-04 11:47:58 +01: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
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
Dim3nsioneer
944ced87c5 Extended Preheat options 
Preheat LCD menus base on code by D-Base
 2014-03-17 18:37:46 +01:00
Dim3nsioneer
3906f27c46 Individual extruder flow rate 
Extension of M221, Tune menu
 2014-03-15 18:09:46 +01: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
Tommi Lamberg
15d1b8d719 Fixed finnish translation 
- Fixed Few finnish transalations
- Removed duplicate contrast define
 2014-03-05 14:02:52 +02: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
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
Marco
cf5c3b6610 Added dutch to language.h 2014-02-17 17:00:50 +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
9b7d87e885 Remove duplicate contrast define. 2014-02-13 10:50:17 +01:00
Martin Lukasik
0b9ecf3824 Language cleanup, part 1. 2014-02-12 13:21:26 +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
MatixYo
36086d3ca4 Update language.h 
Updated Polish translations.
 2014-02-07 19:15:51 +01:00
whosawhatsis
d24df7af2c M200 implementation 2014-01-31 00:54:19 -08:00
Alex Borro
05932e4458 Add Z Probe Offset to EEPROM and Ultra LCD 2014-01-16 18:13:46 -02:00
daid
df194f75e1 Added PT100 support for Ultiboard2 2014-01-06 11:20:03 +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
Kaz Walker
a5e8575829 Add UUID support to M115 responses. 2013-11-01 14:51:50 -06:00
Guillaume Seguin
eb23a68e92 Update French translation in language.h 2013-07-28 18:50:47 +02:00
Guillaume Seguin
44f327d738 Uniformly reindent language.h 2013-07-23 22:13:40 +02:00
Guillaume Seguin
326d2db025 Update language.h so that all languages compile 
Some strings still need translation, but at least everything compiles.
 2013-07-23 22:11:54 +02:00
Guillaume Seguin
2cb716f513 Run Marlin/language.h through dos2unix 2013-07-23 21:49:37 +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
cdaaad3df1 Merge branch 'Marlin_v1' of https://github.com/makr3d/Marlin into makr3d-Marlin_v1 2013-07-14 15:45:49 +02:00
Michael Mayer
e509cdbeb0 added contrast control function for gLCDs 2013-07-14 15:28:26 +07:00
Gabino Lopez
68be33b1fc Update language.h 
I update the spanish Messages, now this compile for spanish language.
 2013-07-04 10:23:00 +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
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