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

240 commits

Author SHA1 Message Date
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