4039 Commits (89838cdb10c3dbbc300b078c653be72769ed9cde)
 

Author SHA1 Message Date
AnHardt 56fc3a4835 bgr -> bg
+ update in documentation
10 years ago
Scott Lahteine 7a1aef1450 Merge pull request #1877 from AnHardt/display-only
Made encoderPosition and quick_feedback dependant on NEWPANEL
10 years ago
Scott Lahteine 6096164d79 Merge pull request #1878 from thinkyhead/cold_extrude
Cold extrude
10 years ago
Scott Lahteine a488445cbe Fix spelling of "too" 10 years ago
Scott Lahteine b1950a7f25 Merge pull request #1875 from Natealus/Development
Z Probe inverting not present in example configs, causes error
10 years ago
AnHardt df50523605 Made encoderPosition and quick_feedback dependant on NEWPANEL
where the hardware is available.
Fix for #1873
10 years ago
Scott Lahteine dcde09fdff Merge remote-tracking branch 'upstream/Development' into Development
Latest upstream commits
10 years ago
Scott Lahteine 2ca099d1e7 Merge pull request #1876 from thinkyhead/cold_extrude
Catch dangerous extrude before trying several
10 years ago
Scott Lahteine 837ceb9abb Merge pull request #1867 from epatel/Development
Added sanity check for MESH_NUM_X_POINTS and MESH_NUM_Y_POINTS
10 years ago
Scott Lahteine a95544f92a Spell adjustment 10 years ago
Scott Lahteine a00ebf03d4 Merge pull request #1868 from AnHardt/LCD_STR
Moved the definitions of the LCD_STR_* to Conditionals.h
10 years ago
Scott Lahteine 7f22464353 Merge remote-tracking branch 'upstream/Development' into Development
Latest upstream commits
10 years ago
Scott Lahteine 1269c445ab Catch dangerous extrude before trying several 10 years ago
Scott Lahteine 4abd23ae9e Merge pull request #1866 from AnHardt/contrast
Remove Contrast Menu for device U8GLIB_ST7920
10 years ago
Natealus 585eee6549 Z Probe inverting not present in example configs, causes error
The line const bool Z_PROBE_ENDSTOP_INVERTING = false; // set to true to
invert the logic of the endstop is in the main configuration.h but
wasn't present in the example configuration.h's. Causes a compiling
error with Z Probe enabled. Just added it to all the configs. :)
10 years ago
AnHardt c5961892e3 Bulgarian for all the Configuration.h's 10 years ago
AnHardt 6248c93f37 Introduction of Bulgarian - language_bgr.h
Thank you @Nprod!
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
Edward Patel 7dc64efe67 Added sanity check for MESH_NUM_X_POINTS and MESH_NUM_Y_POINTS 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 98f3130a5c Merge pull request #1865 from thinkyhead/configurator_values
Thermistor values for configurator
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 c82da64d10 Merge pull request #1863 from lcfm1/patch-3
Update language_ru.h
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 419f3ebc03 Merge pull request #1850 from OpCode1300/docs
Fix typo in readme
10 years ago
Administrator ff429cdd8a Fix typo in readme 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 5b2c67f4c3 Merge pull request #1847 from thinkyhead/more_configurator
Fix G29 not deploying probe in some instances
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 3db4e0fb5d Merge pull request #1842 from thinkyhead/more_configurator
Configurator updates
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