0x90/Marlin
12
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity
2122 commits 3 branches 0 tags 230 MiB
Commit graph

2122 commits

This branch
This branch
All branches
Author SHA1 Message Date
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.
 2015-02-08 20:41:20 +01:00
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.
 2015-02-08 14:26:24 +01:00
Scott Lahteine 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
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
 2015-02-07 02:44:35 -08:00
Scott Lahteine 1a3c7d91f1 Merge pull request #1470 from thinkyhead/fix_eeprom_typo 
Fix bad typo in ConfigurationStore.cpp
 2015-02-06 14:44:28 -08:00
Scott Lahteine 72856166a9 Fix bad typo in ConfigurationStore.cpp 2015-02-06 14:43:58 -08:00
Scott Lahteine 3490a19103 Merge pull request #1466 from CONSULitAS/Development_K8200_de 
K8200: Example Configuration.h fixed
 2015-02-04 17:28:04 -08:00
CONSULitAS 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
Scott Lahteine 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
Scott Lahteine 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
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
 2015-02-04 00:24:51 +01:00
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
 2015-02-04 00:19:18 +01:00
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
 2015-02-04 00:15:50 +01:00
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.
 2015-02-03 23:35:33 +01:00
Scott Lahteine b6ca50a2cc Merge pull request #1463 from thinkyhead/cleanup_recent_merge 
Apply some cleanup for recent merge
 2015-02-03 12:06:47 -08:00
Scott Lahteine cc56f36870 Merge pull request #1461 from thinkyhead/issue_1453_redo 
Apply fix for M600 filament change
 2015-02-03 11:52:09 -08:00
Scott Lahteine 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
Scott Lahteine 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
Scott Lahteine 0cb1029311 remove extra plan_buffer_line 2015-02-03 11:26:36 -08:00
AnHardt 9381bfe7f9 Fixes issue #1447 - Overlapping of long descriptions with values. 2015-02-03 20:15:16 +01:00
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
 2015-02-03 09:57:16 -08:00
Scott Lahteine 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
AnHardt 0e41882b5c Merge https://github.com/MarlinFirmware/Marlin into bootsplash 2015-02-03 18:05:38 +01:00
AnHardt 2abf1ad940 Distribute recent changes in Configuration.h to the examples. 2015-02-03 17:59:04 +01:00
Scott Lahteine 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
AnHardt 33f8580255 Merge branch 'lcd-width' into b- 2015-02-03 14:45:58 +01:00
AnHardt 0c24bb6cfc Adjust LCD_WIDTH to make better use of DOGM LCDs 2015-02-03 14:21:43 +01:00
AnHardt 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
AnHardt 65642592ee Added dualline version. 2015-02-03 12:25:36 +01:00
AnHardt f9cc1df00b Droped URL from bootsplash. 2015-02-03 11:14:27 +01:00
AnHardt 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
AnHardt 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
AnHardt f5fd94d62a Kick suspicious loop an win 72 bytes. 
No visible impact.
 2015-02-03 08:56:00 +01:00
Scott Lahteine 6cce924cd0 Merge pull request #1455 from thinkyhead/fix_hd44780_inversion 
Fix HD44780 misspelled as HD44870
 2015-02-02 22:53:24 -08:00
Scott Lahteine b3973ed224 Fix HD44780 misspelled as HD44870 2015-02-02 22:33:58 -08:00
Scott Lahteine d8b7f29fa2 Merge pull request #1452 from thinkyhead/fix_M200_bug 
M200 cleanup, normalization of EXTRUDER loops
 2015-02-02 21:58:15 -08:00
Scott Lahteine 6d81968db5 Merge pull request #1450 from docdawning/Development 
Normalized section headers, added some headers, added help URLs for newb...
 2015-02-02 21:17:06 -08:00
DocDawning 5bb3933b21 Fixed n00bsauce 2015-02-02 14:18:53 -07:00
DocDawning a507431400 Merge branch 'Development' of https://github.com/docdawning/Marlin into Development 2015-02-02 14:13:03 -07:00
DocDawning d109cd940b Normalized all configuration files to include my new section headers and the like. 2015-02-02 14:11:21 -07:00
DocDawning 055c4beaf9 Normalized section headers, added some headers, added help URLs for newbies 2015-02-02 14:11:09 -07:00
Scott Lahteine 9dc5de6166 Hide code that makes veteran geeks go "aha!" 2015-02-02 05:55:55 -08:00
Scott Lahteine bd387068bb Apply loops for extruders elsewhere also 2015-02-02 05:27:27 -08:00
Scott Lahteine 4a146d584b Loop, since the pending feature can use an array 2015-02-02 05:16:17 -08:00
Scott Lahteine bca884bf72 Realized it's not a bug, but cleanup code anyway 2015-02-02 04:41:31 -08:00
Scott Lahteine 137ba7b590 Merge pull request #1449 from AnHardt/LostInTranslation3 
Solid improvements. Merging.
 2015-02-01 18:37:20 -08:00
DocDawning 8e287c2762 Normalized section headers, added some headers, added help URLs for newbies 2015-02-01 17:06:38 -07:00
AnHardt 2dd43a82b1 Ups. #else added 2015-02-01 14:16:35 +01:00
AnHardt 26e55471f8 Update example configurations. 2015-02-01 13:46:32 +01:00
AnHardt 85385be132 Removed now automatic define of DISPLAY_CHARSET_DOGM + improved description. 2015-02-01 13:33:25 +01:00