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
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
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
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
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