b3bda57ca2
reverted to upstream
2015-02-11 07:12:02 +01:00
9d75a56b56
Merge remote-tracking branch 'upstream/Development' into Development
...
Conflicts:
Marlin/Configuration.h
Marlin/Marlin_main.cpp
2015-02-11 06:38:36 +01:00
0a59fee763
Merge remote-tracking branch 'upstream/Development' into Development
2015-02-11 06:53:43 +02:00
d75cd69de4
Merge pull request #1488 from Wurstnase/Development
...
Bedleveling: X and Y must be Integers not Float!
2015-02-10 16:02:55 -08:00
eb5889b3da
Merge pull request #1479 from AnHardt/en_first
...
#include "language_en.h" before the national language in language.h
2015-02-10 15:33:45 -08:00
a4f939cc27
Updated Finnish language file
2015-02-10 10:48:33 +02:00
4546c92f5b
X and Y must be Integers not Float!
...
https://github.com/Wurstnase/Marlin/blob/Development/Marlin/Configuration.h#L427
2015-02-10 09:00:48 +01:00
32d4dd073f
Merge pull request #1487 from AnHardt/iss1485
...
Fix for #1485
2015-02-09 21:41:07 -08:00
f92b0dc6c7
Merge pull request #1486 from Souko/patch-1
...
Update ultralcd_st7920_u8glib_rrd.h
2015-02-09 21:32:54 -08:00
c246026bda
Sorry.
2015-02-10 00:23:39 +01:00
07e488cfae
Fix for #1485
2015-02-10 00:13:46 +01:00
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.
2015-02-09 21:46:06 +01:00
8be25389f2
Merge pull request #1477 from AnHardt/languagetoconfig
...
Make display language configurable in Configuration.h
2015-02-09 05:36:57 -08:00
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.
2015-02-08 15:43:58 -07:00
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.
2015-02-08 20:41:20 +01:00
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.
2015-02-08 14:26:24 +01:00
8e92729141
Make display language configurable in Configuration.h
2015-02-08 13:45:22 +01:00
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.
2015-02-08 03:14:59 -07:00
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.
2015-02-08 01:05:05 -07:00
85e5aa4011
Generalized enqueue_commands_P, and moved them to Marlin_main as they should
2015-02-07 23:24:20 +01:00
c093ea36e6
Merge pull request #1472 from thinkyhead/issue_1471_fix
...
Fan speed and 4th extruder on graphical LCD
2015-02-07 03:03:04 -08:00
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
2015-02-07 02:44:35 -08:00
1a3c7d91f1
Merge pull request #1470 from thinkyhead/fix_eeprom_typo
...
Fix bad typo in ConfigurationStore.cpp
2015-02-06 14:44:28 -08:00
72856166a9
Fix bad typo in ConfigurationStore.cpp
2015-02-06 14:43:58 -08:00
3490a19103
Merge pull request #1466 from CONSULitAS/Development_K8200_de
...
K8200: Example Configuration.h fixed
2015-02-04 17:28:04 -08:00
cfbb94a2a8
K8200: Example Configuration.h fixed
...
Example Configuration.h: fixed strange white characters preventing
compilation in lines 1 and 3 - oops
2015-02-04 10:35:10 +01:00
b65c5d8ec6
Merge pull request #1464 from AnHardt/iss1448-Menu
...
Unified menu selection - by hilighting - made first column avilable
2015-02-03 22:43:29 -08:00
6250cc9a8d
Merge pull request #1465 from CONSULitAS/Development_K8200_de
...
K8200: Example Configurations back in sync and readme update
2015-02-03 22:38:57 -08:00
0de5083aff
K8200: Example Configurations readme.md updated
...
Example Configurations for K8200 readme.md updated
* readme.md: added description for german umlaut support on LCD
2015-02-04 00:24:51 +01:00
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
2015-02-04 00:19:18 +01:00
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
2015-02-04 00:15:50 +01:00
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.
2015-02-03 23:35:33 +01:00
b6ca50a2cc
Merge pull request #1463 from thinkyhead/cleanup_recent_merge
...
Apply some cleanup for recent merge
2015-02-03 12:06:47 -08:00
cc56f36870
Merge pull request #1461 from thinkyhead/issue_1453_redo
...
Apply fix for M600 filament change
2015-02-03 11:52:09 -08:00
8663f4bbaf
Apply some cleanup for recent merge
...
Combine 1/(rows+1) with u8g.getHeight() to get rowHeight and just use
that.
2015-02-03 11:48:49 -08:00
fed931afda
Merge pull request #1462 from AnHardt/iss1447-Edit
...
Fixes issue #1447 - Overlapping of long descriptions with values.
2015-02-03 11:36:04 -08:00
0cb1029311
remove extra plan_buffer_line
2015-02-03 11:26:36 -08:00
9381bfe7f9
Fixes issue #1447 - Overlapping of long descriptions with values.
2015-02-03 20:15:16 +01:00
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
2015-02-03 09:57:16 -08:00
04ce708031
Merge pull request #1457 from AnHardt/bootsplash
...
Reworked bootsplash for DOGM displays another time - saved 1786 bytes
2015-02-03 09:19:54 -08:00
0e41882b5c
Merge https://github.com/MarlinFirmware/Marlin into bootsplash
2015-02-03 18:05:38 +01:00
2abf1ad940
Distribute recent changes in Configuration.h to the examples.
2015-02-03 17:59:04 +01:00
86c0583525
Merge pull request #1459 from AnHardt/lcd-width
...
Adjust LCD_WIDTH to make better use of DOGM LCDs 2
2015-02-03 08:29:03 -08:00
33f8580255
Merge branch 'lcd-width' into b-
2015-02-03 14:45:58 +01:00
0c24bb6cfc
Adjust LCD_WIDTH to make better use of DOGM LCDs
2015-02-03 14:21:43 +01:00
b1dbd765c6
Centralise definition of fonts for DOGM displays
...
Prework for issue #1448 and #1447
Will merge in when pull request #1457 is in.
2015-02-03 13:10:09 +01:00
65642592ee
Added dualline version.
2015-02-03 12:25:36 +01:00
f9cc1df00b
Droped URL from bootsplash.
2015-02-03 11:14:27 +01:00
c20606b8d7
Replaced some literal constants with defines
...
Replaced calculation to centre bitmap with fixed values.
Saved 20 bytes.
2015-02-03 09:52:29 +01:00
3602474c25
Replace solitaire use of u8g_font_5x8 font and replace with u8g_font_6x10_marlin
...
and win another 1694 bytes.
2015-02-03 09:07:57 +01:00
