Scott Lahteine
0d869703ca
Merge pull request #1655 from thinkyhead/fix_count_direction_init
Fix count_direction initializer
преди 10 години
Scott Lahteine
2176a22d42
Fix count_direction initializer
- Addressing #1625
преди 10 години
AnHardt
e72cb3e45d
Merge https://github.com/MarlinFirmware/Marlin into tm2-utf-minus-kanji
Conflicts:
Marlin/dogm_lcd_implementation.h
Marlin/ultralcd_implementation_hitachi_HD44780.h
Fix merge conflicts 2
преди 10 години
Scott Lahteine
cb6942d4a7
Merge branch 'Development' into config_testing
Get upstream commits
преди 10 години
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
преди 10 години
Scott Lahteine
e3f04c876a
Merge pull request #1653 from thinkyhead/lcd_menu_hilite
Fix hiliting of edit items in LCD menus
преди 10 години
Scott Lahteine
5644ad6809
Fix hiliting of edit items
преди 10 години
Scott Lahteine
63d5d28085
Merge branch 'Development' into config_testing
Latest upstream changes
преди 10 години
Scott Lahteine
526a755a66
Merge pull request #1652 from AnHardt/PIDdebug
PID debug
преди 10 години
Scott Lahteine
a1c240b0a4
Delta supports some auto bed leveling options
преди 10 години
Edward Patel
5112cf8422
Added comment for the EEPROM storage
преди 10 години
Edward Patel
4619d80524
Merge branch 'Development' into manual-bed-leveling+mesh-bed-level
преди 10 години
Scott Lahteine
199151a4ed
Merge pull request #1650 from AnHardt/beautify
Beautivy statusscreen
преди 10 години
Scott Lahteine
2424713a8f
Merge pull request #1640 from AnHardt/warning6
codepos not used in gcode_M28()
преди 10 години
Scott Lahteine
b6d381f863
Divide up Conditionals to get LCD items early
преди 10 години
AnHardt
e85061d20d
Added changes to the 'new' Configuration.h s
преди 10 години
Scott Lahteine
33c7c6e11d
Conditionals.h requires Arduino.h
преди 10 години
Scott Lahteine
8ade04b78e
Felix and Hephestos configs
- Not sure why these are showing as all new
преди 10 години
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
преди 10 години
Edward Patel
a61f679568
Merge branch 'Development' into manual-bed-leveling+mesh-bed-level
преди 10 години
Edward Patel
c87faa69ed
Shortened mesh_plan_buffer_line()
преди 10 години
AnHardt
47c1ea72af
Merge https://github.com/kieranc/Marlin into PIDdebug
Conflicts:
Marlin/temperature.cpp
Cleaned merge conflict.
Codeposition had changed.
Variable pid_input had vanished.
Signed-off-by: AnHardt <github@kitelab.de >
преди 10 години
AnHardt
f1d3d1524d
Merge branch 'optimize_menu_code' of https://github.com/thinkyhead/Marlin into beautify
Conflicts:
Marlin/dogm_lcd_implementation.h
solved merge conflict.
преди 10 години
Scott Lahteine
0858fba192
Merge pull request #1620 from thinkyhead/optimize_menu_code
Reduce size of menu code
преди 10 години
AnHardt
fa889cd6e1
Beautivy statusscreen
by shifting things some pixels around
преди 10 години
Scott Lahteine
7279e4f82f
Small code tweaks re lcd.print
преди 10 години
Scott Lahteine
90ba61b9b8
Include indicator for new drawmenu_generic
In the new method we pass the character that should be used for
selected state, not the character to print always.
преди 10 години
Scott Lahteine
15d29efad5
Pass sel to lcd_implementation_mark_as_selected
- Pass selected state directly to lcd_implementation_mark_as_selected
- Rename sel function parameter
- Include a minor fix for SdBaseFile.h
преди 10 години
Scott Lahteine
a547dc2148
Merge branch 'Development' into optimize_menu_code
Get upstream changes
преди 10 години
CONSULitAS
9c1f6e7ac7
Merge remote-tracking branch 'upstream/Development' into Development
преди 10 години
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.
преди 10 години
AnHardt
eff6a2bd2e
Clean out a warning
in ultralcd_implementation_hitachi_HD44780.h lcd_print( about array index.
преди 10 години
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.
преди 10 години
AnHardt
ae01a6b5f2
Make use of codepos.
Saves one addition.
Needs one pointer on the stack.
Don't know if this is a go trade.
преди 10 години
Scott Lahteine
a534ac197a
Merge pull request #1621 from AnHardt/remove--6x9-font
Remove 6x9 font
преди 10 години
Scott Lahteine
80e0ee10ca
Merge pull request #1631 from AnHardt/iss1593
Decrease KILL_DELAY
преди 10 години
Scott Lahteine
4ce79920e5
Merge pull request #1635 from AnHardt/warnings1
Negative times are unlikly
преди 10 години
Scott Lahteine
76127b8a55
Merge pull request #1630 from Wurstnase/fix_g29
optional parameters must be named when ignoring order
преди 10 години
Scott Lahteine
be3f2dc1d9
Merge pull request #1636 from AnHardt/warning2
lcd_control_retract_menu() is conditional.
преди 10 години
Scott Lahteine
8d396584bf
Merge pull request #1637 from AnHardt/warning3
lcd_autostart_sd() has two conditions.
преди 10 години
Scott Lahteine
8664c6d465
Merge pull request #1638 from AnHardt/warning4
delta[3] not used when DELTA not defined.
преди 10 години
Scott Lahteine
10711ccc6a
Merge pull request #1639 from AnHardt/warning5
G4 could wait for an undefined time
преди 10 години
Edward Patel
28c91deb5c
EEPROM saving of z_values.
Tried to make it a little intelligent.
преди 10 години
Edward Patel
240b5cfe04
Merge branch 'Development' into manual-bed-leveling+mesh-bed-level
преди 10 години
alexborro
4521f6655b
Restore "S" parameter of M204 for retrocompatibility.
преди 10 години
alexborro
5ddb8d94e2
Update Documentation related to M204
преди 10 години
AnHardt
f8c4d43886
delta[3] is used with SCARA
Shoot in the dark.
преди 10 години
AnHardt
72a9fed4fb
codepos not used in gcode_M28()
Got:
Marlin_main.cpp:2567: warning: unused variable 'codepos'
Needs revision.
Don't now how this should look like.
преди 10 години
AnHardt
b94dd33641
G4 could wait for an undefined time
Got:
Marlin_main.cpp:1689: warning: 'codenum' may be used uninitialized in this function
And indeed codenum is undefined when no parameter is given.
преди 10 години
AnHardt
e90985a4e8
delta[3] not used when DELTA not defined.
got:
Marlin_main.cpp:387: warning: 'delta' defined but not used
Compiles cleaner when definition is removed.
преди 10 години