75 Commits (4b409640643e7472c01309b8019fb48e725470e7)

Author SHA1 Message Date
AnHardt 722829b058 Move buzzing code to buzzr.h & buzzer.cpp (PR#2307)
at least the lcd independent part from Marlin_main.cpp.
10 years ago
AnHardt 6ab7b560af Rework buzzing (PR#2296)
by:
Moving HAS_LCD_BUZZ macro to Coditionals.h
Renaming HAS_LCD_BUZZ to HAS_BUZZER to make clear is has nothing to do with the lcd.
Removing the ULTRALCD condition.

Moving declaration of lcd_buzz() out of the ULTRA_LCD block in ultralcd.h
Moving definition of lcd_buzz() out of the ULTIPANEL block in ultralcd.cpp
Renaming lcd_buzz() to buzz() to make clear is has nothing to do with the lcd.

All buzzing code is now only dependent on the existence of a BEEPER-pin or the definition of a LCD_USE_I2C_BUZZER.

To do: Check the conditions for the BEEPER-pin in all pin-files.
10 years ago
Scott Lahteine d4c74b8f8c Don't apply M428 if an error occurs
- Also move audio feedback into the command
- Added shorthand for `lcd_buzz` availability
10 years ago
Scott Lahteine 7295640f44 Remove extraneous ; 10 years ago
Scott Lahteine 0d8c00d3f6 Define lcd_hasstatus for no lcd also 10 years ago
Scott Lahteine ce142afdda G4 shows status message only if no message is set already
- Address issue raised in #1961
10 years ago
Scott Lahteine ccddc280be Apply three more commits 10 years ago
Scott Lahteine 0e8182bbf2 Additional pin tests, cleanup 10 years ago
AnHardt 831016b09f Added new - changed entries from Fix up LCD_PROGRESS_BAR
for when no LCD is defined.
Fix for #1770.
10 years ago
Scott Lahteine 5519882eea Fix up LCD_PROGRESS_BAR
- Some messages should not expire with `PROGRESS_MSG_EXPIRE`.
- Simplify conditional for progress bar with sanity checks.
- Rename `messageTick` to `expireStatusMillis` and make it the expire
time.
10 years ago
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.
10 years ago
Scott Lahteine 19d418cd6a Fix up the code to eliminate warnings 10 years ago
Scott Lahteine b6d381f863 Divide up Conditionals to get LCD items early 10 years ago
Scott Lahteine c37f7d15c9 - Rename WRITE_E_STEP for consistency
- Add BIT and TEST macros
- Add _APPLY_ macros to stepper.cpp to help with consolidation
- Consolidate code in stepper.cpp using macros
- Apply standards in stepper.cpp
- Use >= 0 instead of > -1 as a better semantic
- Replace DUAL_Y_CARRIAGE with Y_DUAL_STEPPER_DRIVERS
10 years ago
AnHardt 6cdcd6c6d1 Fix iss#1492
Introduced lcd_strlen() and lcd_strlen_P().
Replaced the old functions where necessary.
Reworked language_ru.h.

Speeded up test for zero length string in cardreader.cpp
10 years ago
Scott Lahteine 326b925557 DOGLCD and LCD_PROGRESS_BAR to coexist
Small changes (and formatting to confuse the diff’er) which first
allows DOGLCD and LCD_PROGRESS_BAR to be enabled in tandem, then a
#warning (rather than error) that the extra progress bar / message
options don’t apply to graphical displays at this time. This leaves
open perhaps combining the progress bar and message area in some future
(or forked custom) graphical LCD display arrangement (at which time the
relevant variables may be moved into ultralcd.cpp with externs in
ultralcd.h). I also added a conditional error that the progress bar and
the filament display may not work well together.
10 years ago
Bo Herrmannsen a18b625534 Merge pull request #1261 from wgm4321/Development
Add Filament menu and add Filament/Retract settings to config store.
10 years ago
Scott Lahteine e7db8ee9e5 ftostr32np > ftostr32sp
sp=space-padded, similar to: ns=no-sign
10 years ago
Scott Lahteine a2109cb492 Patch to make Z look more like X and Y on UltraLCD 10 years ago
wgm4321 cb12161191 Add Filament menu and add Filament/Retract settings to config store. 10 years ago
Scott Lahteine e69313fc2b Reduce dogm lcd code 10 years ago
Bo Herrmannsen 31ca3de72f Merge pull request #819 from neildarlow/Marlin_v1
Activate LiquidTWI2 device detection and space-pad LCD status line.
10 years ago
Bo Herrmannsen 91d740e128 Merge pull request #1141 from filipmu/Filament-Sensor
Display filament sensor data on a 20x4 LCD or Graphical LCD
10 years ago
Neil Darlow 64139f5e5a Merge https://github.com/ErikZalm/Marlin into Marlin_v1 10 years ago
Scott Lahteine 92e21d3ee2 M0-M1 Enhancements
Allow M0 and M1 to include a message string. Ignore clicks on “Wait for
user” so that the Info Screen stays up.
10 years ago
Filip Mulier d84934d8c5 Display Filament Sensor data on 20x4 LCD
Changes to support displaying the real-time filament width and the
volume factor on a 20x4 LCD.  The data is displayed on the 4th line.
First the status message is displayed for 5 seconds, and then the
filament data is displayed.  The status message can be seen by
re-selecting the info screen in the menu.
10 years ago
Neil Darlow 6e3406d228 Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into Marlin_v1 11 years ago
Pablo Clemente d86c3cf43c Changed the type of variable to bool, the name to "cancel_heatup", flags implementation and added this fix to M190 gcode too. 11 years ago
Pablo Clemente 86b4b805d2 Fixed stop print LCD function on M104 11 years ago
neildarlow 7325d7102e Activate LiquidTWI2 device detection and space-pad LCD status line. 11 years ago
Cylindric 5d50819791 Various typo fixes - only in comments, no code changes. 11 years ago
Erik van der Zalm cdaaad3df1 Merge branch 'Marlin_v1' of https://github.com/makr3d/Marlin into makr3d-Marlin_v1 12 years ago
Erik van der Zalm a5be0c52c6 no message 12 years ago
Michael Mayer e509cdbeb0 added contrast control function for gLCDs 12 years ago
Scott Lahteine 5dabc95409 Apply all changes from latest Marlin_V1
Diffed and merged, preserving my updates
12 years ago
Dirk Eichel a49c09a776 Add variable for animated fan, add float conversion w/o sign
A new variable was introduced to allow fan animation on the GLCD.
Add additional float to string conversion routine without sign
character. This is used for the coordinates visualisation on the GLCD.
12 years ago
daid303 01aac2a142 Small changes on the LCD panel, let the speed control work better, line up the parameter edit the same as the menu, remove some unused defines, and remove the Z from the 10mm move menu. 12 years ago
daid303 1a8f54cea1 The big LCD code update. This splits the display and menu implementation. Paving the way for future different displays. It also makes it easier to modify the menu structures while keeping everything consistant. Note that this most likely breaks the translations, which need to be updated. 12 years ago
daid303 6a9bee27cc Changed the naming of some LCD functions, so the names match better what the function does. Also moved around some prototypes for general cleanup. 12 years ago
daid303 06b58a9c4f First cleanup. Moved all code to cpp files, so there are no dependencies on pde files. And no more odd requirement to cat files together. (Still need to fix the Makefile). Also cleaned up some defines and made defines upper case as by C coding conventions. 12 years ago
Sergey Taranenko efcc28d347 Fix check for include LiquidCrystalRus.h 12 years ago
Sergey Taranenko cfc193cdac Enables support the Cyrillic alphabet for LCD 12 years ago
stohn 1d224cc031 merged with upstream and FIXED AGAIN bad translation commit
PLEASE BE MORE CAREFUL WHEN SUBMITTING NEW TRANSLATIONS

When you add new menu items / messages always copy them to ALL
languages (just use english)
12 years ago
stohn 06c03fe2f0 new method for message for making KILLED message visible
The cli(); at the start of the kill() function also stops the internal
arduino timer which stops updating of millis() which prevents the
display of the "KILLED." message.
The new function updates the display directly without checking any
timers.
12 years ago
Blair Thompson aacbebbebe Added Menu Options to the Main-> Control->Temperature Submenu that allow the user to set new values for the ABS and PLA preheat function. EEPROM updated so that these settings can also be committed to EEPROM memory. 12 years ago
Bernhard 0c123950e9 __ header file replace 13 years ago
Bernhard bf077125b9 added firmware retract. disabled by default 13 years ago
Daid d494688565 Do not initialize in the header file. 13 years ago
Daid 516ec90242 Add M401 - Wait for user on LCD button press 13 years ago
MaikStohn 1efe9ab497 changed encoder pos from int to long to fix problems setting x/y/z/e stepps_per_mm using the lcd menu 13 years ago