noisymime
/
OSPi
mirror of https://github.com/noisymime/OSPi.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
74 Commits 2 Branches 0 Tags 528 KiB
Commit Graph

74 Commits

Author SHA1 Message Date
josh@noisymime.org f484f5799a Only perform weather lookup if the values in the location field look like latitude / longitude 2013-10-21 20:53:57 +11:00
josh@noisymime.org 1e0b7aef60 Added initial location lookup and connection to openweathermap 2013-10-21 20:13:35 +11:00
Dan-in-CA 57b2f6a757 File cleanup 2013-10-16 13:13:25 -07:00
Dan-in-CA 9585087749 Merge branch 'master' into remote_master 
Conflicts:
	README.md
	ospi.py
 2013-10-16 13:01:12 -07:00
Dan-in-CA f47e1a191d Updated rev info 2013-10-16 12:45:59 -07:00
Dan-in-CA 9790d961b1 Fixed rain delay and program preview bugs. 2013-10-16 12:42:57 -07:00
Dan-in-CA c3eeda7e90 Edited .gitignore 2013-10-16 12:32:50 -07:00
Dan-in-CA ea839442e8 Merge branch 'working' 2013-10-16 12:10:58 -07:00
Dan-in-CA 2919b847f0 added water_log.csv to .gitignore 2013-10-16 12:10:40 -07:00
Dan-in-CA 41b5b83ee9 Small change to rain delay code. 2013-10-16 12:08:12 -07:00
Dan-in-CA 69508afda9 Merge branch 'working' 2013-10-15 20:49:05 -07:00
Dan-in-CA 9ecc28dc91 Program preview was broken. 2013-10-15 20:48:40 -07:00
Dan-in-CA df22b12fbf Merge branch 'working' 2013-10-15 20:25:11 -07:00
Dan-in-CA 4c9c444533 Switching manual mode on or off does not cancel rain delay. Changing 
rain delay does not cancel manual mode.
 2013-10-15 20:23:04 -07:00
Dan-in-CA 1313e633ca edited .git.ignore 2013-10-15 19:31:53 -07:00
Dan-in-CA b62f67de6d edited .git.ignore 2013-10-15 19:29:23 -07:00
Dan-in-CA 3a3e0f9697 Regenerating .project files 2013-10-15 19:11:58 -07:00
Dan-in-CA 81c7ac391e Merge branch 'working' 2013-10-15 17:15:05 -07:00
Dan-in-CA 6481ed42e5 Restoring .project files 2013-10-15 17:11:42 -07:00
Dan-in-CA 7311632ca8 Minor bug fix, code cleanup 2013-10-15 16:53:29 -07:00
Dan-in-CA eefb9fe3f6 Renamed Main Loop > Timing loop 2013-10-14 09:27:50 -07:00
Dan-in-CA 7729601260 Formatting edit 2013-10-11 13:13:13 -07:00
Dan-in-CA e651edbe6e Minor bug fix, code cleanup 2013-10-11 13:10:32 -07:00
Dan-in-CA c065f9f8d4 Fixed Home page display bug 
Fix bug line 40:80 rdst > sd['rdst']
 2013-10-10 14:58:14 -07:00
Dan-in-CA 0426396a41 File cleanup 2013-10-10 14:37:54 -07:00
Dan-in-CA 731c5aee00 Fixed Satation change bug. 
Fixed a bug that caused an error when a master station was enabled and
station names or options were changed.
 2013-10-10 13:48:50 -07:00
Dan-in-CA 8e1aa8afe0 To make branch change 2013-10-09 15:11:37 -07:00
Dan-in-CA 3ee9a72695 Minor changes to sd_reference.txt 2013-10-08 18:37:23 -07:00
Dan-in-CA cf6ff530cb Minor bug fixes 2013-10-08 18:05:58 -07:00
Dan-in-CA 454d15c807 Fixed sd update bug 2013-10-08 17:43:43 -07:00
Dan-in-CA 8cb4badc6b ready to do checkout 2013-10-05 10:28:27 -07:00
Dan-in-CA c6a9c983e7 Adding options.txt to included files 2013-10-05 08:08:43 -07:00
Dan-in-CA 13672547e8 Edited formatting. 2013-10-04 15:56:06 -07:00
Dan-in-CA 75a31db90c First UI improvements. 2013-10-04 14:16:31 -07:00
Dan-in-CA e8d478ee38 First of UI improvements. 2013-10-04 14:10:58 -07:00
Dan-in-CA 2643d6a12e Added checking for old options.txt format, added function to write new options.txt. 2013-10-03 14:07:00 -07:00
Dan-in-CA 2f86577398 Merged from JM_from_remote, Fixed bugs in JM initial Prototype. 2013-10-02 20:24:10 -07:00
Dan-in-CA cdb27826c9 Merge Jonathan's 'prototype' 
* JM_from_remote:
  Merged options into Dan-in-CA latest version

Conflicts:
	README.md
	ospi.py
	static/scripts/java/svc1.8.3/home.js
 2013-10-02 15:57:34 -07:00
Dan-in-CA 197502fac7 Put RasPi specific code into try, except blocks 
This changes allows the program to run unmodified on Windows, non Pi Linux and Raspberry Pi.
 2013-10-02 15:29:42 -07:00
Dan-in-CA a21db3d83d Merged multi platform code from working branch 
Conflicts:
	ospi.py
 2013-10-02 15:20:33 -07:00
Dan-in-CA 2ca0a8837c Works on multiple platforms 
Placed RasPi specific code into Try, Except bolcks. Code now runs under Windows, Non Pi Linux and on the Pi without modification.
 2013-10-02 15:08:52 -07:00
Dan-in-CA 9cab706e10 Ready to test multi platform version 2013-10-02 13:25:29 -07:00
Dan-in-CA bc17899b9e Changed RPi.GPIO Pin numbering option 2013-10-01 18:47:35 -07:00
Dan-in-CA 63bf7eee66 GPIO Pin numbering update 2013-10-01 17:45:34 -07:00
Dan-in-CA 379fedf5ab Merging GPIO numbering changes from working branch. 
Conflicts:
	ospi.py
 2013-10-01 17:42:17 -07:00
Dan-in-CA 8ba5c07a62 Ready to merge GPIO pin changes 2013-10-01 17:34:05 -07:00
Dan-in-CA 224666a078 Ready to test new GPIO pin configuration. 2013-09-30 20:49:36 -07:00
Jonathan Marsh be16ebe3e3 Merged options into Dan-in-CA latest version 
Improved options handling code: simplified passing of options, factored
out option UI details into data file, added new options for name and
station name length, and brought logging options into the main options
page.  Fixed some IE rendering issues and made tooltips a full toggle
as well.
 2013-09-28 20:19:10 -07:00
Dan-in-CA 8f25e6c56e Added branch name to docstring. 2013-09-28 14:01:21 -07:00
Dan-in-CA 6f882f1432 Testing working branch 2013-09-28 13:59:00 -07:00