Jérémie FRANCOIS
22a7985445
reverted to upstream
10 년 전
Jérémie FRANCOIS
b3bda57ca2
reverted to upstream
10 년 전
Jérémie FRANCOIS
9d75a56b56
Merge remote-tracking branch 'upstream/Development' into Development
Conflicts:
Marlin/Configuration.h
Marlin/Marlin_main.cpp
10 년 전
Scott Lahteine
d75cd69de4
Merge pull request #1488 from Wurstnase/Development
Bedleveling: X and Y must be Integers not Float!
10 년 전
Scott Lahteine
eb5889b3da
Merge pull request #1479 from AnHardt/en_first
#include "language_en.h" before the national language in language.h
10 년 전
Wurstnase
4546c92f5b
X and Y must be Integers not Float!
https://github.com/Wurstnase/Marlin/blob/Development/Marlin/Configuration.h#L427
10 년 전
Scott Lahteine
32d4dd073f
Merge pull request #1487 from AnHardt/iss1485
Fix for #1485
10 년 전
Scott Lahteine
f92b0dc6c7
Merge pull request #1486 from Souko/patch-1
Update ultralcd_st7920_u8glib_rrd.h
10 년 전
AnHardt
c246026bda
Sorry.
10 년 전
AnHardt
07e488cfae
Fix for #1485
10 년 전
Souko
e7ecf14d0c
Update ultralcd_st7920_u8glib_rrd.h
Fixed delay-times during Init. REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER won't get initialized on some Boards because delay was to short.
10 년 전
Scott Lahteine
8be25389f2
Merge pull request #1477 from AnHardt/languagetoconfig
Make display language configurable in Configuration.h
10 년 전
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 년 전
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 년 전
AnHardt
8e92729141
Make display language configurable in Configuration.h
10 년 전
Jérémie FRANCOIS
85e5aa4011
Generalized enqueue_commands_P, and moved them to Marlin_main as they should
10 년 전
Scott Lahteine
c093ea36e6
Merge pull request #1472 from thinkyhead/issue_1471_fix
Fan speed and 4th extruder on graphical LCD
10 년 전
Scott Lahteine
aa67b38a44
Fan speed and 4th extruder on graphical LCD
- Display fan speed 0-1 as “—“ and 254-255 as “100%”.
- Display 4th extruder instead of the heated bed
10 년 전
Scott Lahteine
1a3c7d91f1
Merge pull request #1470 from thinkyhead/fix_eeprom_typo
Fix bad typo in ConfigurationStore.cpp
10 년 전
Scott Lahteine
72856166a9
Fix bad typo in ConfigurationStore.cpp
10 년 전
Scott Lahteine
3490a19103
Merge pull request #1466 from CONSULitAS/Development_K8200_de
K8200: Example Configuration.h fixed
10 년 전
CONSULitAS
cfbb94a2a8
K8200: Example Configuration.h fixed
Example Configuration.h: fixed strange white characters preventing
compilation in lines 1 and 3 - oops
10 년 전
Scott Lahteine
b65c5d8ec6
Merge pull request #1464 from AnHardt/iss1448-Menu
Unified menu selection - by hilighting - made first column avilable
10 년 전
Scott Lahteine
6250cc9a8d
Merge pull request #1465 from CONSULitAS/Development_K8200_de
K8200: Example Configurations back in sync and readme update
10 년 전
CONSULitAS
0de5083aff
K8200: Example Configurations readme.md updated
Example Configurations for K8200 readme.md updated
* readme.md: added description for german umlaut support on LCD
10 년 전
CONSULitAS
c421ffd520
K8200: Example Configuration_adv.h back in sync
Example Configuration_adv.h for K8200 back in sync
* Configuration_adv.h: rebased and added missing changes for 4th
extruder
10 년 전
CONSULitAS
0575dd10de
K8200: Example Configuration.h back in sync
Example Configuration.h for K8200 back in sync
* Configuration.h: rebased and added missing changes
* Configuration.h: updated comments for K8200
10 년 전
AnHardt
f708884808
Introduced new function lcd_implementation_mark_as_selected()
New function now drops the prechar (select character) and makes the first
column usable for text.
Marking the line is now constantly made by highlighting (reverse).
Replaced selection code in:
lcd_implementation_drawmenu_generic()
_drawmenu_setting_edit_generic()
_drawmenu_sd()
with new function.
10 년 전
Scott Lahteine
b6ca50a2cc
Merge pull request #1463 from thinkyhead/cleanup_recent_merge
Apply some cleanup for recent merge
10 년 전
Scott Lahteine
cc56f36870
Merge pull request #1461 from thinkyhead/issue_1453_redo
Apply fix for M600 filament change
10 년 전
Scott Lahteine
8663f4bbaf
Apply some cleanup for recent merge
Combine 1/(rows+1) with u8g.getHeight() to get rowHeight and just use
that.
10 년 전
Scott Lahteine
fed931afda
Merge pull request #1462 from AnHardt/iss1447-Edit
Fixes issue #1447 - Overlapping of long descriptions with values.
10 년 전
Scott Lahteine
0cb1029311
remove extra plan_buffer_line
10 년 전
AnHardt
9381bfe7f9
Fixes issue #1447 - Overlapping of long descriptions with values.
10 년 전
Scott Lahteine
b97a950f53
Apply fix for M600 filament change
- Patch from #1453 for delta movement plan
- Fix: Set X with code X instead of adding to X
10 년 전
Scott Lahteine
04ce708031
Merge pull request #1457 from AnHardt/bootsplash
Reworked bootsplash for DOGM displays another time - saved 1786 bytes
10 년 전
AnHardt
0e41882b5c
Merge https://github.com/MarlinFirmware/Marlin into bootsplash
10 년 전
AnHardt
2abf1ad940
Distribute recent changes in Configuration.h to the examples.
10 년 전
Scott Lahteine
86c0583525
Merge pull request #1459 from AnHardt/lcd-width
Adjust LCD_WIDTH to make better use of DOGM LCDs 2
10 년 전
AnHardt
33f8580255
Merge branch 'lcd-width' into b-
10 년 전
AnHardt
0c24bb6cfc
Adjust LCD_WIDTH to make better use of DOGM LCDs
10 년 전
AnHardt
b1dbd765c6
Centralise definition of fonts for DOGM displays
Prework for issue #1448 and #1447
Will merge in when pull request #1457 is in.
10 년 전
AnHardt
65642592ee
Added dualline version.
10 년 전
AnHardt
f9cc1df00b
Droped URL from bootsplash.
10 년 전
AnHardt
c20606b8d7
Replaced some literal constants with defines
Replaced calculation to centre bitmap with fixed values.
Saved 20 bytes.
10 년 전
AnHardt
3602474c25
Replace solitaire use of u8g_font_5x8 font and replace with u8g_font_6x10_marlin
and win another 1694 bytes.
10 년 전
AnHardt
f5fd94d62a
Kick suspicious loop an win 72 bytes.
No visible impact.
10 년 전
Scott Lahteine
6cce924cd0
Merge pull request #1455 from thinkyhead/fix_hd44780_inversion
Fix HD44780 misspelled as HD44870
10 년 전
Scott Lahteine
b3973ed224
Fix HD44780 misspelled as HD44870
10 년 전
Scott Lahteine
d8b7f29fa2
Merge pull request #1452 from thinkyhead/fix_M200_bug
M200 cleanup, normalization of EXTRUDER loops
10 년 전