227 Commits (50e3482e0ad411604a6d77e350151647db937122)

Author SHA1 Message Date
Richard Wackerbarth ccdaea51ba Add KosselPro 10 years ago
Richard Wackerbarth f4599143eb Allow M115 to better reflect the build 10 years ago
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.
10 years ago
Chris Roadfeldt 916f59e35f Spaces not tabs in language.h.
Catch unlikely but possible error and head crash when using
Z_PROBE_REPEATABILITY_TEST
10 years ago
croadfeldt 06f767d608 Merge remote-tracking branch 'upstream/development' into development 10 years ago
Chris Roadfeldt fd823449ad Added serial message for Z Probe trigger. 10 years ago
Scott Lahteine ba871e46bf Fix compiler warnings
- Patched up for most included configurations
10 years ago
Scott Lahteine ffe0df4b36 Latest upstream commits 10 years ago
Scott Lahteine 19d418cd6a Fix up the code to eliminate warnings 10 years ago
AnHardt 20f909567a Merge https://github.com/MarlinFirmware/Marlin into tm-utf-minus-kanji
Conflicts:
	README.md
Solved
10 years ago
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.
10 years ago
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
10 years ago
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
10 years ago
AnHardt 1883e1bb60 Applied thinkyheads corrections from 2015-03-17 10 years ago
AnHardt 00b162a993 Merge remote-tracking branch 'origin/utf-kanji' into tm-utf-minus-kanji
Conflicts:
	Marlin/language.h
Conflict cleaned
10 years ago
AnHardt 2f374f1465 Removed Kanji. 10 years ago
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
10 years ago
AnHardt 2d5134b0ed Introduce - clean - prepae language files 10 years ago
Scott Lahteine 9eed8c8cf0 Make sure a ROM is selected for ULTRA_LCD 10 years ago
AnHardt 3024f6c706 Undubble MSG_MIN &MSG MAX 10 years ago
Scott Lahteine dfb38874f8 Some suggested changes for #1555 10 years ago
Scott Lahteine fd1ea9d56f Move literal strings to language files 10 years ago
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.
10 years ago
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.
10 years ago
Scott Lahteine b3973ed224 Fix HD44780 misspelled as HD44870 10 years ago
AnHardt 2dd43a82b1 Ups. #else added 10 years ago
AnHardt 8dce5a6644 Improve new charset featur.
Select DOGM-displays automaticly.
Give hint where to find charsets.
Add '²' and '³' characters.
10 years ago
Scott Lahteine c009c81e65 make marlin-main the default 10 years ago
Scott Lahteine f4ebc02555 marlin url 10 years ago
Scott Lahteine 0af9a0bf57 url to firmware downloads 10 years ago
Scott Lahteine 3f3ad9b3ad typo 10 years ago
Scott Lahteine 07639053fb Add support for BQ Prusa i3 "Hephestos" 10 years ago
AnHardt 76bf93efcb Revert "get STR_THERMOMETER from ultralcd_implementation_hitachi_HD44780.h"
This reverts commit 4d5b0e2037.
10 years ago
AnHardt 4d5b0e2037 get STR_THERMOMETER from ultralcd_implementation_hitachi_HD44780.h 10 years ago
AnHardt 6e6e3cf443 merged https://github.com/MarlinFirmware/Marlin.git 10 years ago
AnHardt e045034c3f Included Configuration.h to read the defined charsets.
Defined the charsets plus a default.
10 years ago
Scott Lahteine 073c59c50a Clean up some formatting
- Also partial cleanup of Marlin_main.cpp with a smidgen of Doxygen.
10 years ago
Scott Lahteine 1258980832 Merge pull request #1429 from bq/Development
Add bq Witbox 3D printer
10 years ago
Victor Andueza 766762a4dc Change url link 10 years ago
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(“”)
10 years ago
Victor Andueza 13118cde33 Add bq Witbox 3D printer 10 years ago
Scott Lahteine 0a21727c0a Portuguese (pt) and Brazilian Portuguese (pt-br) 10 years ago
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
10 years ago
Luis E Alvarado 7ae548cf34 Update Marlin Firmware URL 10 years ago
Caleb Anderson 236db44669 Fix spacing 10 years ago
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.
10 years ago
fmalpartida ec33df0554 Merge branch 'SAV-MkI_merge' into Development
Tested for SAV MKI and SAV 3D LCD on lewihe.
10 years ago
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.
10 years ago
Scott Lahteine e970461adb Clean up, move unused to the bottom, add headings 10 years ago
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.
10 years ago
Scott Lahteine 3ebfd29312 Print a message when printing is aborted
Messages in gcode files like “M117 Printing…” were not being cleared on
Stop Print.
10 years ago
elgambitero 433ac29d31 Updated a bit of spanish language 10 years ago
Erik van der Zalm c40c7b589b Merge pull request #1095 from thinkyhead/codeclean
Simple code cleanup. Rename "homeing" to homing.
10 years ago
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.
10 years ago
Scott Lahteine f989bd5435 Simple code cleanup. Rename "homeing" to homing. 10 years ago
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
10 years ago
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.
11 years ago
Cameron Lai 1cbcbb0971 Add makibox machine information 11 years ago
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)
11 years ago
nothinman 086ff1644f Merge pull request #852 from pixatintes/patch-1
Update language.h
11 years ago
nothinman c23376f2e7 Merge pull request #837 from whosawhatsis/fwretract
FWRETRACT in mm/s
11 years ago
pixatintes a3530d1141 Update language.h
Updated to latest version.
11 years ago
pixatintes 990e770e15 Update language.h
Added catalan language
11 years ago
Dim3nsioneer c8cdd1fc6f Bugfixes for language option 6 (russian) 11 years ago
Dim3nsioneer 7395dafc1e semantic changes in language.h 11 years ago
Dim3nsioneer fad2a60ce6 Corrections for preheat extension in language.h 11 years ago
Dim3nsioneer 944ced87c5 Extended Preheat options
Preheat LCD menus base on code by D-Base
11 years ago
Dim3nsioneer 3906f27c46 Individual extruder flow rate
Extension of M221, Tune menu
11 years ago
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.
11 years ago
Tommi Lamberg 15d1b8d719 Fixed finnish translation
- Fixed Few finnish transalations
- Removed duplicate contrast define
11 years ago
Cylindric ea669cb504 Fix some extra and some missing tabs, to make the file consistent. 11 years ago
Cylindric b46a1b6360 Update the menu plan document with the current menu as per ultralcd.cpp. 11 years ago
Marco 498d76fd79 Fixed some messages where the text shown on the screen was more than 17 characters 11 years ago
Marco cf5c3b6610 Added dutch to language.h 11 years ago
nothinman 7dcd350941 A few changes to Russian, changed LCD strings to be <=17 characters. 11 years ago
daid 9b7d87e885 Remove duplicate contrast define. 11 years ago
Martin Lukasik 0b9ecf3824 Language cleanup, part 1. 11 years ago
nothinman 5f797ca29f Updated Polish, changed default firmware URL to Marlin. 11 years ago
Mark Hanford 0778f5f028 Add missing entries to the new Aragonian language. 11 years ago
Mark Hanford 54bab3e0d0 Merge branch 'Marlin_v1' into localisation
Conflicts:
	Marlin/language.h
11 years ago
Mark Hanford bdd0211aeb Move strings in ultralcd.cpp into language.h. 11 years ago
Daniel Martinez c8e5a82d49 keep English as default lang. 11 years ago
Daniel Martinez f64592e362 Add Aragonese translation 11 years ago
MatixYo 36086d3ca4 Update language.h
Updated Polish translations.
11 years ago
whosawhatsis d24df7af2c M200 implementation 11 years ago
Alex Borro 05932e4458 Add Z Probe Offset to EEPROM and Ultra LCD 11 years ago
daid df194f75e1 Added PT100 support for Ultiboard2 11 years ago
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.
11 years ago
Erik van der Zalm 48a185d004 Fixed compile errors from bad commits. 11 years ago
Kaz Walker a5e8575829 Add UUID support to M115 responses. 11 years ago
Guillaume Seguin eb23a68e92 Update French translation in language.h 12 years ago
Guillaume Seguin 44f327d738 Uniformly reindent language.h 12 years ago
Guillaume Seguin 326d2db025 Update language.h so that all languages compile
Some strings still need translation, but at least everything compiles.
12 years ago
Guillaume Seguin 2cb716f513 Run Marlin/language.h through dos2unix 12 years ago
Guillaume Seguin 34da3a0a3f Merge github.com:ErikZalm/Marlin into Marlin_v1
Conflicts:
	Marlin/language.h
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
Michael Mayer e509cdbeb0 added contrast control function for gLCDs 12 years ago
Gabino Lopez 68be33b1fc Update language.h
I update the spanish Messages, now this compile for spanish language.
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 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