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

561 Commits (ce65c13a97287d5cc9b9322d5cc18f1997200eef)

Author SHA1 Message Date
Scott Lahteine 8db4fd7177 Merge branch 'Development' into planner_oh_planner 
Latest upstream commits
 10 years ago
Scott Lahteine 88e81a4804 Latest upstream commits, plus fixes 
- Also add Manual Bed Leveling to the rest of the configs
 10 years ago
Scott Lahteine 2c9bd15625 Move LCD items to `Conditionals.h` 
- `Conditionals.h` is included twice, setting LCD values the first time
 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 63d5d28085 Merge branch 'Development' into config_testing 
Latest upstream changes
 10 years ago
Scott Lahteine b6d381f863 Divide up Conditionals to get LCD items early 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
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