Skip to content

Added a lot of functionality to pull back into the base #6

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
Open
mycon wants to merge 41 commits into
base: master
Choose a base branch
from
Open

Added a lot of functionality to pull back into the base #6

mycon wants to merge 41 commits into from

Conversation

@mycon
Copy link

@mycon mycon commented Jul 13, 2016

No description provided.

thomric2 and others added 30 commits June 2, 2013 10:15
@thomric2
added cooling, fan, autoaway, manual away, and humidity
ba10bbf
@thomric2
added cooling, fan, autoaway, manual away, and humidity
987904c
@thomric2
validate get data is not empty
3572537
@thomric2
added energy collection routines and db setup
d38b953
@oyarzun
Added ability to have multiple nests
9fff885
@oyarzun
Update README.md
213b85c
@oyarzun
move config.php to config.php.sample. added .gitignore
110a41a
@oyarzun
added range for target temp; use json for fetch.php; split out js and…
2011e08 
… css
@oyarzun
Merge branch 'master' for README.md changes on github
18824c7
@mycon
Update for new nest api
3ddf4a0
@mycon
Add logging of outside temperature with data
8a5b035
@mycon
Add support for energy plotting and multi data visualization
c57ce97
@mycon
Cleanup energy plotting, insert more outside weather into database
2b94131
@mycon
update readme
a5df8ad
@mycon
1st pass cleanup color. Add outside humidity and pressure to ui.
9e897bf
@mycon
Add daily temp info to store with energy and query and php to populat…
9491a6b 
…e it
@mycon
Add daily min/max/avg temperature to energy plot. Begin work on cycle…
15ea256 
…s plot.
@visibilityspots
Added nest-api as submodule
710dad5
@mycon
Add gneration of daily temp values to insertEnergy script
60c68c5
@oyarzun
added textbox to change the hours interval
f13d12c
@oyarzun
Updated to use username and password as members instead of constants
091d965
@oyarzun
updated insert energy for multiple nests
e7799b0
@mycon
Merge in e7799b0
a9ef677
@mycon
Merge commit '710dad5a4fcb108eb5291e71549052dde06b55c2'
c020fcf
@visibilityspots @mycon
Cherrypick 'b54653fde0bf534b159f3aaa018d5b1dde87c616'
5e0f7b2
@mycon
Add yahoo-api to submodules
da5dbd5
@mycon
Update website screenshot to show full plots
345d163
@mycon
Rescale Temperatures on Energy plot a tiny bit
6123e53
@zeeMonkeez
change units to C
20f3aea
@zeeMonkeez
change time tick format
f8fe5e4
zeeMonkeez and others added 7 commits January 4, 2015 00:08
@zeeMonkeez
make humidity/pressure plot
7bcc347
@zeeMonkeez
change deg F to deg C
93f8cde
@zeeMonkeez
fix device id
6b43ffc
@mycon
Update to latest nest/yahoo APIs
f7dffc7
@mycon
Merge commit '6b43ffcc7320c92c7f90fa9183e20e90b855a7ba'
7505bef
@mycon
Add config option for Temperature C/F
b866e8a 
Yahoo needs OAUTH to get weather as of 3/25/16.  Disable for the short term
@mycon
Get Temperature and Humidity working again with Yahoo's annoyingly us…
fad4e87 
…eless oauth change.

  Pressure is in there, but it looks like they've changed the reporting to mmHg (but still claim inches)... to be looked into at some point.
  I also made a handful of chanages to yosdk so it can use the old forcast api (Didn't want to rework everything for yql at the moment).
  Overall, all the changes are quick and dirty, but they seem to work.
  I tried a lot of options for just basic authentication, but didn't have much luck utill pulling in yoskd.
  It seems callbacks cause errors in the documented yahoo apis and all the examples on the site are still for public use.  A lot seems confused at the moment.
@mycon
Copy link
Author

mycon commented Aug 15, 2016

Easiest will be though git. Add my branch as a remote and then merge it to
your local version. If you don't have any changes, just rebase to a remote
branch.

git remote add mycon https://github.com/mycon/nestgraph.git
git fetch --all
git checkout -b mycon_local_master
git merge mycon/master or git rebase mycon/master

On Sun, Aug 14, 2016 at 8:41 PM, Ryan Thomas notifications@github.com
wrote:

I have a question... I'm using git@github.com:thomric2/nestgraph.git, but
want to add you addistional functionality.

What is the easiest way to do this w/o deleting everything and starting
from scratch? Should I just try to copy and paste the code you've edit?

—
You are receiving this because you authored the thread.
Reply to this email directly, view it on GitHub
#6 (comment), or mute
the thread
https://github.com/notifications/unsubscribe-auth/AAmpYuog29OYGHTJ3kvj9_rD6DyAcU95ks5qf9HrgaJpZM4JLffC
.

eklein and others added 4 commits August 22, 2016 15:59
@eklein
Update README
91fbce0 
Let me know if the yahoo app developer consumer key, secret, and application ID are necessary. If they are, I can document how I got those setup as well.
@mycon
Merge pull request #1 from eklein/patch-1
d3ca1ed 
Update README
@mycon
update yahoo api
b94f847
@mycon
update nest to new API
b860996
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.

6 participants

@mycon @thomric2 @oyarzun @visibilityspots @zeeMonkeez @eklein