Skip to content
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

Owfs update #204

Merged
merged 20 commits into from
Jun 15, 2013
Merged

Owfs update #204

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
f4d6ba5
Merge branch 'pocketsphinx_update2'
jduda Feb 27, 2013
7e06689
Merge branch 'pocketsphinx_update2'
jduda Feb 27, 2013
de4a94d
Merge remote-tracking branch 'upstream/master'
jduda Apr 21, 2013
55605c2
Reset the crash_cnt state variable when selecting the reset language …
jduda May 25, 2013
9f37b53
Avoid a divide by zero error by first checking for zero humidity.
jduda May 25, 2013
01ac6fe
Merge remote-tracking branch 'upstream/master'
jduda May 25, 2013
7aaca14
Major overhaul of this module.
jduda May 25, 2013
219fad0
Merge branch 'master' into owfs_update
jduda May 25, 2013
c18700c
Merge branch 'master' into weather_update
jduda May 25, 2013
515a60f
Merge branch 'master' into pocketsphinx
jduda May 25, 2013
d272316
Merge remote-tracking branch 'upstream/master'
jduda May 25, 2013
4784b81
Merge branch 'master' into owfs_update
jduda May 25, 2013
940f234
Merge branch 'weather_update'
jduda May 25, 2013
ac388bf
Merge branch 'pocketsphinx'
jduda May 25, 2013
b5e8bde
Merge branch 'master' into owfs_update
jduda May 25, 2013
4451c90
Correct a bug involving tracking the state of a latch.
jduda May 25, 2013
e77d710
Merge branch 'master' into owfs_update
jduda May 25, 2013
0b9ea00
Restore files to original master.
jduda May 25, 2013
3ae95a2
I don't know.
jduda Jun 2, 2013
c7b08a8
Oops, the last commit had git merge stuff. This is the proper changes.
jduda Jun 2, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion bin/mh.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2115,8 +2115,14 @@ xbmc_notify_address=
@ Web port of your XBMC installation (Defaults to 8080 if unset)
xbmc_notify_port=8080

@ Host of your One Wire File System owserver
owfs_host=localhost

@ Port of your One Wire File System owserver
owfs_port=4304

@ Unit of measure for owserver ( C, [F], K, R)
owfs_uom_temp = F

# ******************************************************************************
#
Expand Down Expand Up @@ -2444,4 +2450,5 @@ xbmc_notify_port=8080
# Revision 1.2 1998/08/29 20:45:35 winter
# - add net parms. add cm11_serial parm.
#
#

#
Loading