179 Commits (7d2c2f179092fba5204476ad2b0bae6272e07435)

Author SHA1 Message Date
Richard Wackerbarth 4119738e69 Deferring default definition made #undef unnecessary 10 years ago
Scott Lahteine 5c1f08a35f Merge pull request #1772 from croadfeldt/Merge_cleanup
Z_PROBE_ENDSTOP
10 years ago
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