zaubentrucker/muele-marlin
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity
7413 commits 1 branch 0 tags 156 MiB
Commit graph

695 commits

Author SHA1 Message Date
Scott Lahteine 782c598e66 Use ftostr43 with '+' option in MBL Z adjuster 2016-04-02 17:08:43 -07:00
Scott Lahteine f08b0d034f Merge pull request #3328 from RicardoGA/RC_Babystepping_fix 
Babystepping Fix
 2016-04-02 16:48:45 -07:00
RicardoGA 6b1d2263a2 Babystepping Fix 2016-04-02 14:53:57 -06:00
Alexander Hirzel 6e0d627c8c Unbreak the Delta radius clipping 2016-04-02 12:58:39 -04:00
Alexander Hirzel 949172606f Fix manual Y movement on delta (regression). 2016-04-02 10:48:13 -04:00
Scott Lahteine b98f72b483 Small optimization for ftostr43 2016-04-01 17:54:16 -07:00
Scott Lahteine a393941d2d Combine "XYZ" with MSG_LEVEL_BED_HOMING 2016-04-01 17:51:03 -07:00
Scott Lahteine 097cc75ba8 Patch _lcd_level_bed draw to fix flicker, show proper offset 2016-04-01 17:51:03 -07:00
Scott Lahteine 1e1a18e091 Remove extra semicolon in ultralcd.cpp 2016-04-01 17:51:03 -07:00
Scott Lahteine 0b4f65dca8 Always limit blink to ~1 second intervals 2016-04-01 17:51:03 -07:00
Scott Lahteine 0d6609c3c5 lcd_goto_menu should set lcdDrawUpdate to 2 2016-04-01 17:07:40 -07:00
Scott Lahteine af89ccf96a Use flag to defer lcd return-to-status 2016-04-01 17:07:39 -07:00
Scott Lahteine 641b30217e Patch prevEncoderPosition compile issue 
Thanks to @jbrazio #3301
 2016-04-01 17:07:39 -07:00
Scott Lahteine 92882fcc51 Allow lcd_implementation_drawedit to draw a message 2016-04-01 17:04:33 -07:00
Scott Lahteine fcedfd6e99 Clean up num2str functions, extend ftostr43 2016-04-01 16:52:59 -07:00
Scott Lahteine f543aaa54e Apply standard pin test to buttons 
This is the easiest way to make button pin testing consistent without
renaming all the button pins. Just make a macro especially for testing
if button pins are set, since they are named consistently in the pins
files.
 2016-04-01 15:12:12 -07:00
Scott Lahteine 6a4d394fff Fix pointer-to-string issues with set_home_offsets and _lcd_level_bed_homing 2016-03-30 12:32:25 -07:00
Scott Lahteine f0b96f5cae Merge pull request #3276 from thinkyhead/rc_sdprint_and_lcd_sleuth 
Refinements, fixes, reduced stack usage in CardReader
 2016-03-29 18:30:18 -07:00
Scott Lahteine 4ed8351e3d Revert use of enqueue_and_echo_command_now 2016-03-29 16:23:12 -07:00
Scott Lahteine b60ea95adf Keep blinking limited to LCD_UPDATE_INTERVAL 2016-03-28 19:41:13 -07:00
Scott Lahteine 8cb04816b5 Apply PID_AUTOTUNE_MENU option to ultralcd.cpp 2016-03-25 19:31:56 -07:00
Edward Patel 14afe1a017 Move to Z=0 for G28 when using Manual Bed Leveling 
copy of 406992f9dd
 2016-03-25 04:58:44 -07:00
Edward Patel c606ed447a Add "G29 S4" to fine tune Z level for Mesh Bed Leveling. 
Also add mbl.z_offset to the EEPROM, bumping the version to V23.
 2016-03-25 04:58:43 -07:00
Scott Lahteine f394c0639e Merge pull request #3230 from jbrazio/bugfix/ultra-lcd-warning 
Fix a compiler warning in ultralcd.cpp
 2016-03-25 01:14:54 -07:00
Scott Lahteine 0da744b7b0 Further cleanup of comments, partial Doxygen-style 
Following up on #3231
 2016-03-25 00:45:56 -07:00
jbrazio 80f221ed11 Fixed: warning: extra tokens at end of #endif directive 2016-03-24 19:33:25 +00:00
jbrazio 5e5d250832 Added gplv3 header to all Marlin files 2016-03-24 18:01:20 +00:00
Scott Lahteine 04fa9d4f47 Make Autotune options into Menu Edit Items 2016-03-24 02:00:08 -07:00
WPBack e3f583a3be Fixes for PID AutoTune from menu 
Fixes for #3189

Setting a temp is still missing
 2016-03-24 01:47:30 -07:00
WPBack 3b3e8a02b5 Initial implementation of PID Autotune Menu Items 
Adds the parameter U to M303. If U1 is included , it will use the
PID-values from the auto-tune.
 2016-03-24 01:46:37 -07:00
Scott Lahteine 15fccd43ee Fix spacing of an #endif 2016-03-20 20:32:55 -07:00
Scott Lahteine 6a3529247f "Homing" as a translatable string 2016-03-19 04:41:03 -07:00
Scott Lahteine c97c2dcaf7 Use const parameters instead of static casting 
Alternative fix to #3149
 2016-03-19 03:36:53 -07:00
Scott Lahteine 4bbea5124d Support for multiple PWM fans 2016-03-19 03:10:18 -07:00
Scott Lahteine 4634feaeab Merge pull request #3012 from thinkyhead/fix_command_injection 
Use a serial line buffer to prevent queue corruption
 2016-03-19 01:43:54 -07:00
Scott Lahteine e5fd43f343 Implement BABYSTEPPING for COREXY and COREXZ 2016-03-18 18:22:53 -07:00
Scott Lahteine 8fe7420310 Use a separate serial line buffer 2016-03-18 16:46:20 -07:00
Scott Lahteine 7d25c107a8 Merge pull request #3149 from esenapaj/patch-1 
suppress warnings
 2016-03-18 15:40:14 -07:00
Scott Lahteine d56c6af24e Merge pull request #3114 from thinkyhead/rc_reverse_lcd_menu 
Option to reverse the click-wheel direction in menus
 2016-03-18 15:39:29 -07:00
Scott Lahteine cc291aeb3c Move definition of "blink" to main ultralcd file 2016-03-17 18:19:05 -07:00
Scott Lahteine 8f24475e02 Simplify limiting encoderLine in END_MENU 2016-03-16 04:05:41 -07:00
Scott Lahteine fbef2f5b61 Implement reverse menu direction in ultralcd.cpp 2016-03-16 04:03:49 -07:00
Scott Lahteine 6e1bc03d3b Additional wrapping for #3140 2016-03-15 01:18:58 -07:00
Scott Lahteine 1c384930f3 Merge pull request #3140 from thinkyhead/rc_fix_macro_expansion 
Wrap macros to prevent bad expansions
 2016-03-15 00:25:34 -07:00
esenapaj 8de7a6f9b1 suppress warnings 2016-03-15 06:34:02 +09:00
Blue-Marlin c73f1b2471 Extend stack_overflow_protection for lcd_move_e and _lcd_level_bed 
Extend stack_overflow_protection for lcd_move_e() and _lcd_level_bed() with
a refined method of 3050.
 2016-03-13 13:59:44 +01:00
Scott Lahteine f9ded2a7c4 Wrap macros to prevent bad expansions 2016-03-12 22:38:55 -08:00
Scott Lahteine b45a0c4c60 Fix bugs in edit submenus so they return to origin 
Expected behavior: After editing a value the menu should return to the
previous place with the edited item selected.
Actual behavior: Either the top (back) item from the previous screen is
selected, or the menu jumps up another level.
Solution: Pass the correct arguments to `lcd_goto_menu` on click when
editing a value.
 2016-03-09 21:06:56 -08:00
Scott Lahteine f18d3f451a Limit LCD move_to_x/y coordinates for deltas 
Related to MarlinFirmware/MarlinDev#270
 2016-03-06 05:52:00 -08:00
Scott Lahteine ff13070b59 Use _BV macros, patch up others 2016-03-06 05:51:55 -08:00
Scott Lahteine 209f5f21e0 Use macros where possible 
Apply `constrain`, `NOMORE`, `NOLESS` and `CRITICAL_SECTION` macros
wherever possible.
 2016-03-06 05:51:55 -08:00
Scott Lahteine 3a3d358df9 Fix Printrboard with LCD (redo) 
Based on #2860 - rebased for RCBugFix
 2016-03-05 22:13:00 -08:00
Scott Lahteine eb85342fd9 Merge pull request #2989 from AnHardt/fix2661 
Pre home display - Stepper release
 2016-03-05 21:30:17 -08:00
AnHardt e736779d7e blink for char-lcds 
Implement and test blinking for char-lcds

# Conflicts:
#	Marlin/ultralcd_implementation_hitachi_HD44780.h
solved
 2016-02-28 16:58:19 +01:00
Blue-Marlin fd9e94e5a4 Fix crashes when the Z axis is moved via LCD 
Fix crashes when the Z axis is moved via LCD
by calling `plan_buffer_line` only when there is enough room in the
planner buffer, to avoid endless recursion.
A brief description about what went wrong is in #1166
 2016-02-28 00:59:47 +01:00
esenapaj 4882a7eded more suitable display format for delta printer 2016-01-29 18:38:25 +09:00
Ruwan J Egoda Gamage 06555febdd Using SET_INPUT instead of pinMode 2015-12-24 12:12:25 -05:00
Ruwan J Egoda Gamage a64bcd53e9 reusing millis() 2015-12-13 22:06:03 -05:00
Ruwan J Egoda Gamage 83c4131ba3 Cleaning up, getting rid of the fake encoder count variable. 2015-12-13 15:28:40 -05:00
Ruwan J Egoda Gamage 5eeea2f611 Fixing Rigidbot LCD Panel Support 2015-12-13 15:28:40 -05:00
Scott Lahteine 60d5658da8 Revert nozzle_bed_fan_menu_items 
For some reason that I cannot determine, using a sub-function causes
the Tune sub-menu to act strangely, yet replacing the function call
with its code content works perfectly.
 2015-12-09 20:33:52 -06:00
AnHardt bb4efcf603 Handle temp callbacks when THERMAL_PROTECTION_HOTENDS is not defined 
by alternate definition for the callback macros
 2015-12-01 07:21:52 -06:00
AnHardt 96d0d04b8f Update LCD buttons less frequently 
Move slow_buttons_update into the LCD_UPDATE_INTERVAL block
lcd_implementation_read_slow_buttons() will then be executed ~10 times a
second.
 2015-11-30 05:44:32 -06:00
AnHardt c956b52c4a Babystep Multiplier 
Analog to https://github.com/MarlinFirmware/MarlinDev/pull/250 by
@RicardoGA

Restore the Babystep Multiplicator functionality and now it's available
for X/Y/Z
 2015-11-30 05:43:10 -06:00
AnHardt be7167ed97 Change XY formatting on LCD (PR#2740) 
According to #123 negative values for XY at or below -100 are displaying incorrectly, dropping the first digit. Deltas can easily have XY values in this range. This PR adds a function to display floats/ints formatted like `_123`, `-123`, `_-12`, or `__-1` as appropriate and applies it to the XY coordinates on Hitachi displays. It also moves the Z value to the right to be consistent with the XY formatting.
 2015-11-13 06:46:11 -06:00
Scott Lahteine 754b13d8fe Patch issue #2315 2015-11-12 00:03:22 -06:00
Scott Lahteine 0c7f7ebcfb Styling adjustments (PR#2668 & PR#2670) 
Keep "astyled" reformatting
 2015-10-03 22:02:45 -05:00
Richard Wackerbarth 03f0edb57e Fix high LCD status screen update frequency (PR#2655) 2015-09-28 11:07:33 -05:00
Scott Lahteine 5d65a36dee Give lcd_sd_status an UNKNOWN state (PR#180) 2015-09-14 06:32:27 -05:00
Scott Lahteine 7ac7ddbf20 Show nozzles, heaters, and extruders numbered 1-4 2015-09-12 07:40:18 -05:00
Scott Lahteine 5bc480fee8 Fix Move E menu items 2015-09-12 07:33:49 -05:00
Scott Lahteine fc882c34a3 Init lcd_sd_status as false to force lcd_update test 
Replaces #145 which is way out of date
 2015-09-12 07:32:20 -05:00
Scott Lahteine e27dd5c22d Conditionalize functions that rely on SDSUPPORT 2015-09-12 07:30:09 -05:00
Scott Lahteine 558665cd90 Constrain Tune > Nozzle/Flow menu items 2015-09-10 08:47:11 -05:00
Scott Lahteine f7f6b5faae Fix lcd_move_e compile error (PR#143) 
Fix a compile error introduced in #98
 2015-09-07 09:36:05 -05:00
Scott Lahteine 2b30e8ac99 Conditionals for ULTIPANEL without SDSUPPORT 2015-09-06 02:04:49 -05:00
Eric Kuzmenko b23d765991 Added Extrude From Multiple Extruders from LCD feature 2015-09-05 05:33:18 -05:00
Richard Wackerbarth 6292d9e815 Rename ENABLE_AUTO_BED_LEVELING 
With the introduction of the #if ENABLED(…)

reads better than
 2015-08-27 20:52:08 -05:00
Scott Lahteine 46453905d6 Apply remaining ENABLED/DISABLED conditionals 2015-08-03 16:04:48 -05:00
Scott Lahteine 270c766de2 SDCARDDETECT -> SD_DETECT, added docs 
- `SD_DETECT_PIN` replaces `SDCARDDETECT`
- `SD_DETECT_INVERTED` replaces `SDCARDDETECTINVERTED`
- Revise the description of `SD_DETECT_INVERTED`
- Add a note about the override of `SD_DETECT_INVERTED` in
`Conditionals.h`
 2015-08-02 21:59:41 -05:00
Scott Lahteine 8d3b74cc6e Rename SDCARDDETECT to SDCARDDETECT_PIN 
- Rename the pin so it can be tested with `PIN_EXISTS`
- Fix some incorrect tests for `SDCARDDETECT`
 2015-08-02 21:34:13 -05:00
Scott Lahteine 94a796c8cc Rename BEEPER to BEEPER_PIN 
For consistency with other pins, allowing use of `PIN_EXISTS` macro.
 2015-07-31 17:13:53 -05:00
Scott Lahteine 0d8989fc14 Overridable Options - Part 7 (PR#2559) 
Apply `ENABLED` / `DISABLED` macros to LCD-related files.
 2015-07-31 01:04:37 -05:00
Scott Lahteine c66955aaf9 Mark unchanging arrays as const (PR#2494) 
The compiler may be able to optimize if it knows an array won’t be
changing.
 2015-07-22 21:37:37 -05:00
Scott Lahteine 69b0490b77 Show minimal preheat options in menus (PR#2471) 2015-07-19 16:14:59 -05:00
AnHardt 722829b058 Move buzzing code to buzzr.h & buzzer.cpp (PR#2307) 
at least the lcd independent part from Marlin_main.cpp.
 2015-06-22 22:31:48 -04:00
Scott Lahteine a274769f4f Clean up spacing and comments 
Also clean up some trailing spaces in a few other sources
 2015-06-15 20:20:31 -05:00
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.
 2015-06-15 06:13:26 -05:00
Scott Lahteine 90f858aa85 Use translated strings for axis movement (PR#2280) 
Suggest we use the translated strings here. They use (except for
German) the phrasing “Move X” instead of just the axis letter, but they
should fit the available space. The “Extruder” string would be the
same, except it will be translated.
 2015-06-14 08:16:00 -05:00
wurstnase e7e964432b consistency name for multiplier 
replace extruder_multiply with extruder_multiplier
like feedrate_multiplier or volumetric_multiplier
 2015-06-01 22:33:22 +02:00
AnHardt f18f689c01 Replace MSG_F? with MSG_N? 
To avoid double definitions.
I prefer to read N for Number not for Nozzle.
 2015-05-28 20:30:23 +02:00
AnHardt bc0764894a Shift call of start_watching_heater() into setTargetHotend() 
to warrant watching is set or reset.

Make setTargetBed() in _lcd_preheat() dependant of TEMP_SENSOR_BED.
Use disable_all_heaters() in lcd_cooldown() and abort_on_endstop_hit.
 2015-05-21 20:36:11 +02:00
Ed Boston ca8d1756d5 Define fixes 
Fixed a couple defines that were not changed or commented out.
 2015-05-18 14:23:31 -07:00
Ed Boston a83bf18ee1 More functional seperation 
Moved SDCARDDETECTINVERTED and SDSLOW to Conditionals.h.
Added U8GLIB_LM6059_AF to define display specific actions.
Added reminder to compile in u8glib
 2015-05-18 05:37:46 -07:00
Ed Boston 047e688e93 Changed ADAFRUIT_ST7565 to ELB_FULL_GRAPHIC_CONTROLLER 
Rename of define to avoid confusion between the controller and the
display which had similar names.
 2015-05-17 15:23:17 -07:00
Ed Boston 41f8cdb3a6 ADAFRUIT_ST7565 
Added support for new display type
 2015-05-17 12:47:41 -07:00
Scott Lahteine fcfd99c1ae Add comments to lcd_control_temperature_menu 2015-05-12 18:46:16 -07:00
Scott Lahteine 9b3d4380d3 Only watch the heater that was set 2015-05-10 20:26:45 -07:00
Scott Lahteine 54deb9eea3 Enable WATCH_TEMP_PERIOD by default 2015-05-08 22:36:02 -07:00
brupje 8f8bf3a897 Make Marlin actually compile when #define REPRAPWORLD_KEYPAD is uncommented 2015-05-05 11:03:20 +02:00
Scott Lahteine d4c74b8f8c Don't apply M428 if an error occurs 
- Also move audio feedback into the command
- Added shorthand for `lcd_buzz` availability
 2015-04-29 19:05:48 -07:00
Scott Lahteine d065d37822 Add M428 to set home_offset logically 2015-04-29 18:26:16 -07:00
Scott Lahteine 0f687b5dda Merge branch 'Development' into eeprom_in_gcode 
Latest upstream commits
 2015-04-27 21:47:47 -07:00
Scott Lahteine 5b248757c7 Level Bed in Prepare submenu 
- Add “Level Bed” menu item for auto bed leveling
- Hide the option if homing has not been done yet
- Arrange the Prepare submenu more logically (?)
- Add documentation comments, some white-space
- Apply some coding standards here and there
- Move old encoder multiplier debug option to `ultralcd.cpp`
 2015-04-27 19:11:25 -07:00
Scott Lahteine 0fca084ea6 Make EEPROM reproducible in GCode 
With these changes the output of `M503 S0` is all you need to restore
the EEPROM. Building on this it is straightforward to save and restore
the EEPROM state using the SD card or external GCode file.

- Added `M145` to set “heatup states” for the LCD menu
- Added `M420` to toggle Mesh Bed Leveling
- Added `M421` to set a single Mesh coordinate
- Extended `Config_PrintSettings` with added M codes
- Cleaned up some comments here and there
 2015-04-26 20:56:33 -07:00
Scott Lahteine a22a228bcc Rename files to move them in the IDE 2015-04-25 21:04:54 -07:00
Scott Lahteine a932e7490f No noTone needed, but delay is 2015-04-25 03:25:30 -07:00
Scott Lahteine 9c5d14ea68 Fix BEEPER duration 2015-04-25 03:12:49 -07:00
Scott Lahteine c92b59952a Use millis_t for progress_bar_ms and expire_status_ms 2015-04-24 22:16:09 -07:00
Scott Lahteine 97dfa0365d Rename expireStatusMillis to expire_status_ms 2015-04-24 21:51:10 -07:00
Scott Lahteine ce142afdda G4 shows status message only if no message is set already 
- Address issue raised in #1961
 2015-04-24 20:13:01 -07:00
Scott Lahteine 2558c10c6c Use the slower feedrate for XY axes 2015-04-23 20:06:17 -07:00
Scott Lahteine 31932912dd Use AxisEnum instead of int for _lcd_move 2015-04-23 19:32:37 -07:00
Scott Lahteine c3560e0288 Include axis parameter to ultralcd's line_to_current 2015-04-23 19:10:09 -07:00
Scott Lahteine 3b97a7d446 Merge pull request #1944 from AnHardt/beep2 
More Beeper clean up
 2015-04-23 17:50:02 -07:00
AnHardt f2c94b3298 tone will end automaticly 2015-04-22 01:49:55 +02:00
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
Scott Lahteine 09d60e0128 Naming and code comments 2015-04-13 17:17:36 -07:00
Scott Lahteine ccddc280be Apply three more commits 2015-04-12 22:47:44 -07:00
Scott Lahteine 055b11814a Additional cleanup of ultralcd.cpp 2015-04-11 04:56:08 -07:00
Scott Lahteine 388dd0cfa5 Fix doubled lcd_quick_feedback 
- MENU_ITEM causes lcd_quick_feedback to be called, so only those calls
to `lcd_goto_menu` outside of the `MENU_ITEM` macro need to set the
`feedback` flag when calling `lcd_goto_menu`.
 2015-04-11 04:45:04 -07:00
Scott Lahteine 740152ee70 Merge branch 'Development' into cold_extrude 
Latest upstream commits
 2015-04-09 20:23:47 -07:00
Scott Lahteine 5914d9d7de Shuffling declarations.. 2015-04-09 20:21:30 -07:00
Scott Lahteine b328c6e6b6 Shuffling declarations. 2015-04-09 20:05:10 -07:00
Scott Lahteine fb4cefc91d Define lcd_move_[xyz] ahead of lcd_move_menu_axis 2015-04-09 19:33:16 -07:00
Scott Lahteine 9189cc66ab Fix moves for DELTA for MANUAL_BED_LEVELING 
- Use `line_to_current` in place of `plan_buffer_line`
 2015-04-09 04:32:14 -07: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 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
Scott Lahteine 7431ef7e2d Merge branch 'Development' into dev_version 
Latest upstream commits
 2015-04-07 21:14:00 -07:00
Scott Lahteine 43773ff735 Formatting and lcd contrast masking 2015-04-07 21:11:03 -07:00
Scott Lahteine cf9b58452c Minimum delay in menu click feedback 
Squished #1849
 2015-04-07 20:20:30 -07:00
Edward Patel 002340f32c Merge branch 'Development-Marlin' into Development 2015-04-07 22:49:12 +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
Edward Patel 0e6514e7bd Bug fix! Missed putting z value back in right slot after zigzag mod. 2015-04-05 04:13:34 +02:00
Edward Patel ea10601406 Merge branch 'Development-Marlin' into Development 
Conflicts:
	Marlin/Configuration.h
	Marlin/Marlin_main.cpp
 2015-04-05 04:06:02 +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
Scott Lahteine 61f8394361 Compare indices instead of floats for probe actions 2015-04-04 05:01:16 -07:00
Edward Patel 6b91b7b411 Mesh bed leveling: Added G29 S3 + finer steps in manual probing. 
* Use "G29 S3 Xn Yn Zn.nn" to modify bad probed point manually
* Changed manual Z steps from 0.05 to 0.025 and made brought it to Configuration.h
 2015-04-01 21:18:51 +02:00
AnHardt 19b11dfdd7 Fix can't enter MENU_MULTIPLIER_ITEM 2015-03-31 18:29:16 +02:00
Scott Lahteine 571652c49b Fix LCD click 
- Make the default LCD click sound more pleasant
- Fix warnings about bed temperature runaway
 2015-03-31 01:41:24 -07:00
Scott Lahteine a117b6bff6 Merge pull request #1747 from thinkyhead/progress_bar_tweak 
Fix up LCD_PROGRESS_BAR
 2015-03-30 23:37:28 -07:00
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.
 2015-03-30 18:00:54 -07:00
Scott Lahteine 8c136a5ab5 Conditionals and comments for PS = 0 2015-03-30 16:50:05 -07:00
Scott Lahteine 2faed961ce Allow POWER_SUPPLY 0 for no power switch 2015-03-30 16:39:47 -07: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
Scott Lahteine ba871e46bf Fix compiler warnings 
- Patched up for most included configurations
 2015-03-27 20:29:05 -07:00
Scott Lahteine bc2f249cc6 Merge pull request #1622 from AnHardt/tm-utf-minus-kanji 
The big Language Pack
 2015-03-27 18:24:19 -07:00
Scott Lahteine abfcbd793f Merge pull request #1693 from chris-bo/rework_lcd_beeper 
use only one implementation for beeper feedback
 2015-03-27 17:03:38 -07:00
Scott Lahteine 78090275a9 Fix probe range editing 
- Increase the probe offset range to -20…20
- Apply the range limits to the menu item
 2015-03-26 13:52:48 -07: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
Christian Bohn eab5fad539 code formatting 2015-03-26 09:00:34 +01:00
Christian Bohn 4c3cbc0961 use only one implementation for beeper feedback 2015-03-25 12:23:50 +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 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
Scott Lahteine 0d81abe1c9 Merge branch 'Development' into config_testing 
Latest upstream commits
 2015-03-23 21:13:04 -07:00
nicolas-rambaud 37cde8a191 Report changes from previous PR from old code base including : 
I've updated the minimum values from the LCD.
It has been a while that i want to at least fix this.
I have an inductive probe and often i need to set my zOffset to something lower than 0.5.
With the current implementation, the default LCD value is set to 0.5 for some reason.
On my case i need to be able to set it down to 0.0 as my inductive probe can be lower than 0.5.
Before with the LCD we couldn't change this value below 0.5. We had to flash the firmware every time which was painful.
Now we are able to change this value down to 0.0 if needed.
I've also changed the minimum value for Z min acceleration.
In the default configuration it's set to 25 but on the LCD the minimum was 100 which is not coherent.
I've changes the minimum to 10. On this axis, depending on the mechanics/motor drivers we might require very low acceleration, so i guess 10 is somehow realistic.
 2015-03-23 12:29:12 +01:00
Scott Lahteine 4fbb80567e Get upstream commits 2015-03-22 23:07:22 -07:00
Scott Lahteine 691e753cc3 Don't add home offsets in G29 
- Address #1262 by leaving values as set
- Rename `add_homing` to `home_offset`
 2015-03-21 16:30:02 -07:00
Scott Lahteine 15eb5d35a2 Merge branch 'Development' into config_testing 
Latest upstream commits
 2015-03-21 15:42:45 -07:00
Scott Lahteine 63abeaff38 Merge branch 'Development' into config_testing 
Latest upstream commits
 2015-03-21 15:03:06 -07:00
Edward Patel c516747847 Merge branch 'Development' into manual-bed-leveling+mesh-bed-level 2015-03-21 14:49:52 +01:00
AnHardt 64e3d33893 Fix shrinked menucode 
by updating 'encoderPosition' in END_MENU() line 1.
 2015-03-20 23:36:14 +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
Scott Lahteine b6d381f863 Divide up Conditionals to get LCD items early 2015-03-20 02:50:28 -07:00
Scott Lahteine 670006b919 Remove invariant code from Configurations 
- Add `Conditionals.h` with calculated configuration values
- Add `SanityCheck.h` with checks for configuration errors
- Remove equivalent code from all configurations
- Move error checks from some sources to `SanityCheck.h` also
- Fix initialization of count_direction in stepper.cpp
 2015-03-19 22:22:23 -07:00
Edward Patel a61f679568 Merge branch 'Development' into manual-bed-leveling+mesh-bed-level 2015-03-20 02:28:35 +01:00
Scott Lahteine a547dc2148 Merge branch 'Development' into optimize_menu_code 
Get upstream changes
 2015-03-19 13:31:37 -07:00
alexborro e650d4044e Fix "Stop Print" function in the LCD menu 
When one hit "Stop Print" option in LCD menu, the command buffer was not
cleared. The printer keep moving until the buffer has been emptied.
Actually I could not clear the command buffer as well.. I don't know
why, it doesnt work as expected.
I need to implement a routine inside Stepper ISR to handle such
situation.
 2015-03-19 14:16:18 -03: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
Scott Lahteine 4ce79920e5 Merge pull request #1635 from AnHardt/warnings1 
Negative times are unlikly
 2015-03-18 19:10:12 -07:00
Scott Lahteine be3f2dc1d9 Merge pull request #1636 from AnHardt/warning2 
lcd_control_retract_menu() is conditional.
 2015-03-18 19:09:05 -07: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 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
Scott Lahteine 3405f85a6a Reduce size of menu code 
- Get rid of _selected functions, passing selected state instead
 2015-03-15 22:02:33 -07:00
Edward Patel 8005d22c81 Added menu option for bed leveling. 2015-03-15 23:24:32 +01:00
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
 2015-03-14 04:28:22 -07:00
alexborro 9157cbd8f3 Add Travel Acceleration and change the M204 options 
Added option to set Travel Acceleration (non printing moves).
The M204 options was a non sense (S for printing moves and T for retract
moves).

It has been changed to:
P = Printing moves
R = Retract only (no X, Y, Z) moves
T = Travel (non
printing) moves

I will add this info o G-Code wiki in reprap.org. I also advise to put
this info in Marlin next version changelog.
 2015-03-11 13:19:02 -03:00
AnHardt 6fc2ccd568 Make use of new remenbering fontswitch. 2015-03-10 18:04:03 +01:00
Scott Lahteine f379edca78 Cleanup rotary encoder encrot* defines 
The encrot values are used in only one place, and don’t vary, so remove
redundant references.
 2015-03-02 06:42:48 -08:00
Scott Lahteine 2af559cca3 Shared function for menu_edit_* and menu_edit_callback_* 2015-02-23 20:31:28 -08:00
Scott Lahteine 517f411999 Spacing adjustment to menu_edit* macro 2015-02-23 20:11:52 -08:00
Scott Lahteine 4938ae5caf Add required backslash for macro expansion 2015-02-23 20:10:49 -08:00
Scott Lahteine e182cdebf9 Add required backslash for macro expansion 2015-02-23 19:54:07 -08:00
Scott Lahteine fa4c36df68 Fix menu callback issue wrt LCD_CLICKED 2015-02-23 19:40:57 -08:00
Scott Lahteine 3ba47ea277 Remove test/demo multi=line code menu items 2015-02-22 10:10:37 -08:00
Scott Lahteine 40ef472a25 Merge in encoder multiplier 2015-02-21 20:18:49 -08:00
Scott Lahteine 1c13cd604b Formatting in babysteps defines 2015-02-21 18:45:10 -08:00
Scott Lahteine 3a26804d80 Adapt to latest PID code and fix typos 2015-02-21 18:41:04 -08:00
Scott Lahteine 422582da71 Prep formatting for upcoming PR 2015-02-21 18:24:16 -08:00
Scott Lahteine 0d6a7a2df0 Merge with latest upstream changes 2015-02-21 18:13:31 -08:00
Scott Lahteine 57bc28b42c Cleanup and fix ultralcd.cpp 
- Fix bug in lcd_control_temperature_menu
- Remove test menu-item left in from multi-line command feature
- Replace literals with translatable strings
- Reduce lcd_preheat code redundancy
- Reduce menu macro redundancy
- Clean up formatting
 2015-02-21 17:38:56 -08:00
Scott Lahteine 4fcd4b444e Merge pull request #1519 from thinkyhead/fix_recent_issues 
Fix implementation of PID menu items
 2015-02-21 16:43:11 -08:00
Scott Lahteine 430c4b6538 Replace missing backslash 2015-02-20 02:17:16 -08:00
Scott Lahteine a8939eec28 Readability of MENU_MULTIPLIER_ITEM 
Last commit before bed.
 2015-02-20 02:08:41 -08:00
Scott Lahteine 09e09b308e Tweaky spacing adjustments 2015-02-20 01:22:56 -08:00
Scott Lahteine c610471b0c Add PID_PARAMS_PER_EXTRUDER conditional 2015-02-20 00:00:19 -08:00
Scott Lahteine 2d6fa9ce80 Proper implementation of PID menu items 
- Make this work per #1344
 2015-02-19 23:54:06 -08:00
wgm4321 b8e79dce89 Fix compilation errors when encoder multiplier is disabled 2015-02-19 21:51:23 -05:00
wgm4321 65e1fc71be Add encoder rate multiplier 2015-02-19 21:42:57 -05:00
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
 2015-02-16 13:53:58 +01:00
Jérémie FRANCOIS 9d75a56b56 Merge remote-tracking branch 'upstream/Development' into Development 
Conflicts:
	Marlin/Configuration.h
	Marlin/Marlin_main.cpp
 2015-02-11 06:38:36 +01:00
Jérémie FRANCOIS 85e5aa4011 Generalized enqueue_commands_P, and moved them to Marlin_main as they should 2015-02-07 23:24:20 +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
Christian Lefrançois 33408a4dfc Update ultralcd.cpp 
Fix number of nozzle displayed in temperature menu.
 2015-01-30 11:16:13 -05:00
Scott Lahteine 34377ee512 Merge pull request #1427 from thinkyhead/fewer_preheat_strings 
Remove language strings that only add a number
 2015-01-27 22:10:08 -08:00
Scott Lahteine 5fbef6bed2 Merge pull request #1409 from thinkyhead/rename_lastnr 
Rename lastnr to autostart_index and...
 2015-01-27 22:07:23 -08:00
Scott Lahteine 53eea611b8 Fix MSG_NOZZLE 2015-01-27 22:00:32 -08:00
Scott Lahteine c90f2e77d8 Remove language strings that only add a number 
This won’t reduce the string storage in the end, but it makes the
language files smaller. Also removed remaining unused strings.
 2015-01-27 21:36:58 -08:00
Jérémie FRANCOIS dd301be52d Added suport for multiline G-code commands in the LCD menus 2015-01-26 18:50:29 +01:00
Scott Lahteine 03c9cb60e8 Rename lastnr to autostart_index and... 
Replace instances of the number 13 with FILENAME_LENGTH where
appropriate.
 2015-01-24 04:57:44 -08:00
MagoKimbra 986e723eeb Add 4th extruder 2015-01-24 13:37:58 +01:00
grob6000 bf2c923db5 Make multiple PID parameters a config option 
* Adds config parameter `PID_PARAMS_PER_EXTRUDER` - allows single PID
parameters to be used where this would be preferable (e.g. dual
identical extruders)
* When disabled, will use `float Kp, Ki, Kd, Kc;` as before.
Preprocessor macros used to switch between.
* ultralcd.cpp defines extra menus for extra parameters only where
required
* M301 reports `e:xx` only if independent pid parameters enabled
* EEPROM structure still leaves space for 3 extruders worth, when undef
will save single parameter to all extruder positions, but only read the
first
* Switching off saves approx 330 B with no LCD enabled, 2634B with LCD
(RRD) enabled: this is significant.
* LCD modifications should be tested.
 2015-01-11 13:50:17 +11:00
grob6000 0877aa0fe0 Merge remote-tracking branch 'upstream/Development' into independent_pid 2015-01-11 11:32:58 +11:00
grob6000 7d32c7f36d Multiple PID parameter edit for ultralcd 
* Depending on extruder count, will add menu items for ultralcd to edit
individual PID parameters for each extruder
* Added menu items to each language_xx.h
* Builds OK, but recommend testing with typical LCD
 2015-01-11 01:14:02 +11:00
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.
 2015-01-09 18:16:56 -08:00
wgm4321 067b509479 Re-enable filament menu with recalc fix when enabling/disabling mm3 2015-01-05 22:29:29 -05:00
wgm4321 a19f2f8ae7 Disable volumetric menu item due to missing recalc of of multipliers when enabled/disabled 2015-01-04 22:15:16 -05:00
wgm4321 f24dda9700 Revert "Make sure volumetric multipliers are recalc'ed during menu enable/disable of mm3" 
This reverts commit dd7e4ee97f.
 2015-01-04 22:08:41 -05:00
wgm4321 ec4681ab6b Revert "Add "Detailed Z Probe" menu item with ABL is defined." 
This reverts commit 2b9722f387.
 2015-01-04 21:53:37 -05:00
wgm4321 dd7e4ee97f Make sure volumetric multipliers are recalc'ed during menu enable/disable of mm3 2015-01-04 21:44:55 -05:00
wgm4321 2b9722f387 Add "Detailed Z Probe" menu item with ABL is defined. 2015-01-04 21:42:16 -05:00
Bo Herrmannsen a18b625534 Merge pull request #1261 from wgm4321/Development 
Add Filament menu and add Filament/Retract settings to config store.
 2015-01-02 15:35:29 +01:00
Scott Lahteine e7db8ee9e5 ftostr32np > ftostr32sp 
sp=space-padded, similar to: ns=no-sign
 2014-12-30 07:26:25 -08:00
Scott Lahteine 10e1b6ef8b Least stack-usage self-contained ftostr32np() 
This is the optimal code for a self-contained formatter, although the
original code is crafty in being smaller and simpler, and can be
evaluated as using the original output as a scratch pad for state,
making the final formatter more straightforward. While this code is
longer, all code-paths are minimal.
 2014-12-30 07:26:25 -08:00
Scott Lahteine d1f21d1189 As it should be 2014-12-30 07:26:25 -08:00
Scott Lahteine 449dad71f2 Least stack-usage self-contained ftostr32np() 
This is the optimal code for a self-contained formatter, although the
original code is crafty in being smaller and simpler, and can be
evaluated as using the original output as a scratch pad for state,
making the final formatter more straightforward. While this code is
longer, all code-paths are minimal.
 2014-12-30 07:26:24 -08:00
Scott Lahteine a2109cb492 Patch to make Z look more like X and Y on UltraLCD 2014-12-30 07:26:24 -08:00
Caleb Anderson cb047e9070 Actual menu change. Moved menu logic to not be shown unless not currently printing. (untested but straight-forward, printer in a bad state currently) 2014-12-29 10:19:25 -07:00
wgm4321 cb12161191 Add Filament menu and add Filament/Retract settings to config store. 2014-12-28 20:43:14 -05:00
fmalpartida ec33df0554 Merge branch 'SAV-MkI_merge' into Development 
Tested for SAV MKI and SAV 3D LCD on lewihe.
 2014-12-28 19:54:06 +01:00
Bo Herrmannsen c9f60183a9 Merge pull request #1233 from NarimaanV/Development 
Fixed BABYSTEPPING feature
 2014-12-28 10:13:21 +01:00
Scott Lahteine 2f467e2797 LCD Progress Bar 2014-12-27 22:26:14 -08:00
NarimaanV 7667949aca Fixed BABYSTEPPING feature 
Moved PSTR() macro to correct place which was causing the " initializer fails to determine size of '__c' " when attempting to compile with BABYSTEPPING enabled.
 2014-12-23 12:49:54 -05:00
daid 17de96ace7 Merge branch 'Marlin_v1' into revert-1154-sd_sorting 
Conflicts:
	Marlin/cardreader.cpp
	Marlin/cardreader.h
 2014-12-18 23:13:50 +01:00
Bo Herrmannsen a9c334e8bc Merge pull request #1191 from thinkyhead/code_shrink 
Shrink and Optimize
 2014-12-18 17:23:11 +01:00
Scott Lahteine 1857e611d3 Other small tweaks 2014-12-18 07:49:16 -08:00
Scott Lahteine 63e1665fa9 Reduce ultralcd.cpp redundancies 2014-12-18 07:30:05 -08:00
Scott Lahteine e4b98011cf And one more... 2014-12-17 23:01:24 -08:00
Bo Herrmannsen 31ca3de72f Merge pull request #819 from neildarlow/Marlin_v1 
Activate LiquidTWI2 device detection and space-pad LCD status line.
 2014-12-17 21:42:53 +01:00
Bo Herrmannsen e83cfc0a62 Merge pull request #1163 from thinkyhead/lcd_abort_message 
LCD "Abort" Message
 2014-12-17 21:30:19 +01:00
Bo Herrmannsen 0b310ab6c5 Merge pull request #1153 from xinfab/negative_values_in_menu 
Negative values in menu
 2014-12-17 20:58:01 +01:00
Bo Herrmannsen 91d740e128 Merge pull request #1141 from filipmu/Filament-Sensor 
Display filament sensor data on a 20x4 LCD or Graphical LCD
 2014-12-17 20:38:30 +01:00
alexborro ab355a90d3 Revert "SD Sort and Buffer" 2014-12-17 14:50:59 -02:00
Scott Lahteine ae081d0fe0 Improvements, more SORT_USES_MORE_RAM 
With this option, always keeps the dir in RAM, doubling as a cache for
getfilename. A board with only 8K of SRAM is cutting it very close.
 2014-12-13 06:03:39 -08:00
Scott Lahteine 0cbbba08bd SD Card Alpha Sorting 
First iteration of alphabetical sorting for SD cards, both
slow+efficient and fast+rammy. Option for folders to sort first, last,
or not at all.
 2014-12-13 06:03:39 -08:00
Scott Lahteine 3ebfd29312 Print a message when printing is aborted 
Messages in gcode files like “M117 Printing…” were not being cleared on
Stop Print.
 2014-12-13 06:01:46 -08:00
Neil Darlow 64139f5e5a Merge https://github.com/ErikZalm/Marlin into Marlin_v1 2014-12-04 21:09:03 +00:00
Scott Lahteine 3f54c9ba33 Relocate click ignore code into info screen 2014-11-26 21:05:10 -08:00
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.
 2014-11-26 21:05:10 -08:00
Lionello Lunesu 0d35b1d0b8 Allow negative values in menus 2014-11-25 18:34:02 +08:00
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
Christian Inci 110c5dcf23 Fixed typo. 
Signed-off-by: Christian Inci <chris.pcguy.inci@gmail.com>
 2014-10-11 00:25:36 +02:00
Matt Stultz ca30aee903 Fix "add_homeing" to "add_homing" to match changes 2014-10-07 00:16:27 -04:00
Erik van der Zalm 0f2e0525df Merge pull request #1096 from thinkyhead/set-home 
Proposed feature: Set Home Offsets
 2014-10-06 13:36:11 +02:00
Matthew Schick fb34265d75 Make hotend optional when compiling with lcd support 
Signed-off-by: Matthew Schick <matthew.schick@gmail.com>
 2014-10-06 00:19:07 -04:00
Scott Lahteine 2f6c57eadc Proposed feature: Set Home Offsets 
Add an item to the LCD menu that applies the current axis position to
the “add_homeing” offset.
 2014-10-05 13:35:45 -07:00
Neil Darlow 1632e5e38a Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into Marlin_v1 2014-09-04 12:21:35 +01:00
Erik van der Zalm 018b68a5c4 Merge pull request #976 from cocktailyogi/SCARA_by_Yogi 
Implemented SCARA-Maths
 2014-08-28 16:32:52 +02:00
Erik van der Zalm dde61d8886 Merge pull request #977 from OskarLinde/Marlin_v1 
Fix lcd itostr3() to handle negative numbers
 2014-08-28 16:31:53 +02:00
Neil Darlow 3cd7dbcc45 Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into Marlin_v1 2014-07-30 13:01:52 +01:00
cocktailyogi 2f4a20257c imported last Marlin changes 2014-07-20 13:49:26 +02:00
daid aacff0d361 Merge pull request #948 from Dim3nsioneer/Marlin_v1 
Implementation of FW extruder change retract
 2014-07-18 16:10:15 +02:00
Neil Darlow 3f2c771d90 Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into Marlin_v1 2014-07-07 18:17:15 +01:00
Pablo Clemente 2242a84218 Changed the declaration of the variable to Marlin_main.cpp to fix issue on commit #965 2014-07-01 16:45:03 +02:00
Neil Darlow 6e3406d228 Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into Marlin_v1 2014-07-01 10:27:39 +01:00
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. 2014-06-30 15:12:13 +02:00
Oskar Linde 269a068032 Fix lcd itostr3() to handle negative numbers 2014-06-24 14:31:15 +02:00
cocktailyogi 512f2a3136 restore Branch from Backup 
sorry for that
 2014-06-23 17:09:57 +02:00
Pablo Clemente cd3220d055 Inverted state logic for forced_heating_stop variable 2014-06-13 08:39:58 +02:00
Pablo Clemente 86b4b805d2 Fixed stop print LCD function on M104 2014-06-12 18:43:16 +02:00
Dim3nsioneer 3c927901a4 Implementation of FW extruder change retract 
FW retraction is extended onto swap retraction invoked by 'G10 S1'.
Bookkeeping of the retract state of all extruders allows for having one
extruder fw standard retracted while another extruder is swap retracted.
An LCD menu item for the swap retract and recover length was added.
 2014-06-02 17:02:10 +02:00
Neil Darlow e541323741 Merge https://github.com/ErikZalm/Marlin into Marlin_v1 2014-05-09 15:02:50 +01:00
daid 2acd3792fc Merge branch 'Marlin_v1' of github.com:ErikZalm/Marlin into Marlin_v1 2014-05-01 12:03:47 +02:00
daid 8b4c4aa5c3 Add feature to check&retry CRC read errors on SD. 2014-05-01 12:03:41 +02:00
neildarlow bbe8fbe13d Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into Marlin_v1 2014-03-21 18:27:14 +00:00
Dim3nsioneer 944ced87c5 Extended Preheat options 
Preheat LCD menus base on code by D-Base
 2014-03-17 18:37:46 +01:00
Dim3nsioneer 3906f27c46 Individual extruder flow rate 
Extension of M221, Tune menu
 2014-03-15 18:09:46 +01:00
whosawhatsis 0ddee3c7db Prevent SD card insertion from causing a hang when using LiquidTWI2 device detection 2014-03-14 18:46:25 -07:00
Matthew Schick 6cd85e6008 Add support for disabling encoder control for feedrate multiplier 
Signed-off-by: Matthew Schick <matthew.schick@gmail.com>
 2014-03-12 18:13:50 -04: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
nothinman d4ba23bc28 Merge pull request #770 from josefpavlik/Marlin_v1 
Marlin v1
 2014-02-17 11:27:05 +00:00
Josef Pavlik 477b6fa1df move engaged from lcd console refreshes power off timeout 2014-02-14 12:37:21 +01:00
daid c31bb2b7ad Only show the ZProbe offset when auto-bed-leveling is enabled. 2014-02-13 11:48:55 +01:00
Mark Hanford bdd0211aeb Move strings in ultralcd.cpp into language.h. 2014-02-11 13:54:43 +00:00
ErikZalm 84df13f7d1 Merge pull request #721 from drf5n/lcdOnly 
Enable basic ULTRA_LCD screen w/o encoders and menus.
 2014-01-31 07:07:12 -08:00
David Forrest 61a7256d42 Enable basic ULTRA_LCD screen w/o encoders and menus. 2014-01-17 17:00:47 -05:00
Alex Borro 05932e4458 Add Z Probe Offset to EEPROM and Ultra LCD 2014-01-16 18:13:46 -02:00
- e5d3044801 Added posibility to set ENCODER_STEPS_PER_MENU_ITEM in Configuration.h like ENCODER_PULSES_PER_STEP as it depends on it for usability 2013-12-08 21:34:56 +01:00
Erik van der Zalm a94e588765 Changed slow buttons behavior. 2013-11-17 17:41:30 +01:00
fmalpartida 5b3f60ea2e Corrected LCD only error 
If only an LCD is defined and no menu or keyboard defined, there is a
compilation error.

Added conditional compilation.
 2013-10-30 21:52:46 +01: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 667d278f54 Revert "Fix for Viki display" 
This reverts commit 314fd13c39.
 2013-10-20 10:16:46 +02:00
bkubicek 7fad13a1e2 Reverse SD card file name order. 
This is _not_ automatically the cronological, since deleting a file will free
the filesystem descriptor for it, which then will be used by the next file copied on it.
Since this makes the auto0.g file very inaccessible, I put the option back, to have it in the prepare menu.

this should satisfy https://github.com/ErikZalm/Marlin/pull/373

as a reminder, auto0.g will be executed every time after a boot with sd card present and file present.
thereafter, if there is a file auto1.g this will be done. Thats IMHO the best place to put settings, and prepare heating.
I also execute again after each (now again via the prepare menu) before starting a new print/ after a failed one.
It for me 100% replaces any start.gcode form the slicers.
 2013-10-12 13:24:55 +02:00
bkubicek b832f5b9f6 added delta tower babystepping. Its untested, but hopefully florian horsch will be able to try. 
also, removed some trouble for compilation with corexy.
I think that babystepping is only possible in z for a delta tower.
not sure if it would be usefull to step individual motors on a delta, i don't own one
 2013-10-07 09:14:04 +02:00
bkubicek d147a057ac Add the socalled "Babystepping" feature. 
It is a realtime control over the head position via the LCD menu system that works _while_ printing.
Using it, one can e.g. tune the z-position in realtime, while printing the first layer.
Also, lost steps can be manually added/removed, but thats not the prime feature.
Stuff is placed into the Tune->Babystep *

It is not possible to have realtime control via gcode sending due to the buffering, so I did not include a gcode yet. However, it could be added, but it movements will not be realtime then.

Historically, a very similar thing was implemented for the "Kaamermaker" project, while Joris was babysitting his offspring, hence the name.

say goodby to fuddling around with the z-axis.
 2013-10-06 21:14:51 +02:00
Erik van der Zalm 314fd13c39 Fix for Viki display 2013-09-26 20:32:19 +02:00
Erik van der Zalm 9bc88f8bab Placed optional ENCODER_PULSES_PER_STEP in the configuration.h file 2013-09-23 23:25:11 +02:00
Erik van der Zalm 3ca1ca6869 Fixed missing ENCODER_PULSES_PER_STEP 2013-09-23 23:18:35 +02:00
Xoan Sampaiño bf7007d02f add ENCODER_PULSES_PER_STEP 2013-09-13 04:12:51 +02:00
Nicolas Rossi 394ed08f88 Added feedrate setting for manual moves from panel 2013-07-30 14:33:30 +02:00
Brendan-csel d7f384f680 Skip SD menu refresh if nothing has changed 2013-07-30 14:02:15 +02:00
Brendan-csel abc8320a68 Save LCD_CLICKED before it is cleared 
The SD card menu was refreshing so slowly that the button interrupt was clearing LCD_CLICKED before the menu items could check it.
 2013-07-30 14:02:13 +02:00
Nicolas Rossi 55c287a69e Fixed move from panel for delta bot #557 2013-07-28 22:54:37 +02:00
Guillaume Seguin 76841450c8 Only display poweron/poweroff if PS_ON_PIN > -1 2013-07-23 22:28:30 +02:00
Guillaume Seguin 34da3a0a3f Merge github.com:ErikZalm/Marlin into Marlin_v1 
Conflicts:
	Marlin/language.h
 2013-07-23 21:46:41 +02:00
ErikZalm 8a2a3ef91d Merge pull request #531 from iXce/Marlin_v1_lcd 
Only clamp panel movements if software endstops are enabled
 2013-07-14 06:50:23 -07:00
Erik van der Zalm cdaaad3df1 Merge branch 'Marlin_v1' of https://github.com/makr3d/Marlin into makr3d-Marlin_v1 2013-07-14 15:45:49 +02:00
Erik van der Zalm e3bdefd873 fixed missing #endif 2013-07-14 15:42:53 +02:00
Erik van der Zalm a5be0c52c6 no message 2013-07-14 15:35:54 +02:00
Michael Mayer e509cdbeb0 added contrast control function for gLCDs 2013-07-14 15:28:26 +07:00
xifle 61fe430d4f Should fix compiler warning for feedrate deadzone 2013-07-01 11:10:02 +02:00
Guillaume Seguin aa65c20d1f Only clamp panel movements if software endstops are enabled 2013-06-28 14:18:00 +02:00
Nicolas Rossi 2daa85918e Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin.git into Marlin_v1 
Conflicts:
	Marlin/Configuration.h
	Marlin/Marlin_main.cpp
	Marlin/language.h
	Marlin/pins.h
	Marlin/ultralcd.cpp
 2013-06-20 23:59:56 +02:00
lajos b519af4f05 fixed another !defined(PIDTEMP) compile in ultralcd.cpp 2013-06-15 20:49:18 -04:00
lajos 7d03c52511 fixed compile error in ultralcd.cpp when PIDTEMP undefined 2013-06-15 18:09:52 -04: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
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
Dirk Eichel f3e0e5184d Add include selector between char. LCD and GLCD 2013-03-19 20:59:21 +01:00
Dirk Eichel 5f1cd70122 Add code to lcd_update() for GLCD 
This code selects between the routines for the GLCD or the char.
display.
 2013-03-19 20:19:16 +01:00
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.
 2013-03-19 20:13:23 +01:00
Nicolas Rossi 86bf911139 Toggle menu for PSU from LCD pannel 
From the prepare menu, accessible when is not printing, you have the
possibility to turn off the PSU when is on et vice versa.
From the host, you can turn off or turn on the PSU then the menu is
updated accordingly.
From the LCD message, the printer status is reported ready or off
respectively when the PSU is on or off.
 2013-03-05 14:52:51 +01:00
daid303 de3dec7215 Also show the tune menu when USB printing. 2013-02-20 00:54:44 +01:00
Dirk Eichel c8f1fbd9d8 Add SD-Card change and SD-Card init. 
Add SD-Card change and SD-Card init. for reprap electronics without
SD-Chard change detect pin.
 2013-02-12 17:35:46 +01:00
Marius Kintel f24f02e212 compile fix: quickStop() needs stepper.h 2013-01-31 10:43:03 -05:00
Bernhard 1d06b10962 Added a feature to have filament change by gcode or display trigger. 
[default off for now]
syntax: M600  X[pos] Y[pos] Z[relative lift] E[initial retract] L[later retract distance for removal]

if enabled, after a M600, the printer will retract by E, lift by Z, move to XY, retract even more filament.
Oh, and it will display "remove filament" and beep like crazy.

You are then supposed to insert a new filament (other color, e.g.) and click the display to continue.
After having the nozzle cleaned manually, aided by the disabled e-steppers.
After clicking, the printer will then go back the whole shebang, and continue printing with a fancy new color.
 2013-01-27 13:21:34 +01:00
Kevin O'Connor 3f2f94ef28 Be consistent in setting of the fan PWM. 
Always set the FAN PWM value in check_axes_activity() and always use
the value of the active move if a move is active.
 2013-01-08 18:49:18 -05: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 a95dcd74e7 Fix some of the duplicated PSTRs, saving 500bytes of flash with LCD on. 2012-12-17 11:09:09 +01:00
daid303 047d037f8c #ifdef fix for #326 2012-12-13 09:04:41 +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
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. 2012-12-03 12:52:00 +01:00
daid303 a2032afa3a Fixed #303 2012-11-12 21:04:07 +01:00
daid303 f4a89ec776 SDCARDINSERTED is always defined, and thus we do not need the #ifdefs. 2012-11-12 09:16:27 +01:00
daid303 12a4d60e18 Fix the EEPROM storage, no longer inline it at multiple locations, and remove the template. 2012-11-07 10:02:45 +01:00
daid303 f6ff0ab767 signed/unsigned fixes. 2012-11-06 15:33:49 +01:00
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. 2012-11-06 12:06:41 +01:00
Renamed from Marlin/ultralcd.pde (Browse further)