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.
11 years ago
98f3130a5c
Merge pull request #1865 from thinkyhead/configurator_values
...
Thermistor values for configurator
11 years ago
4788b59300
Thermistor values for configurator
11 years ago
bb917ecda8
Merge pull request #1853 from thinkyhead/dev_version
...
Set version to "1.0.3 dev"
11 years ago
caa7734402
Merge pull request #1864 from thinkyhead/is_running
...
IsStopped / IsRunning inline
11 years ago
c82da64d10
Merge pull request #1863 from lcfm1/patch-3
...
Update language_ru.h
11 years ago
3162971cd6
current_position not static
11 years ago
27cb90da8b
IsStopped / IsRunning inline
11 years ago
07fc2b5b70
Update language_ru.h
11 years ago
756bb5e268
Cleanup formatting in hitachi & dogm lcd
11 years ago
7431ef7e2d
Merge branch 'Development' into dev_version
...
Latest upstream commits
11 years ago
43773ff735
Formatting and lcd contrast masking
11 years ago
eb6e3886f4
Set version to "1.0.3 dev"
11 years ago
cf9b58452c
Minimum delay in menu click feedback
...
Squished #1849
11 years ago
419f3ebc03
Merge pull request #1850 from OpCode1300/docs
...
Fix typo in readme
11 years ago
ff429cdd8a
Fix typo in readme
11 years ago
1d291be2ba
Fix de after PREVENT_DANGEROUS_EXTRUDE
...
- Set `de` to 0 when `position[E] = target[E]`
- Address regression mention in #1846
11 years ago
e03da4805b
Merge pull request #1774 from epatel/Development
...
Mesh bed leveling: Added G29 S3 + finer display steps during manual input + bug fix
11 years ago
5b2c67f4c3
Merge pull request #1847 from thinkyhead/more_configurator
...
Fix G29 not deploying probe in some instances
11 years ago
f7c4e7e19f
Fix G29 not deploying in some instances
11 years ago
a9ed39b12d
Moved checks into SanityCheck.h + removed previous added checks.
11 years ago
002340f32c
Merge branch 'Development-Marlin' into Development
11 years ago
3db4e0fb5d
Merge pull request #1842 from thinkyhead/more_configurator
...
Configurator updates
11 years ago
c379f17117
Encapsulate setting of homing_bump_feedrate
11 years ago
7d2c2f1790
Updates for the configurator
...
- Sections in all `Configuration_adv.h`
- Recognize JAPANESE/WESTERN/CYRILLIC options
- Better capturing of comments for tooltips
11 years ago
967db181d0
Latest upstream commits
11 years ago
e502144eda
Fixup formatting of last commit
11 years ago
d05efa008d
Merge pull request #1825 from shaggythesheep/bugfix_no_heaters
...
Bugfix: Temperature checks when no heaters in use
11 years ago
d20f42c883
Don't stow the probe until the last grid point!
...
- Address Issue #1682 at hash #issuecomment-89756858
11 years ago
5c2bb05af3
Merge pull request #1839 from AnHardt/fix-statusmessage
...
Fix lcd_status_message
11 years ago
d70a4a3847
Merge pull request #1823 from AnHardt/splashscreen
...
Disable splash-screen when done once
11 years ago
56aea5f8e5
Merge pull request #1829 from Natealus/Development
...
Azteeg X3 Pro Pin fix ups
11 years ago
6a860b99dc
Merge pull request #1828 from Wackerbarth/Configurator
...
Update Configurator Files
11 years ago
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.
11 years ago
6d084c017f
Fix typo in FWRETRACT handler
...
Should be `retracting` and not `retract`
11 years ago
ed7a2f9fac
Merge pull request #1827 from thinkyhead/fixup_dualz
...
Fix compile error with Z_DUAL_ENDSTOPS
11 years ago
d27c82a450
Added check for Delta printers in Mesh, #error not yet supported.
11 years ago
9a093b2e8f
Added #error + mention not to enable ABL and Mesh at the same time
11 years ago
6ae714894e
Now the simplycistic solution.
...
Just and only display splashscreen only once.
11 years ago
d521693641
Revert "Draw content in display loop only when needed"
...
This reverts commit bf04a92cc0
11 years ago
b6f2bff461
Azteeg X3 Pro Pin fix ups
11 years ago
d867c18535
Fix compile error with Z_DUAL_ENDSTOPS
11 years ago
46474cf2f2
Incorporate @section headers from configurator
11 years ago
cf66cb8808
Bring configurator up-to-date
11 years ago
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.
11 years ago
5360158545
Merge branch 'Development-Marlin' into Development
11 years ago
bf04a92cc0
Draw content in display loop only when needed
...
Example for splash screen.
11 years ago
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.
11 years ago
f5dad8ade2
Merge pull request #1819 from thinkyhead/fixup_probing
...
Have the configurator read from MarlinFirmware repo
11 years ago
53eb662908
Have the configurator read from MarlinFirmware repo
11 years ago
AnHardt