"Set point" display option on the daily graph and chart

ThermoMan / Thermostat-Tracking

Code to track and chart data from the 3M-50 WiFi enabled thermostat

8 stars 10 forks source link

"Set point" display option on the daily graph and chart #22

Closed Lerrissirrel closed 11 years ago

Lerrissirrel commented 11 years ago

These changes add the option of a "set point" temperature line on the daily graph and adds a third column for it to the lower right hand chart on the daily graph.

ThermoMan commented 11 years ago

Rats, GitHub is telling me this ....

We can’t automatically merge this pull request. Use the command line to resolve conflicts before continuing.

Fingers crossed..

Drat, even the command line version gave me errors. But the Windows GUI client for Git says that some changes were made. I'll push those back up and see what happens.

ThermoMan commented 11 years ago

No idea why it could not do this automatically. It placed comments in the source file showing the code before and after the changes. So I removed the Git comments and commented out the old code and presto, it works.

Looks like a champ! Again, thanks for the contribution!!