Else Mode

Related to the development libraries, released by Curt Binder

Posts: 234
Joined: Tue Nov 05, 2013 8:40 am
Location: Houston TX
PostPosted: Sun Aug 31, 2014 4:01 pm
Has Else mode been added into the libraries yet? or is there an ETA on that?

Really looking forward to being able to use the portal again.
Image

Posts: 263
Joined: Wed Jan 01, 2014 7:26 am
PostPosted: Sun Aug 31, 2014 5:19 pm
Else is in the dev branch and will be in the next release as a pump mode and also as a mode accessible with DC Pump. It is working in the new U-App that Roberto has out, but isnt a choice in the portal yet, I think. You could always download the dev branch on github as a zip and compile against that instead to get it now if you wanted.
User avatar
Posts: 1426
Joined: Fri Mar 29, 2013 3:51 pm
Location: Oklahoma City
PostPosted: Sun Aug 31, 2014 7:50 pm
They left my name off the else mode. :(

--Colin

Posts: 263
Joined: Wed Jan 01, 2014 7:26 am
PostPosted: Mon Sep 01, 2014 4:25 am
cosmith71 wrote:They left my name off the else mode. :(

--Colin


Colin, sorry, that was my fault. I had stuck it in my .ino without attribution and just took it from there and put it into globals and didnt remember who's post i hed ever gotten it from. I will hunt your thread and do a pull request with attribution in there like the other functions.
User avatar
Posts: 1426
Joined: Fri Mar 29, 2013 3:51 pm
Location: Oklahoma City
PostPosted: Mon Sep 01, 2014 6:01 am
Thanks!

[/pout] ;)
User avatar
Posts: 1426
Joined: Fri Mar 29, 2013 3:51 pm
Location: Oklahoma City
PostPosted: Tue Sep 02, 2014 3:13 am
Someday, someone needs to explain to me how the whole Github process works. Can anyone point me to an article, or explain in layman's terms?

Thanks,

--Colin

Posts: 263
Joined: Wed Jan 01, 2014 7:26 am
PostPosted: Tue Sep 02, 2014 6:52 am
To grab the dev version just go to

https://github.com/reefangel/Libraries/tree/dev

and click on "Download ZIP" on the right and unzip into your reef angel libraries directory. Mine is under My Documents\Arduino\.

If you want to contribute code you can make a github account, then click "Fork" on the top right at http://github.com/reefangel/Libraries/ That gives you a copy of the code to play with.

I then use the Github for Windows client to work on the code: https://windows.github.com/ You drag the copy of Libraries from your repository to the client once you start it up and log in.

If you want to add code you'd pick the dev branch on the github client, make a new branch by typing in a name for the change you made into the branch selection box. For instance, for this one I made a branch called "credit-for-else-mode" and put two lines into Globals.cpp: https://github.com/amunter/Libraries/tr ... -else-mode

Here is the commit that I did: https://github.com/amunter/Libraries/co ... 75db63c468

Then you make changes to the files on your hard drive and check them in. Make sure the branch is published by clicking the Publish link on the top right of the github for windows client.

Once you're satisfied you go to the website and do a pull request to Roberto. Pick your new branch from the droplist and pick "Pull Request" via the green button to the left of the branch picker. It will come up with a pull against reefangel/master, but click the "Edit" button to change it to a pull against reefangel/dev. Type in something so Roberto knows what you're trying to do and wait for him to go over your changes. He tends to let it sit for a while which helps me out because I'll often have like 1 more or 2 more little changes you end up making...

If Roberto makes changes to the dev branch which you want to get back into "your" dev branch you can open the Github Windows client, make sure dev is selected on the drop list, then right click the repository name on the left: "Libraries" and pick "Open in Git Shell" It will open a text window with [dev] on the prompt in green. Then do

git fetch upstream
git merge upstream/dev
git push

and you'll have everything up to date with Roberto's code. If you've been making your own changes on /dev (which you shouldn't do, probably, you should probably be working on branches which are copies of /dev) you may get conflicts, which can be tough to figure out, but you'll figure it out if it happens.

Once Roberto has merged in whatever changes you made and submitted to him in your pull request you can delete that branch and merge upstream/dev again to get them into your dev branch.
User avatar
Posts: 1426
Joined: Fri Mar 29, 2013 3:51 pm
Location: Oklahoma City
PostPosted: Thu Sep 04, 2014 6:43 am
Thanks, Alan! Haven't had time to process this yet (work) but I'll have time this weekend to look it over.

--Colin

Return to Development Libraries

Who is online

Users browsing this forum: Baidu [Spider], Bing [Bot] and 1 guest