bissen21/Marlin_Firmware
1
0
Fork 0
Code Issues Pull Requests Projects Releases 4 Wiki Activity
2,970 Commits 1 Branch 4 Tags
064f2b37d03827440364c2dabcdb2468fbc57415
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
AnHardt 064f2b37d0 More Beeper clean up. 
Centralised beep code to lcd_buzz().
From gcode_M300() and lcd_quick_feedback().

Enforced max. duration for M300 to 5 seconds.

Corrected description in 'Configuration.h'

LCD_FEEDBACK_FREQUENCY_HZ 0 gives now a silent delay of
LCD_FEEDBACK_FREQUENCY_DURATION_MS.
 2015-04-20 11:11:13 +02:00
AnHardt 671aaf2dc9 Minor fix for M300 
Corrected wrong order of parameters.
 2015-04-19 13:25:20 +02:00
AnHardt df50523605 Made encoderPosition and quick_feedback dependant on NEWPANEL 
where the hardware is available.
Fix for #1873
 2015-04-09 12:26:45 +02:00
AnHardt 540dbb35e2 And an other MSG_BED in Marlin_main.cpp 2015-04-09 01:16:06 +02:00
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'.
 2015-04-08 23:59:01 +02:00
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.
 2015-04-08 21:53:58 +02:00
AnHardt 6a514f3dc9 Aplied HAS_LCD_CONTRAST also to Marlin_main.cpp 
and cleaned typo.
 2015-04-08 13:26:29 +02:00
AnHardt a76fb42ca6 Merge https://github.com/MarlinFirmware/Marlin into contrast 2015-04-08 13:05:21 +02:00
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.
 2015-04-08 12:56:38 +02:00
AnHardt ac843fbf3b Fix lcd_status_message 
Because we now can use utf8 with up to 3 bytes per symbol,
lcd_status_message[] must be 3*LCD_WIDTH wide.
Filling up the message, or cutting to length, are fixed to.

Fix for #1832 about at the end.
 2015-04-07 02:33:34 +02:00
AnHardt 6ae714894e Now the simplycistic solution. 
Just and only display splashscreen only once.
 2015-04-06 12:43:38 +02:00
AnHardt d521693641 Revert "Draw content in display loop only when needed" 
This reverts commit bf04a92cc0.
 2015-04-06 12:31:31 +02:00
AnHardt bf04a92cc0 Draw content in display loop only when needed 
Example for splash screen.
 2015-04-05 12:53:20 +02:00
AnHardt 9865318f1c Disable splash-screen when done once 
Splash screen was shown with every display init.
That means every time the menus where entered.

Note the 2 in the initialisation.
The buffer is already written in two steps a 512 byte.
Without the 2 only the upper half is shown.
 2015-04-05 12:24:01 +02:00
AnHardt 340d165a9c Reduce display updates for dogm displays 
In 'if (encoderPastThreshold || LCD_CLICKED)' lcdDrawUpdate was not set.

'lcd_status_update_delay'-loop was not effective in  function
lcd_status_screen().
The loop prevented the update of the status screen but not the displays
update.
Shifted the loop into lcd_update().
 2015-04-04 22:02:24 +02:00
AnHardt 418d22d7b3 Revert "Testloop cleanup" 
This reverts commit 6361404b91.
 2015-04-04 18:33:36 +02:00
AnHardt 6361404b91 Testloop cleanup 
Shifted condition should still be in.
 2015-04-04 17:56:13 +02:00
AnHardt 6d4b3f0d6a Move the condition before the loop 
Result see: https://youtu.be/AEnBzdu9_tk
Dot is moving not so fast -> less executed loops.
 2015-04-04 17:49:39 +02:00
AnHardt 4cb7dfc546 Move the 'alive dot' in every displayloop 
Result see: https://www.youtube.com/watch?v=tdu7J0i-c4g
Loop is executed several times per display update.
 2015-04-04 17:34:28 +02:00
AnHardt 23cd54755f Fix typo in Marlin_main.cpp 
related to current_position[Z_AXIS] and retract_zlift.

'+ =' -> '+='

Fix for #1786
 2015-04-02 14:50:31 +02:00
AnHardt 488666832b Remove the previously introduced () 2015-04-01 13:40:05 +02:00
AnHardt 831016b09f Added new - changed entries from Fix up LCD_PROGRESS_BAR 
for when no LCD is defined.
Fix for #1770.
 2015-04-01 10:17:17 +02:00
AnHardt 3f2e863206 Improve conditions for HAS_TEMP 
and use them in temperuture.h

Flattened the if structure - the preprocessor is doing the work - not the Arduino. Arduino.
 2015-04-01 02:56:14 +02:00
AnHardt 85f8a26ba4 Fix MIN&MAX temperatures again 
replaced GE0 with th matching GEX in the second row.
added some ()
 2015-04-01 00:48:04 +02:00
AnHardt 19b11dfdd7 Fix can't enter MENU_MULTIPLIER_ITEM 2015-03-31 18:29:16 +02:00
AnHardt 9ac7dc675e Make filament display on dogm_... same as hitachi... 
Thanks @MagoKimbra.
 2015-03-30 16:56:21 +02:00
AnHardt 50a732360a Replace extrudemultiply by extruder_multiply[active_extruder] 
Fix for #1460.

Seems to work with only one extruder. Can't test this myself with more.
 2015-03-30 13:35:03 +02:00
AnHardt 7b2550a604 Times can't be negative. 
cardreader.cpp needs temperature.h for autotempShutdown() when
AUTOTEMP is defined but warns about unused variables.
Unpublished variables by putting them in to temperature.cpp.
 2015-03-30 01:58:46 +02:00
AnHardt 507efa771b Remove unused variable fan_rot 
and satisfy the compiler about the implicit compare.
 2015-03-30 01:46:38 +02:00
AnHardt 2b959a7752 Some additional {} to make the compiler happy. 2015-03-30 01:42:35 +02:00
AnHardt 0f1bd6e4a7 In ST7920_SWSPI_SND_8BIT(uint8_t val) parameter is unsigned 
therefor in macro ST7920_WRITE_BYTE(a) cast a to uint8_t
to make the compiler happy.
 2015-03-30 01:40:58 +02:00
AnHardt 81bab8739d Get back folder symbols on Hitachi displays 
and make use of column 20.
 2015-03-29 17:29:48 +02:00
AnHardt c481c3b180 Move variable blink from ultralcd.h to dogm_lcd_implementation.h 
to avoid warnings about unused blink.

Concentrate definitions of variables in dogm_lcd_implementation.h to one place.

Make only local used variable currentfont static.
 2015-03-28 13:14:38 +01:00
AnHardt 1ff6df8f9e Avoid warnings in SanitiCheck.h 
/SanityCheck.h:107:53: warning: missing terminating ' character
...
 2015-03-26 21:30:53 +01:00
AnHardt ebe5b87c2c < like in the oher compareble loops 
to avoid:
Marlin_main.cpp:1790: warning: array subscript is above array bounds.
 2015-03-26 21:18:19 +01:00
AnHardt 20f909567a Merge https://github.com/MarlinFirmware/Marlin into tm-utf-minus-kanji 
Conflicts:
	README.md
Solved
 2015-03-26 10:05:00 +01:00
AnHardt f680e509c4 Enclosed error-messages for TEMP_SENSOR_1_AS_REDUNDANT in PSTR() 2015-03-25 23:26:06 +01:00
AnHardt ac81b4084f Make variables and function static. 2015-03-25 21:37:15 +01:00
AnHardt 01cc97a3c3 Corected condition for PIDdT 2015-03-25 12:08:23 +01:00
AnHardt 94330705c7 Move definition of PIDdT back to temperature.h 
make it unconditional
remove all definitions in the 'Configuration.h's
remove form 'Conditionals.h'
 2015-03-25 11:51:41 +01:00
AnHardt dd0067afa6 Fix MAX6675 again and introduce set_current_temp_raw() 
to make the temperature-code work again with Arduino 1.0.6.

Sorry could not make an extra block on base level.
 2015-03-25 11:08:24 +01:00
AnHardt 8848b7e9ef Add the missed {} to END_MENU in ultralcd.cpp 
what caused an extra update of encoderLine most of the time.
 2015-03-25 09:48:21 +01:00
AnHardt 4beffbca69 Make SMALL_INFOFONT configurable. 
Tweak the documentation
 2015-03-24 23:40:04 +01:00
AnHardt c686069ccd Revert "Remove 6x9 font" 
This reverts commit e6cb8ee188.

Conflicts:
	Marlin/dogm_lcd_implementation.h
Confilkt solved
Needs rework.
 2015-03-24 17:13:05 +01:00
AnHardt b00a531df8 Revert "Removed now unneded FONT_STATUSMENU" 
This reverts commit 8c5bb38748.
 2015-03-24 17:01:56 +01:00
AnHardt 9d589cbb2a Merge https://github.com/MarlinFirmware/Marlin into tm3-utf-minus-kanji 
Conflicts:
	Marlin/example_configurations/delta/generic/Configuration.h
	Marlin/example_configurations/delta/kossel_mini/Configuration.h
	Marlin/language.h

Conflicts solved
 2015-03-24 16:59:15 +01:00
AnHardt 64e3d33893 Fix shrinked menucode 
by updating 'encoderPosition' in END_MENU() line 1.
 2015-03-20 23:36:14 +01:00
AnHardt 08856d9615 Merge branch 'tm2-utf-minus-kanji' into tm-utf-minus-kanji 
Conflicts:
	Marlin/ultralcd_implementation_hitachi_HD44780.h

Cleaned!
 2015-03-20 14:19:30 +01:00
AnHardt 8c5bb38748 Removed now unneded FONT_STATUSMENU 2015-03-20 14:12:12 +01:00
AnHardt e72cb3e45d Merge https://github.com/MarlinFirmware/Marlin into tm2-utf-minus-kanji 
Conflicts:
	Marlin/dogm_lcd_implementation.h
	Marlin/ultralcd_implementation_hitachi_HD44780.h

Fix merge conflicts 2
 2015-03-20 13:35:47 +01:00
AnHardt 6bfccaf99e Merge https://github.com/MarlinFirmware/Marlin into tm2-utf-minus-kanji 
Conflicts:
	Marlin/dogm_lcd_implementation.h
	Marlin/ultralcd_implementation_hitachi_HD44780.h
Fixed conflicts 1
 2015-03-20 13:08:18 +01:00
AnHardt e85061d20d Added changes to the 'new' Configuration.h s 2015-03-20 10:36:29 +01:00
AnHardt 47c1ea72af Merge https://github.com/kieranc/Marlin into PIDdebug 
Conflicts:
	Marlin/temperature.cpp

Cleaned merge conflict.

Codeposition had changed.
Variable pid_input had vanished.

Signed-off-by: AnHardt <github@kitelab.de>
 2015-03-20 00:07:36 +01:00
AnHardt f1d3d1524d Merge branch 'optimize_menu_code' of https://github.com/thinkyhead/Marlin into beautify 
Conflicts:
	Marlin/dogm_lcd_implementation.h

solved merge conflict.
 2015-03-19 22:51:22 +01:00
AnHardt fa889cd6e1 Beautivy statusscreen 
by shifting things some pixels around
 2015-03-19 22:13:37 +01:00
AnHardt eff6a2bd2e Clean out a warning 
in ultralcd_implementation_hitachi_HD44780.h lcd_print( about array index.
 2015-03-19 12:58:43 +01:00
AnHardt e917477fec Merge https://github.com/MarlinFirmware/Marlin into tm-utf-minus-kanji 
Conflicts:
	Marlin/dogm_lcd_implementation.h
	Marlin/fonts/make_fonts.bat

Claerd conflicts with my own #1621. (His was easy. :-) )

corrected typo in fonts/README.fonts

Applied changes to the new delta-configurations
 and deletet there some extra whitespace at the line-endings.
 2015-03-19 12:35:43 +01:00
AnHardt ae01a6b5f2 Make use of codepos. 
Saves one addition.
Needs one pointer on the stack.

Don't know if this is a go trade.
 2015-03-19 09:45:16 +01:00
AnHardt f8c4d43886 delta[3] is used with SCARA 
Shoot in the dark.
 2015-03-18 12:14:49 +01:00
AnHardt 72a9fed4fb codepos not used in gcode_M28() 
Got:
Marlin_main.cpp:2567: warning: unused variable 'codepos'

Needs revision.
Don't now how this should look like.
 2015-03-18 11:41:14 +01:00
AnHardt b94dd33641 G4 could wait for an undefined time 
Got:
Marlin_main.cpp:1689: warning: 'codenum' may be used uninitialized in this function

And indeed codenum is undefined when no parameter is given.
 2015-03-18 11:23:41 +01:00
AnHardt e90985a4e8 delta[3] not used when DELTA not defined. 
got:
Marlin_main.cpp:387: warning: 'delta' defined but not used

Compiles cleaner when definition is removed.
 2015-03-18 11:11:49 +01:00
AnHardt 5099b86ad4 lcd_autostart_sd() has two conditions. 
got:
ultralcd.cpp:408: warning: 'void lcd_autostart_sd()' defined but not used
 2015-03-18 10:51:13 +01:00
AnHardt 5d81c779cc lcd_control_retract_menu() is conditional. 
Got:
ultralcd.cpp:64: warning: 'void lcd_control_retract_menu()' declared 'static' but never defined
 2015-03-18 10:39:59 +01:00
AnHardt 450b89e63c Negative times are unlikly 
While bunting an other bug I stumbled across:
ultralcd.cpp:1250: warning: comparison between signed and unsigned
integer expressions
Changed to the type of lcd_next_update_millis.
 2015-03-18 10:31:34 +01:00
AnHardt d1658eebfc Decrease KILL_DELAY 
Users hat to press kill-button for unexpexted lon times.
See #1593
 2015-03-18 01:45:42 +01:00
AnHardt 1883e1bb60 Applied thinkyheads corrections from 2015-03-17 2015-03-17 11:23:44 +01:00
AnHardt be79235ef2 Add new (cleaner) Marlin font 
with sources in /fonts
 2015-03-17 10:33:02 +01:00
AnHardt 8a29dd4839 Cleaned typo in dogm_lcd_implementation.h 2015-03-16 20:18:48 +01:00
AnHardt 7e69f72db6 Moved font directory. Updated README.fonts 2015-03-16 17:27:27 +01:00
AnHardt 00b162a993 Merge remote-tracking branch 'origin/utf-kanji' into tm-utf-minus-kanji 
Conflicts:
	Marlin/language.h
Conflict cleaned
 2015-03-16 17:13:49 +01:00
AnHardt e38dd5f030 Merge remote-tracking branch 'origin/utf' into utf-kanji 2015-03-16 17:00:54 +01:00
AnHardt 08e4651ece Corrected cyrillic font again 
Thank you @Nprod.
 2015-03-16 16:59:14 +01:00
AnHardt e6cb8ee188 Remove 6x9 font 
in dogm_lcd_implementation.h
by using standard font and
shifting down temperature displays by one pixel
Saves 2300 bytes.
 2015-03-16 11:18:27 +01:00
AnHardt f0dcea7e14 Fix #1611 
Warning: suggest parentheses around comparison in operand of &

pretty much helped.
 2015-03-15 22:52:50 +01:00
AnHardt 28b1c37dea Fix for #1612 2015-03-15 21:35:33 +01:00
AnHardt 2f374f1465 Removed Kanji. 2015-03-15 16:44:37 +01:00
AnHardt 25c4f17e5d Corrected Cyrillic fonts. Round II. 2015-03-14 15:10:45 +01:00
AnHardt 44a205d9d9 Corrected Cyrillic fonts. 
Cleaned typo in language_test.h Cyrillic part.
 2015-03-14 12:27:47 +01:00
AnHardt 730497aaa1 Make use of ligatures in language_kana_utf8.h 2015-03-13 19:47:40 +01:00
AnHardt 3240d89f7d Logic cleanup in utf_mapper. 2015-03-13 19:45:10 +01:00
AnHardt ace3c62a1c Argh! Did not hit save 2015-03-13 15:26:01 +01:00
AnHardt bfb8a53156 Documentation reformating 
The last for today - i hope.
 2015-03-13 15:23:30 +01:00
AnHardt 1feb71895b And an other one 2015-03-13 15:16:55 +01:00
AnHardt 9518b1c873 And another update for the documentation. 2015-03-13 14:59:53 +01:00
AnHardt d9b3232e94 Another update for the documentation. 2015-03-13 14:55:15 +01:00
AnHardt 09838dc948 reformat documentation 2015-03-13 14:46:15 +01:00
AnHardt 96f8d20f2f Change selection logic another time 
Automatic selection was to unflexible.

Updated documentation

Updated language files to new logic and documentation.

Updated bdf2u8g.exe
 2015-03-13 14:26:58 +01:00
AnHardt 5bafb1fe1f Add user test to language_test.h and make it default. 
Improve description in Configuration.h
 2015-03-11 20:46:52 +01:00
AnHardt 817751d4b9 Added new languages, the Cyrillic display and a test language to find out your hardware. 2015-03-11 11:10:35 +01:00
AnHardt c4b0087f7a Insert utf_mapper.h 
Top -> down
- Decide what output function is to use.
- Precautions. If non of the DISPLAY_CHARSET_HD44780's is selected fall back to Japanese.
- When we are not on the dogms setup a mapping table depending on display type and mapper.
- If we are on dogm we use ONE To ONE mapping - except kanji.
- select and define one of the mapping functions.
 2015-03-11 10:55:16 +01:00
AnHardt b60761bcff Removed some messages that shouldn't be translated in the Japanese files. 
And made falback to kana work.
 2015-03-11 10:30:38 +01:00
AnHardt 97ae3c5c6a Corected some errors inrtoduced by a faild global replacement. 2015-03-11 10:26:36 +01:00
AnHardt ae76b1e8a8 Changes in dogm_lcd_implementation.h in detail. 
Top -> down
- We don't need the old Marlion_font package any more - we made new.
- But we need information about configured fonts and the mappers.
- We support Cyrillic now.
- LCD_CLASS is not used in this file. LiquidCrystalRus.h is deleted anyway.
- define some fonts
- BIG_EDIT_FONT works only together with western languages.
- Select a matching FONT for the MENUE depending on the defined language.
- Number the different font-types. Wanted to avoid to store complete font-structures when changing fonts back and forth.
- Marlin special symbols are now at the lower end - like in 'ultralcd_implementation_hitachi_HD44780.h'
- insert the new remembering setFont function.
- insert the new counting lcd_print functions.
- make use of the new setFont and lcd_print functions.
- On some places redefined one character long strings with chars to avoid overhead and reduce warnings.
 2015-03-10 22:34:56 +01:00
AnHardt 255ca68123 Changes in ultralcd_implementation_hitachi_HD44780.h in detail 
Top -> down:
We don't need LiquidCrystalRus.cpp and LiquidCrystalRus.h any more. Functionality is now in utf_mapper.h
Comment on LCD_STR_BEDTEMP about behaviour in strings.
Change LCD_STR_ARROW_RIGHT from "\x7E" to ">" because "\x7E" is only ARROW_RIGHT on displays with DISPLAY_CHARSET_HD44780_JAPAN.
Introduce the counting UTF8 enabled lcd_print functions.
Replace the old lcd.print functions and make use of them.
A bit of reformatting around the changes.
 2015-03-10 18:30:09 +01:00
AnHardt 6fc2ccd568 Make use of new remenbering fontswitch. 2015-03-10 18:04:03 +01:00
AnHardt 0f26f3abf2 Add a test_language. 
Will show the compleet utf8 or ASCII charset
To se the second half of ASCII click on "01234..."
 2015-03-10 17:59:28 +01:00
AnHardt 6d575b1bc7 Add some documentation. 2015-03-10 17:55:59 +01:00
AnHardt 901cf203fe Add legal stuff to marlin_kanji.h 2015-03-10 17:49:16 +01:00
AnHardt 2d5134b0ed Introduce - clean - prepae language files 2015-03-10 17:46:25 +01:00