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

fixed missing "s" in datacodes #33

Merged
merged 13 commits into from
Jun 26, 2017
Merged

fixed missing "s" in datacodes #33

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
0e97bc3
fixed missing "s" in datacodes
rexometer Jun 19, 2017
8bc77e6
fixed missing "s" in datacodes
rexometer Jun 19, 2017
161c9cf
fixed missing "s" in datacodes
rexometer Jun 19, 2017
286b200
fixed missing "s" in datacodes
rexometer Jun 19, 2017
5b59a03
fixed missing "s" in datacodes
rexometer Jun 19, 2017
9cc5d3c
Fixed missing "s" in datacodes
rexometer Jun 19, 2017
dfae664
add current and powerFactor
rexometer Jun 22, 2017
cbf2980
add current and powerFactor to 3phase
rexometer Jun 22, 2017
7a69063
revert sending current and powerFactor
rexometer Jun 26, 2017
6d035ba
Revert "revert sending current and powerFactor"
simsasaile Jun 26, 2017
7968549
Revert "add current and powerFactor to 3phase"
simsasaile Jun 26, 2017
8942e75
Revert "add current and powerFactor"
simsasaile Jun 26, 2017
d291ea1
add Node 12, 13, 14
rexometer Jun 26, 2017
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
26 changes: 25 additions & 1 deletion conf/emonhub.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,31 @@ loglevel = DEBUG #(default:WARNING)
nodename = 3phase
[[[rx]]]
names = powerL1, powerL2, powerL3, power4, Vrms, temp1, temp2, temp3, temp4, temp5, temp6, pulse
datacode = h,h,h,h,h,h,h,h,h,h,h,L
datacodes = h,h,h,h,h,h,h,h,h,h,h,L
scales = 1,1,1,1,0.01,0.1,0.1,0.1,0.1,0.1,0.1,1
units =W,W,W,W,V,C,C,C,C,C,C,p

[[12]]
nodename = 3phase2
[[[rx]]]
names = powerL1, powerL2, powerL3, power4, Vrms, temp1, temp2, temp3, temp4, temp5, temp6, pulse
datacodes = h,h,h,h,h,h,h,h,h,h,h,L
scales = 1,1,1,1,0.01,0.1,0.1,0.1,0.1,0.1,0.1,1
units =W,W,W,W,V,C,C,C,C,C,C,p

[[13]]
nodename = 3phase3
[[[rx]]]
names = powerL1, powerL2, powerL3, power4, Vrms, temp1, temp2, temp3, temp4, temp5, temp6, pulse
datacodes = h,h,h,h,h,h,h,h,h,h,h,L
scales = 1,1,1,1,0.01,0.1,0.1,0.1,0.1,0.1,0.1,1
units =W,W,W,W,V,C,C,C,C,C,C,p

[[14]]
nodename = 3phase4
[[[rx]]]
names = powerL1, powerL2, powerL3, power4, Vrms, temp1, temp2, temp3, temp4, temp5, temp6, pulse
datacodes = h,h,h,h,h,h,h,h,h,h,h,L
scales = 1,1,1,1,0.01,0.1,0.1,0.1,0.1,0.1,0.1,1
units =W,W,W,W,V,C,C,C,C,C,C,p

Expand Down
2 changes: 1 addition & 1 deletion conf/emonpi.default.emonhub.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ loglevel = DEBUG
nodename = 3phase
[[[rx]]]
names = powerL1, powerL2, powerL3, power4, Vrms, temp1, temp2, temp3, temp4, temp5, temp6, pulse
datacode = h,h,h,h,h,h,h,h,h,h,h,L
datacodes = h,h,h,h,h,h,h,h,h,h,h,L
scales = 1,1,1,1,0.01,0.1,0.1,0.1,0.1,0.1,0.1,1
units =W,W,W,W,V,C,C,C,C,C,C,p

Expand Down
2 changes: 1 addition & 1 deletion conf/nodes/11
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@
nodename = 3phase
[[[rx]]]
names = powerL1, powerL2, powerL3, power4, Vrms, temp1, temp2, temp3, temp4, temp5, temp6, pulse
datacode = h,h,h,h,h,h,h,h,h,h,h,L
datacodes = h,h,h,h,h,h,h,h,h,h,h,L
scales = 1,1,1,1,0.01,0.1,0.1,0.1,0.1,0.1,0.1,1
units =W,W,W,W,V,C,C,C,C,C,C,p
2 changes: 1 addition & 1 deletion conf/nodes/12
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@
nodename = 3phase2
[[[rx]]]
names = powerL1, powerL2, powerL3, power4, Vrms, temp1, temp2, temp3, temp4, temp5, temp6, pulse
datacode = h,h,h,h,h,h,h,h,h,h,h,L
datacodes = h,h,h,h,h,h,h,h,h,h,h,L
scales = 1,1,1,1,0.01,0.1,0.1,0.1,0.1,0.1,0.1,1
units =W,W,W,W,V,C,C,C,C,C,C,p
4 changes: 2 additions & 2 deletions conf/nodes/13
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@
nodename = 3phase3
[[[rx]]]
names = powerL1, powerL2, powerL3, power4, Vrms, temp1, temp2, temp3, temp4, temp5, temp6, pulse
datacode = h,h,h,h,h,h,h,h,h,h,h,L
datacodes = h,h,h,h,h,h,h,h,h,h,h,L
scales = 1,1,1,1,0.01,0.1,0.1,0.1,0.1,0.1,0.1,1
units =W,W,W,W,V,C,C,C,C,C,C,p
units = W,W,W,W,V,C,C,C,C,C,C,p
4 changes: 2 additions & 2 deletions conf/nodes/14
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@
nodename = 3phase4
[[[rx]]]
names = powerL1, powerL2, powerL3, power4, Vrms, temp1, temp2, temp3, temp4, temp5, temp6, pulse
datacode = h,h,h,h,h,h,h,h,h,h,h,L
datacodes = h,h,h,h,h,h,h,h,h,h,h,L
scales = 1,1,1,1,0.01,0.1,0.1,0.1,0.1,0.1,0.1,1
units =W,W,W,W,V,C,C,C,C,C,C,p
units = W,W,W,W,V,C,C,C,C,C,C,p