microlab
/
scube
1
1
Fork 0
Code Issues Pull Requests Releases Activity
8,232 Commits
1 Branch
0 Tags
110 MiB
2.0.x
Branches Tags
${ item.name }
Create tag ${ searchTerm }
Create branch ${ searchTerm }
from '186580b55f'
${ noResults }
Commit Graph

554 Commits (186580b55fe7a9cf8e9c4e0fb7bf1be2333055f6)

Author SHA1 Message Date
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 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
maverikou 8a739b6fba Merge branch 'Development' into delta_auto_bed_level 
Conflicts:
	Marlin/Marlin_main.cpp
 10 years ago
maverikou 39d255608d Test an extra delta configuration with auto bed leveling code paths 10 years ago