Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Kimbra singlenozzle #1686

Closed
wants to merge 8 commits into from
Closed

Kimbra singlenozzle #1686

wants to merge 8 commits into from

Conversation

Wurstnase
Copy link
Contributor

I try to cherry-pick. So somebody needs to check this.

@Wurstnase
generic delta update
61ebdec
@Wurstnase
SINGLENOZZLE
68bdb29 
One Hotend for More extruder.

Conflicts:
	Marlin/Marlin_main.cpp
	Marlin/temperature.cpp
@Wurstnase
move to Conditionals
2b15fd9
@thinkyhead
Copy link
Member

That's very comprehensive. That last commit broke something, and the code is looking for ARRAY_BY_EXTRUDERS again. You might want to make a new branch from that second commit, then see if you can get a clean merge from the latest Development branch.

@Wurstnase
Copy link
Contributor Author

I missed some renames. This works now.

But please test this before merge. I can't test this.

@thinkyhead
Copy link
Member

Looks good, no typos that I can see. I will merge this pretty soon. Trying to find a bed leveling bug at the moment…

@thinkyhead thinkyhead mentioned this pull request Mar 26, 2015
Closed
@Wurstnase
Merge branch 'Development' into Kimbra_Singlenozzle
182f5a8 
Conflicts:
	Marlin/Conditionals.h
	Marlin/temperature.cpp
@thinkyhead
Copy link
Member

This is only failing Travis CI due to issues on their end.

@Wurstnase
rework ultralcd_impl_hitachi
4310c75 
revert generic delta Configuration
@Wurstnase Wurstnase closed this Mar 27, 2015
@Wurstnase Wurstnase reopened this Mar 27, 2015
thinkyhead
thinkyhead reviewed Mar 27, 2015
View reviewed changes
Marlin/ultralcd_implementation_hitachi_HD44780.h
tTarget=int(degTargetBed() + 0.5);
lcd.print(LCD_STR_BEDTEMP[0]);
# endif
#if HOTENDS >
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If HOTENDS is greater than... what? This needs a right operand.

/ultralcd_implementation_hitachi_HD44780.h:485:19: error: operator '>' has no right operand

@thinkyhead thinkyhead mentioned this pull request Mar 28, 2015
Closed
@Wurstnase
missing 1
f8f1b6f 
HOTENDS > 1
@Wurstnase
Merge remote-tracking branch 'Marlin8bit/Development' into Kimbra_Sin…
9f1f804 
…glenozzle

Conflicts:
	Marlin/Marlin_main.cpp
	Marlin/temperature.cpp
	Marlin/temperature.h
	Marlin/ultralcd_implementation_hitachi_HD44780.h
@thinkyhead
Copy link
Member

@Wurstnase This went a little out of date with all my screwing around with extruder_offsets. When you have a chance to merge and resolve this, also make sure any new references to EXTRUDERS (if any) are updated to HOTENDS too. Lots of bugs have been fixed recently, so this PR will be easier to include without worrying about how it interacts with any of those.

@Wurstnase
Copy link
Contributor Author

@thinkyhead I will make an update of it.

@Wurstnase Wurstnase closed this Apr 8, 2015
@thinkyhead thinkyhead mentioned this pull request May 23, 2016
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@Wurstnase @thinkyhead @boelle