melch
/
Marlin
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
2,877 Commits
2 Branches
0 Tags
2.0 GiB
x301
2.0.x
Branches Tags
${ item.name }
Create tag ${ searchTerm }
Create branch ${ searchTerm }
from 'c379f17117'
${ noResults }
Commit Graph

2877 Commits (c379f17117474b77277aaeea08e914373b5c20a5)
 

Author SHA1 Message Date
AnHardt 8c5bb38748 Removed now unneded FONT_STATUSMENU 10 years ago
Scott Lahteine 0d869703ca Merge pull request #1655 from thinkyhead/fix_count_direction_init 
Fix count_direction initializer
 10 years ago
Scott Lahteine 2176a22d42 Fix count_direction initializer 
- Addressing #1625
 10 years ago
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 years ago
Scott Lahteine cb6942d4a7 Merge branch 'Development' into config_testing 
Get upstream commits
 10 years ago
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 years ago
Scott Lahteine e3f04c876a Merge pull request #1653 from thinkyhead/lcd_menu_hilite 
Fix hiliting of edit items in LCD menus
 10 years ago
Scott Lahteine 5644ad6809 Fix hiliting of edit items 10 years ago
Scott Lahteine 63d5d28085 Merge branch 'Development' into config_testing 
Latest upstream changes
 10 years ago
Scott Lahteine 526a755a66 Merge pull request #1652 from AnHardt/PIDdebug 
PID debug
 10 years ago
Scott Lahteine a1c240b0a4 Delta supports some auto bed leveling options 10 years ago
Edward Patel 5112cf8422 Added comment for the EEPROM storage 10 years ago
Edward Patel 4619d80524 Merge branch 'Development' into manual-bed-leveling+mesh-bed-level 10 years ago
Scott Lahteine 199151a4ed Merge pull request #1650 from AnHardt/beautify 
Beautivy statusscreen
 10 years ago
Scott Lahteine 2424713a8f Merge pull request #1640 from AnHardt/warning6 
codepos not used in gcode_M28()
 10 years ago
Scott Lahteine b6d381f863 Divide up Conditionals to get LCD items early 10 years ago
AnHardt e85061d20d Added changes to the 'new' Configuration.h s 10 years ago
Scott Lahteine 33c7c6e11d Conditionals.h requires Arduino.h 10 years ago
Scott Lahteine 8ade04b78e Felix and Hephestos configs 
- Not sure why these are showing as all new
 10 years ago
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 years ago
Edward Patel a61f679568 Merge branch 'Development' into manual-bed-leveling+mesh-bed-level 10 years ago
Edward Patel c87faa69ed Shortened mesh_plan_buffer_line() 10 years ago
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 years ago
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 years ago
Scott Lahteine 0858fba192 Merge pull request #1620 from thinkyhead/optimize_menu_code 
Reduce size of menu code
 10 years ago
AnHardt fa889cd6e1 Beautivy statusscreen 
by shifting things some pixels around
 10 years ago
Scott Lahteine 7279e4f82f Small code tweaks re lcd.print 10 years ago
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 years ago
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 years ago
Scott Lahteine a547dc2148 Merge branch 'Development' into optimize_menu_code 
Get upstream changes
 10 years ago
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 years ago
AnHardt eff6a2bd2e Clean out a warning 
in ultralcd_implementation_hitachi_HD44780.h lcd_print( about array index.
 10 years ago
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 years ago
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 years ago
Scott Lahteine a534ac197a Merge pull request #1621 from AnHardt/remove--6x9-font 
Remove 6x9 font
 10 years ago
Scott Lahteine 80e0ee10ca Merge pull request #1631 from AnHardt/iss1593 
Decrease KILL_DELAY
 10 years ago
Scott Lahteine 4ce79920e5 Merge pull request #1635 from AnHardt/warnings1 
Negative times are unlikly
 10 years ago
Scott Lahteine 76127b8a55 Merge pull request #1630 from Wurstnase/fix_g29 
optional parameters must be named when ignoring order
 10 years ago
Scott Lahteine be3f2dc1d9 Merge pull request #1636 from AnHardt/warning2 
lcd_control_retract_menu() is conditional.
 10 years ago
Scott Lahteine 8d396584bf Merge pull request #1637 from AnHardt/warning3 
lcd_autostart_sd() has two conditions.
 10 years ago
Scott Lahteine 8664c6d465 Merge pull request #1638 from AnHardt/warning4 
delta[3] not used when DELTA not defined.
 10 years ago
Scott Lahteine 10711ccc6a Merge pull request #1639 from AnHardt/warning5 
G4 could wait for an undefined time
 10 years ago
Edward Patel 28c91deb5c EEPROM saving of z_values. 
Tried to make it a little intelligent.
 10 years ago
Edward Patel 240b5cfe04 Merge branch 'Development' into manual-bed-leveling+mesh-bed-level 10 years ago
alexborro 4521f6655b Restore "S" parameter of M204 for retrocompatibility. 10 years ago
alexborro 5ddb8d94e2 Update Documentation related to M204 10 years ago
AnHardt f8c4d43886 delta[3] is used with SCARA 
Shoot in the dark.
 10 years ago
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 years ago
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 years ago
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 years ago