Skip to content

Case light menu entry#5254

Closed
Kaibob2 wants to merge 6 commits intoMarlinFirmware:RCBugFixfrom
Kaibob2:Case-light-Menu-entry
Closed

Case light menu entry#5254
Kaibob2 wants to merge 6 commits intoMarlinFirmware:RCBugFixfrom
Kaibob2:Case-light-Menu-entry

Conversation

@Kaibob2
Copy link
Contributor

@Kaibob2 Kaibob2 commented Nov 19, 2016

Referenced to this #5194 (and this #5243 because i don't understand github) i implemented a (definable) Menu entry on the main screen to toggle the case lights. I had this long before the #define CASE_LIGHT_PIN 4 and always found it extremely useful to be able to switch off the case light from by LCD. The host is shut down most of the time, so if #define CASE_LIGHT_DEFAULT_ON is enabled there is no way to switch of the case light if the printer is printing for 20 hours.

RCBugFix won't compile due to a missing semicolon in marlin_main.cpp when CASE_LIGHT_DEFAULT_ON is enabled.
Grammar and "better german" corrections
@thinkyhead
Copy link
Member

thinkyhead commented Nov 19, 2016

Best when starting a new branch to git fetch upstream and make sure you're building off the latest RCBugFix. git fetch upstream ; git checkout upstream/RCBugFix -b my_feature… Otherwise the PR won't be compatible.

@Kaibob2
Copy link
Contributor Author

Kaibob2 commented Nov 19, 2016

@thinkyhead WHere do i have to enter this git fetch upstream ; git checkout upstream/RCBugFix -b my_feature stuff???

@thinkyhead
Copy link
Member

thinkyhead commented Nov 19, 2016

You can always bring a branch up-to-date with git fetch upstream ; git rebase upstream/RCBugFix.

This all presumes you've made an upstream remote as an alias to MarlinFirmware.

git remote add upstream git@github.com:MarlinFirmware/Marlin.git

@thinkyhead
Copy link
Member

thinkyhead commented Nov 19, 2016

Where do i have to enter this git fetch upstream ; git checkout upstream/RCBugFix -b my_feature stuff???

Hmm. I forget that some proprietary OS's don't have a BASH. If using GNU tools on a frequent basis it's good to have a proper environment. In Windows it's a bit of work to add one.

@Kaibob2
Copy link
Contributor Author

Kaibob2 commented Nov 19, 2016

I'm on WIn10 64bit and do all editing online here at github.
For testing i use Aduino IDE

@thinkyhead
Copy link
Member

thinkyhead commented Nov 19, 2016

You can do some of these things using the GitHub Desktop client.
Read the documentation provided for it, somewhere on this site.

@thinkyhead
Copy link
Member

Ultimately all you really need is a git command in your CLI, and you can do all the fanciness.

@thinkyhead
Copy link
Member

thinkyhead commented Nov 19, 2016

While Github Desktop doesn't provide detailed rebase it can do merge. The sync option is a combination of git pull and git merge. Merge will apply changes following your commits, while a rebase re-applies commits in a branch to a more recent root commit.

@Kaibob2
Copy link
Contributor Author

Kaibob2 commented Nov 19, 2016

Puh, sounds a liitle complicated, but i think i have to dig into this. Can my pull request be merged anyway?

@thinkyhead
Copy link
Member

Without resolving conflicts, it cannot be merged.

@Kaibob2
Copy link
Contributor Author

Kaibob2 commented Nov 19, 2016

Damn, so close :)
Ok. I will just delete my whole repository and start with a fresh fork.
That's what i did yesterday and this worked. For the future i will check out Github desktop.

@Kaibob2
Copy link
Contributor Author

Kaibob2 commented Nov 19, 2016

I'll close here. Please have a look at #5255
Thanks for the fast support!

@Kaibob2 Kaibob2 closed this Nov 19, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants