34 Commits (3dea417c2537a92cf25a6a2f20584d9148ec5a8d)

Author SHA1 Message Date
xifle 98d0d48191 fixed merge
12 years ago
xifle bbe67fca5a soft tab correction
12 years ago
xifle 9eeb711c96 Merged from Upstream Master
12 years ago
xifle 03141a5ef4 LCD: Added Deadzone at 100% Feedrate
12 years ago
Robert F-C dfa549f268 Merge remote-tracking branch 'upstream/Marlin_v1' into Marlin_v1
12 years ago
xifle 29bb8d7d4f Fixed "Cooldown" Selection not reseting bed temp
12 years ago
Robert F-C 015d0594b0 Optimize menu selection for Viki rotary encoder.
12 years ago
gregor 2739c26c4f changes:
12 years ago
gregor 6fb9573157 added support for the reprapworld keypad
12 years ago
Robert F-C 7f57f28ccc Add lcd_buzz function to ultralcd.h so that non-LCD code can make use of lcd's buzzer.
12 years ago
Robert F-C 788d62bcc4 Merge remote-tracking branch 'upstream/Marlin_v1' into Marlin_v1
12 years ago
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
12 years ago
Dirk Eichel f3e0e5184d Add include selector between char. LCD and GLCD
12 years ago
Dirk Eichel 5f1cd70122 Add code to lcd_update() for GLCD
12 years ago
Dirk Eichel a49c09a776 Add variable for animated fan, add float conversion w/o sign
12 years ago
Robert F-C 7bad72359c Support encoder click on PANELOLU2 being read through I2C
12 years ago
Robert F-C 6beb42cdf6 Attempt to address Bernhard's comments
12 years ago
Robert F-C 1292d735ba Converge all I2C LCD branches (PANELOLU2, VIKI & PCF8575)
12 years ago
daid303 de3dec7215 Also show the tune menu when USB printing.
12 years ago
Dirk Eichel c8f1fbd9d8 Add SD-Card change and SD-Card init.
12 years ago
Marius Kintel f24f02e212 compile fix: quickStop() needs stepper.h
12 years ago
Bernhard 1d06b10962 Added a feature to have filament change by gcode or display trigger.
12 years ago
Kevin O'Connor 3f2f94ef28 Be consistent in setting of the fan PWM.
12 years ago
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.
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 a95dcd74e7 Fix some of the duplicated PSTRs, saving 500bytes of flash with LCD on.
12 years ago
daid303 047d037f8c #ifdef fix for #326
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 a2032afa3a Fixed #303
12 years ago
daid303 f4a89ec776 SDCARDINSERTED is always defined, and thus we do not need the #ifdefs.
12 years ago
daid303 12a4d60e18 Fix the EEPROM storage, no longer inline it at multiple locations, and remove the template.
12 years ago
daid303 f6ff0ab767 signed/unsigned fixes.
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