Commit graph

141 commits

Author SHA1 Message Date
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.
2014-11-10 21:43:58 -06:00
Neil Darlow b81021f475 Merge https://github.com/ErikZalm/Marlin into Marlin_v1 2014-10-21 12:06:56 +01:00
Scott Lahteine 6e343ef2f0 Adjust the Z display to hide float rounding errors 2014-10-05 18:34:54 -07:00
neildarlow efb6d61413 Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into Marlin_v1 2014-05-24 13:08:58 +01:00
zaubara 92e14298b0 Fixes typo for lcd backlighting on I2C PCF8575
When using LCD_I2C_TYPE_PCF8575T (like Sainsmart I2C), the backlight
won't come on; the incorrect ifdef blocks the evocation of the backlight
functions.
2014-05-15 01:37:23 +02:00
neildarlow 7325d7102e Activate LiquidTWI2 device detection and space-pad LCD status line. 2014-03-03 21:01:27 +00:00
Cylindric 5d50819791 Various typo fixes - only in comments, no code changes. 2014-02-17 13:04:44 +00:00
daid 46f5bea19f Add configurable beep for UltiPanel. 2014-02-13 11:17:33 +01:00
Ronald 8d162e5bd7 Improved support for panelolu2 encoder and buzzer
I added #define for LCD_FEEDBACK_FREQUENCY_HZ and
LCD_FEEDBACK_FREQUENCY_DURATION_MS  which is used to alter the default
buzzer sound.

When selecting Panelolu2 in configuration.h:
- it automatically sets the correct ENCODER_PULSES_PER_STEP and
ENCODER_STEPS_PER_MENU_ITEM.
- if LCD_USE_I2C_BUZZER is defined it will also set the default
LCD_FEEDBACK_FREQUENCY_HZ and LCD_FEEDBACK_FREQUENCY_DURATION_MS

When selecting the sanguinololu 1284p the following is true:
- its now enables  LARGE_FLASH
- It enables the gcode M300 when the panelolu2 LCD_USE_I2C_BUZZER is
defined
2014-02-03 07:45:03 +00:00
fmalpartida b5a964fcc5 Initial SAV MkI (RepRap CloneWars board) integration.
Included support for BT dongle on AT90USB boards.
Added LCD Shift Register LCD control
Included support for RepRap Clone Wars project board (SAV MKI).
2013-10-30 11:45:32 +01:00
Erik van der Zalm 8a08cca0f2 Added temperature status less.
Hopefully fixed viky button handling without braking other boards
2013-10-20 12:12:35 +02:00
George Roberts 595580556c Fixed bug that makes ulticontroller knob backwards introduced Feb 28 2013 by Robert.
Bug introduced in version 6beb42cdf6.
Robert did a good job of simplifying but messed up this chunk of code.

Looking at working version: 839bef6d5d
it seems there is no case where encrot3 should be defined as 2
because if ULTICONTROLLER is defined then NEWPANEL is also defined.
2013-09-10 09:56:19 -04:00
Erik van der Zalm bd96d22bfb Merge branch 'Marlin_v1' into thinkyhead
Conflicts:
	Marlin/Configuration.h
	Marlin/Configuration_adv.h
	Marlin/Marlin.h
	Marlin/Marlin_main.cpp
	Marlin/Servo.cpp
	Marlin/language.h
	Marlin/pins.h
	Marlin/planner.cpp
	Marlin/ultralcd_implementation_hitachi_HD44780.h
	README.md
2013-06-09 22:26:47 +02:00
Erik van der Zalm 1e05d192ab Make the beep tone less offensive 2013-06-09 12:21:16 +02:00
kiyoshigawa f295712008 Trying to fix weird diff on ultralcd_implementation_hitachi_HD44780.h 2013-06-08 09:27:56 -06:00
kiyoshigawa 69b02031ca Fixed small error in lcd define statements. 2013-06-08 09:09:11 -06:00
kiyoshigawa 6a81291c57 Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into Marlin_v1
This should fix issues with pull request 467, I hope.

Conflicts:
	Marlin/Configuration.h
	Marlin/Marlin.pde
	Marlin/ultralcd_implementation_hitachi_HD44780.h
2013-06-08 08:48:18 -06:00
Scott Lahteine 5dabc95409 Apply all changes from latest Marlin_V1
Diffed and merged, preserving my updates
2013-06-06 15:49:25 -07:00
Maik Stohn e8572c5239 Fix: Long menu entries (>14 or >18 chars) caused overrun in hitachi display implementation 2013-05-28 15:53:07 +02:00
Robert F-C 4121311b9d Change to LCD status indicators
The I2C LCD status indicators now indicate when the hotends or bed are
turned on at all (rather than just when they are in their heating phase)
2013-05-18 22:30:42 +10:00
Robert F-C dfa549f268 Merge remote-tracking branch 'upstream/Marlin_v1' into Marlin_v1 2013-05-18 21:59:39 +10:00
kiyoshigawa b27a59f41e Added support for Elefu RA Board and Elefu Control Panel 2013-05-06 08:44:38 -06:00
Robert F-C 788d62bcc4 Merge remote-tracking branch 'upstream/Marlin_v1' into Marlin_v1
Conflicts:
	Marlin/Marlin.pde
	Marlin/ultralcd.cpp
	Marlin/ultralcd_implementation_hitachi_HD44780.h
2013-04-29 21:13:46 +10:00
Simon Oliver 93f0463b21 Allow Edit menu to call fn after edit; Fix PID Ki and Kd display in menus; Actually use changed PID and Max Accel values
Add new 'callback' edit-menu types that call a function after the edit is done. Use this to display and edit Ki and Kd correctly (removing the scaling first and reapplying it after). Also use it to reset maximum stepwise acceleration rates, after updating mm/s^2 rates via menus. (Previously, changes did nothing to affect planner unless saved back to EEPROM, and the machine reset).

Add calls to updatePID() so that PID loop uses updated values whether set by gcode (it already did this), or by restoring defaults, or loading from EEPROM (it didn't do those last two). Similarly, update the maximum step/s^2 accel rates when the mm/s^2 values are changed - whether by menu edits, restore defaults, or EEPROM read.

Refactor the acceleration rate update logic, and the PID scaling logic, into new functions that can be called from wherever, including the callbacks.

Add menu items to allow the z jerk and e jerk to be viewed/edited in the Control->Motion menu, as per xy jerk.

Conflicts:
	Marlin/language.h
2013-04-12 13:31:30 +02:00
Robert F-C 9322c408c6 Updated for LiquidTWI2 library version 1.2.3
The new version of the library means that PANELOLU no longer needs to be
defined in LiquidTWI.h (the library file can be used as is) and the new
version of the library also enables the buzzer on the Panucatt VIKI
panel.
2013-03-24 18:19:58 +11:00
Robert F-C 7bad72359c Support encoder click on PANELOLU2 being read through I2C
This change also handles the case where the pause/stop/restart button on
the VIKI is not used. Make LCD I2C buzz sound the same as the normal
buzz (300ms is too long for quick feedback).
2013-03-03 18:47:50 +11:00
Robert F-C 6beb42cdf6 Attempt to address Bernhard's comments
Refactor configuration to try to make items clearer (what defines a
panel vs what is user changeable).
2013-03-01 01:17:07 +11:00
Robert F-C 1292d735ba Converge all I2C LCD branches (PANELOLU2, VIKI & PCF8575)
This includes refactoring the buttons code to remove a large amount of
non-pin dependent duplication from pins.h.
2013-02-28 02:04:51 +11:00
MendelMax 67710df9f3 Made i2c mode wok with the hardware I am able to test (ywrobot / sainsmart i2c LCD 2004)
Removed incorrect LiquidCrystal_I2C Library
2013-02-26 22:22:12 +00:00
Bob Clough b6209c86dd Added import of Wire Library to make I2C LCD support compilable 2013-02-25 15:15:23 +00:00
Bob Clough 2b567d1df5 Added I2C port expander support to HD44780 2013-02-25 14:22:14 +00:00
mfeherpataky bbf0cc1379 Update Marlin/ultralcd_implementation_hitachi_HD44780.h
Fix to a bug that I just introduced - sorry. Forgot about offset of string length.
2013-02-12 20:06:51 +01:00
mfeherpataky 71ddb8dc60 Update Marlin/ultralcd_implementation_hitachi_HD44780.h
Use all available characters in narrow LCDs < 20 characters.
2013-02-12 00:03:40 +01:00
mfeherpataky d2c547c407 Update Marlin/ultralcd_implementation_hitachi_HD44780.h
Fix to a minor bug with hardcoded LCD_WIDTH that draws edited values outside of the 16 characters width LCDs.
2013-02-11 23:25:24 +01:00
daid303 921273baa0 Added optional feature to stop printing when an endstop is hit. Made the Z display on the LCD in 3.2 format instead of 3.1. Added LCD message when and endstop is hit. 2013-01-08 11:53:18 +01:00
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. 2012-12-21 16:14:47 +01:00
daid303 5df5e4c4a2 Merge branch 'Marlin_v1' of github.com:ErikZalm/Marlin into Marlin_v1 2012-12-17 11:09:18 +01:00
daid303 a95dcd74e7 Fix some of the duplicated PSTRs, saving 500bytes of flash with LCD on. 2012-12-17 11:09:09 +01:00
Sergey Taranenko 5697451c72 fix lcd class 2012-12-14 15:39:47 +04:00
daid303 7c21716886 Fixed #341 2012-12-14 10:53:11 +01:00
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. 2012-12-12 11:47:03 +01:00