Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge upstream #1

Merged
merged 948 commits into from
May 1, 2015
Merged

Conversation

CptanPanic
Copy link
Owner

No description provided.

epatel and others added 30 commits April 5, 2015 04:13
Have the configurator read from MarlinFirmware repo
Splash screen was shown with every display init.
That means every time the menus where entered.

Note the 2 in the initialisation.
The buffer is already written in two steps a 512 byte.
Without the 2 only the upper half is shown.
This commit checks whether or not HEATER_0 is in use, and if not, skips
the MIN / MAX temperature checks.
Just and only display splashscreen only once.
Fix compile error with Z_DUAL_ENDSTOPS
Should be `retracting` and not `retract`
Because we now can use utf8 with up to 3 bytes per symbol,
lcd_status_message[] must be 3*LCD_WIDTH wide.
Filling up the message, or cutting to length, are fixed to.

Fix for #1832 about at the end.
Disable splash-screen when done once
- Address Issue #1682 at hash #issuecomment-89756858
Bugfix: Temperature checks when no heaters in use
- Sections in all `Configuration_adv.h`
- Recognize JAPANESE/WESTERN/CYRILLIC options
- Better capturing of comments for tooltips
thinkyhead and others added 23 commits April 27, 2015 21:14
Disable endstops between homing bumps
Allow Y to home before X with option in Configuration_adv.h.
Example Configuration for K8200: comments/URL/readme
Make EEPROM reproducible in GCode
…de.h

language_de.h: updated translation and minor typos
Add pin configuration for Brainwave Pro
in all Configurations.
Enable thermal runaway protection by default
- Also move audio feedback into the command
- Added shorthand for `lcd_buzz` availability
Add M428 to set home_offset logically
Fixed sintaxis error of filament runout
CptanPanic added a commit that referenced this pull request May 1, 2015
@CptanPanic CptanPanic merged commit f1d143a into CptanPanic:Development May 1, 2015
CptanPanic pushed a commit that referenced this pull request May 1, 2015
CptanPanic pushed a commit that referenced this pull request May 1, 2015
CptanPanic pushed a commit that referenced this pull request May 1, 2015
In-line comments and escaping fixed by foosel
CptanPanic pushed a commit that referenced this pull request May 1, 2015
CptanPanic pushed a commit that referenced this pull request Apr 28, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.