Scott Lahteine
a00ebf03d4
Merge pull request #1868 from AnHardt/LCD_STR
...
Moved the definitions of the LCD_STR_* to Conditionals.h
10 years ago
AnHardt
540dbb35e2
And an other MSG_BED in Marlin_main.cpp
10 years ago
AnHardt
14d4419e16
Replaced SERIAL_PROTOCOLPGM(MSG_BED) with SERIAL_PROTOCOLPGM("Bed")
...
Resolved some warnings in Marlin_main.cpp regarding compares of signed and unsigned integers by replacing 'int' or 'uint16_t' with 'uint8_t'.
10 years ago
AnHardt
ea897654a4
Moved the definitions of the LCD_STR_* to Conditionals.h
...
to avoid errors in Marlin_main.cpp. #1860
In the include tree of Marlin_main.cpp the decision between the display types is not made.
To include the right LCD_STR_* ether 'dogm_lcd_implementation.h' or 'ultralcd_implementation_hitachi_HD44780.h' with all their code.
A 'dogm_lcd_implementation.h.h' would be a curiosity.
So i moved both of the definition blocks to conditionals.h
On the long term it could make sense to use the same numbering for the u8glib and the hitachi symbols.
10 years ago
AnHardt
6a514f3dc9
Aplied HAS_LCD_CONTRAST also to Marlin_main.cpp
...
and cleaned typo.
10 years ago
AnHardt
a76fb42ca6
Merge https://github.com/MarlinFirmware/Marlin into contrast
10 years ago
AnHardt
bcc04192fc
Remove Contrast Menu for U8GLIB_ST7920
...
The other two devices we use in u8glib have more than only dummy code.
Checked this in the library code.
10 years ago
Scott Lahteine
4788b59300
Thermistor values for configurator
10 years ago
Scott Lahteine
bb917ecda8
Merge pull request #1853 from thinkyhead/dev_version
...
Set version to "1.0.3 dev"
10 years ago
Scott Lahteine
caa7734402
Merge pull request #1864 from thinkyhead/is_running
...
IsStopped / IsRunning inline
10 years ago
Scott Lahteine
3162971cd6
current_position not static
10 years ago
Scott Lahteine
27cb90da8b
IsStopped / IsRunning inline
10 years ago
Max
07fc2b5b70
Update language_ru.h
10 years ago
Scott Lahteine
756bb5e268
Cleanup formatting in hitachi & dogm lcd
10 years ago
Scott Lahteine
7431ef7e2d
Merge branch 'Development' into dev_version
...
Latest upstream commits
10 years ago
Scott Lahteine
43773ff735
Formatting and lcd contrast masking
10 years ago
Scott Lahteine
eb6e3886f4
Set version to "1.0.3 dev"
10 years ago
Scott Lahteine
cf9b58452c
Minimum delay in menu click feedback
...
Squished #1849
10 years ago
Scott Lahteine
1d291be2ba
Fix de after PREVENT_DANGEROUS_EXTRUDE
...
- Set `de` to 0 when `position[E] = target[E]`
- Address regression mention in #1846
10 years ago
Scott Lahteine
e03da4805b
Merge pull request #1774 from epatel/Development
...
Mesh bed leveling: Added G29 S3 + finer display steps during manual input + bug fix
10 years ago
Scott Lahteine
f7c4e7e19f
Fix G29 not deploying in some instances
10 years ago
Edward Patel
a9ed39b12d
Moved checks into SanityCheck.h + removed previous added checks.
10 years ago
Edward Patel
002340f32c
Merge branch 'Development-Marlin' into Development
10 years ago
Scott Lahteine
c379f17117
Encapsulate setting of homing_bump_feedrate
10 years ago
Scott Lahteine
7d2c2f1790
Updates for the configurator
...
- Sections in all `Configuration_adv.h`
- Recognize JAPANESE/WESTERN/CYRILLIC options
- Better capturing of comments for tooltips
10 years ago
Scott Lahteine
967db181d0
Latest upstream commits
10 years ago
Scott Lahteine
e502144eda
Fixup formatting of last commit
10 years ago
Scott Lahteine
d05efa008d
Merge pull request #1825 from shaggythesheep/bugfix_no_heaters
...
Bugfix: Temperature checks when no heaters in use
10 years ago
Scott Lahteine
d20f42c883
Don't stow the probe until the last grid point!
...
- Address Issue #1682 at hash #issuecomment-89756858
10 years ago
Scott Lahteine
5c2bb05af3
Merge pull request #1839 from AnHardt/fix-statusmessage
...
Fix lcd_status_message
10 years ago
Scott Lahteine
d70a4a3847
Merge pull request #1823 from AnHardt/splashscreen
...
Disable splash-screen when done once
10 years ago
Scott Lahteine
56aea5f8e5
Merge pull request #1829 from Natealus/Development
...
Azteeg X3 Pro Pin fix ups
10 years ago
Scott Lahteine
6a860b99dc
Merge pull request #1828 from Wackerbarth/Configurator
...
Update Configurator Files
10 years ago
AnHardt
ac843fbf3b
Fix lcd_status_message
...
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.
10 years ago
Scott Lahteine
6d084c017f
Fix typo in FWRETRACT handler
...
Should be `retracting` and not `retract`
10 years ago
Edward Patel
d27c82a450
Added check for Delta printers in Mesh, #error not yet supported.
10 years ago
Edward Patel
9a093b2e8f
Added #error + mention not to enable ABL and Mesh at the same time
10 years ago
AnHardt
6ae714894e
Now the simplycistic solution.
...
Just and only display splashscreen only once.
10 years ago
AnHardt
d521693641
Revert "Draw content in display loop only when needed"
...
This reverts commit bf04a92cc0
.
10 years ago
Natealus
b6f2bff461
Azteeg X3 Pro Pin fix ups
10 years ago
Scott Lahteine
d867c18535
Fix compile error with Z_DUAL_ENDSTOPS
10 years ago
Richard Wackerbarth
46474cf2f2
Incorporate @section headers from configurator
10 years ago
Richard Wackerbarth
cf66cb8808
Bring configurator up-to-date
10 years ago
Richard Miles
1a5293c2ce
Prevents MINTEMP / MAXTEMP when no heaters present
...
This commit checks whether or not HEATER_0 is in use, and if not, skips
the MIN / MAX temperature checks.
10 years ago
Edward Patel
5360158545
Merge branch 'Development-Marlin' into Development
10 years ago
AnHardt
bf04a92cc0
Draw content in display loop only when needed
...
Example for splash screen.
10 years ago
AnHardt
9865318f1c
Disable splash-screen when done once
...
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.
10 years ago
Scott Lahteine
53eb662908
Have the configurator read from MarlinFirmware repo
10 years ago
Edward Patel
d24ea7c03f
Added Comment in hope of github seeing these updates
10 years ago
Edward Patel
61de6ecd54
Added change to example Configuration.h's
10 years ago