Commit Graph

2295 Commits (2e7ba44633372f726ef471bf4d1edc7debb2a36e)
 

Author SHA1 Message Date
Tommi Lamberg 622a531d9c Fixed error in translation
Tommi Lamberg 290ab42d22 Updated Finnish translations
Jérémie FRANCOIS 22a7985445 reverted to upstream
Jérémie FRANCOIS b3bda57ca2 reverted to upstream
Jérémie FRANCOIS 9d75a56b56 Merge remote-tracking branch 'upstream/Development' into Development
Conflicts:
	Marlin/Configuration.h
	Marlin/Marlin_main.cpp
Tommi Lamberg 0a59fee763 Merge remote-tracking branch 'upstream/Development' into Development
Scott Lahteine d75cd69de4 Merge pull request from Wurstnase/Development
Bedleveling: X and Y must be Integers not Float!
Scott Lahteine eb5889b3da Merge pull request from AnHardt/en_first
#include "language_en.h" before the national language in language.h
Tommi Lamberg a4f939cc27 Updated Finnish language file
Wurstnase 4546c92f5b X and Y must be Integers not Float!
https://github.com/Wurstnase/Marlin/blob/Development/Marlin/Configuration.h#L427
Scott Lahteine 32d4dd073f Merge pull request from AnHardt/iss1485
Fix for 
Scott Lahteine f92b0dc6c7 Merge pull request from Souko/patch-1
Update ultralcd_st7920_u8glib_rrd.h
AnHardt c246026bda Sorry.
AnHardt 07e488cfae Fix for
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.
Scott Lahteine 8be25389f2 Merge pull request from AnHardt/languagetoconfig
Make display language configurable in Configuration.h
Natealus f4b0a40abb Additional fixes to temperature.cpp and found another missing line
Looks like INVERT_E3_DIR was missing in the configuration.h also as I
did a test compile with 4 extruders and Azteeg X3 Pro defined. So I also
added those lines too. Additional formatting to make the comments line
up better in that section.
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.
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.
AnHardt 8e92729141 Make display language configurable in Configuration.h
Natealus 38a500d05c Viki 2 Implementation
I've insert the define and pointer entries for the Viki 2 and miniViki
from Panucatt in all of the example configs and main config. With these
additions and with pins done in the old single pin.h style...I was able
to get the display working fine save for needing to turn Delta Segments
per Second down. But that's a common graphics lcd issue being looked
into right now.

I need assistance in understanding how the new divided pins files fit
together because my previous attempts at trying to get it to work
appropriately didn't seem successful. This originally came from trying
to find out how to swap the XYZ Min and Max Endstop pins in the Azteeg
X3 Pro. It only comes with one set of connectors and they're Min
Endstops. My previous experience didn't turn out well trying to tell the
firmware to home to the Min Endstops so the best solution I found was to
swap the pins in the firmware. If I'm missing a conflict with a setup
other than delta please let me know, but it makes sense in my setup.
Natealus 697ee2dc50 Compiling errors with 4 Extruders defined
Here were a few changes that I had to make/add lines for the 4th hotend.
A compiling problem in the Temperature.cpp and missing lines in
configuration.h and configuration_adv.h. I added these lines in all of
the example configs too.
Jérémie FRANCOIS 85e5aa4011 Generalized enqueue_commands_P, and moved them to Marlin_main as they should
Scott Lahteine c093ea36e6 Merge pull request from thinkyhead/issue_1471_fix
Fan speed and 4th extruder on graphical LCD
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
Scott Lahteine 1a3c7d91f1 Merge pull request from thinkyhead/fix_eeprom_typo
Fix bad typo in ConfigurationStore.cpp
Scott Lahteine 72856166a9 Fix bad typo in ConfigurationStore.cpp
Scott Lahteine 3490a19103 Merge pull request from CONSULitAS/Development_K8200_de
K8200: Example Configuration.h fixed
CONSULitAS cfbb94a2a8 K8200: Example Configuration.h fixed
Example Configuration.h: fixed strange white characters preventing
compilation in lines 1 and 3 - oops
Scott Lahteine b65c5d8ec6 Merge pull request from AnHardt/iss1448-Menu
Unified menu selection - by hilighting - made first column avilable
Scott Lahteine 6250cc9a8d Merge pull request from CONSULitAS/Development_K8200_de
K8200: Example Configurations back in sync and readme update
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
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
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
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.
Scott Lahteine b6ca50a2cc Merge pull request from thinkyhead/cleanup_recent_merge
Apply some cleanup for recent merge
Scott Lahteine cc56f36870 Merge pull request from thinkyhead/issue_1453_redo
Apply fix for M600 filament change
Scott Lahteine 8663f4bbaf Apply some cleanup for recent merge
Combine 1/(rows+1) with u8g.getHeight() to get rowHeight and just use
that.
Scott Lahteine fed931afda Merge pull request from AnHardt/iss1447-Edit
Fixes issue  - Overlapping of long descriptions with values.
Scott Lahteine 0cb1029311 remove extra plan_buffer_line
AnHardt 9381bfe7f9 Fixes issue - Overlapping of long descriptions with values.
Scott Lahteine b97a950f53 Apply fix for M600 filament change
- Patch from  for delta movement plan
- Fix: Set X with code X instead of adding to X
Scott Lahteine 04ce708031 Merge pull request from AnHardt/bootsplash
Reworked bootsplash for DOGM displays another time - saved 1786 bytes
AnHardt 0e41882b5c Merge https://github.com/MarlinFirmware/Marlin into bootsplash
AnHardt 2abf1ad940 Distribute recent changes in Configuration.h to the examples.
Scott Lahteine 86c0583525 Merge pull request from AnHardt/lcd-width
Adjust LCD_WIDTH to make better use of DOGM LCDs 2
AnHardt 33f8580255 Merge branch 'lcd-width' into b-
AnHardt 0c24bb6cfc Adjust LCD_WIDTH to make better use of DOGM LCDs
AnHardt b1dbd765c6 Centralise definition of fonts for DOGM displays
Prework for issue  and 

Will merge in when pull request  is in.
AnHardt 65642592ee Added dualline version.