Skip to content

Commit 51cc4f9

Browse files
elcojacobselcojacobs
committed
3 logging sensors instead of room temp
1 parent 1e07787 commit 51cc4f9

File tree

5 files changed

+75
-18
lines changed

5 files changed

+75
-18
lines changed

‎beer-panel.php

100644100755
+18-6
Original file line numberDiff line numberDiff line change
@@ -79,12 +79,24 @@
7979
<div class="beer-chart-legend-value">--</div>
8080
<br class="crystal" />
8181
</div>
82-
<div class="beer-chart-legend-row roomTemp">
83-
<div class="toggle roomTemp" onClick="toggleLine(this)"></div>
84-
<div class="beer-chart-legend-label" onClick="toggleLine(this)">Room Temp</div>
85-
<div class="beer-chart-legend-value">--</div>
86-
<br class="crystal" />
87-
</div>
82+
<div class="beer-chart-legend-row log1Temp">
83+
<div class="toggle log1Temp" onClick="toggleLine(this)"></div>
84+
<div class="beer-chart-legend-label" onClick="toggleLine(this)">Log1 Temp</div>
85+
<div class="beer-chart-legend-value">--</div>
86+
<br class="crystal" />
87+
</div>
88+
<div class="beer-chart-legend-row log2Temp">
89+
<div class="toggle log2Temp" onClick="toggleLine(this)"></div>
90+
<div class="beer-chart-legend-label" onClick="toggleLine(this)">Log2 Temp</div>
91+
<div class="beer-chart-legend-value">--</div>
92+
<br class="crystal" />
93+
</div>
94+
<div class="beer-chart-legend-row log3Temp">
95+
<div class="toggle log3Temp" onClick="toggleLine(this)"></div>
96+
<div class="beer-chart-legend-label" onClick="toggleLine(this)">Log3 Temp</div>
97+
<div class="beer-chart-legend-value">--</div>
98+
<br class="crystal" />
99+
</div>
88100
<div class="beer-chart-legend-row state">
89101
<div class="state-indicator"></div>
90102
<div class="beer-chart-legend-label"></div>

‎css/dygraph.css

100644100755
+16-2
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,13 @@ BR.crystal { clear:both; }
5454
.beer-chart-legend-row.fridgeSet{
5555
color:rgba(255, 161, 76, 1);
5656
}
57-
.beer-chart-legend-row.roomTemp{
57+
.beer-chart-legend-row.log1Temp{
58+
color:rgba(170, 170, 170, 1);
59+
}
60+
.beer-chart-legend-row.log2Temp{
61+
color:rgba(170, 170, 170, 1);
62+
}
63+
.beer-chart-legend-row.log3Temp{
5864
color:rgba(170, 170, 170, 1);
5965
}
6066
.beer-chart-legend-row.annotation .beer-chart-legend-label { padding:2px 5px 0 5px; }
@@ -89,7 +95,15 @@ BR.crystal { clear:both; }
8995
background-color:rgba(255, 161, 76, 0.5);
9096
border:1px solid rgba(255, 161, 76, 1);
9197
}
92-
.beer-chart-legend-row .toggle.roomTemp{
98+
.beer-chart-legend-row .toggle.log1Temp{
99+
background-color:rgba(170, 170, 170, 0.5);
100+
border:1px solid rgba(170, 170, 170, 1);
101+
}
102+
.beer-chart-legend-row .toggle.log2Temp{
103+
background-color:rgba(170, 170, 170, 0.5);
104+
border:1px solid rgba(170, 170, 170, 1);
105+
}
106+
.beer-chart-legend-row .toggle.log3Temp{
93107
background-color:rgba(170, 170, 170, 0.5);
94108
border:1px solid rgba(170, 170, 170, 1);
95109
}

‎js/beer-chart.js

100644100755
+18-3
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,21 @@ var lineNames = {
3737
beerSet: 'Beer setting',
3838
fridgeTemp: 'Fridge temperature',
3939
fridgeSet: 'Fridge setting',
40-
roomTemp: 'Room temp.'};
40+
log1Temp: 'Log1 temperature',
41+
log2Temp: 'Log2 temperature',
42+
log3Temp: 'Log3 temperature',
43+
};
44+
var chartColors = [
45+
'rgb(41,170,41)',
46+
'rgb(240, 100, 100)',
47+
'rgb(89, 184, 255)',
48+
'rgb(255, 161, 76)',
49+
'#AAAAAA',
50+
'#AAAAAA',
51+
'#AAAAAA',
52+
'rgb(153,0,153)'
53+
];
54+
4155
var legendStorageKeyPrefix = "legendLine_";
4256

4357
var TIME_COLUMN = 0; // time is the first column of data
@@ -281,7 +295,6 @@ function paintBackgroundImpl(canvas, area, g) {
281295
}
282296
}
283297

284-
var chartColors = [ 'rgb(41,170,41)', 'rgb(240, 100, 100)', 'rgb(89, 184, 255)', 'rgb(255, 161, 76)', '#AAAAAA', 'rgb(153,0,153)' ];
285298
function formatForChartLegend(v) {
286299
"use strict";
287300
var val = parseFloat(v);
@@ -298,7 +311,9 @@ function showChartLegend(e, x, pts, row, g) {
298311
$('#curr-beer-chart-legend .beer-chart-legend-row.beerSet .beer-chart-legend-value').text( formatForChartLegend(currentDataSet.getValue(row, 2)) );
299312
$('#curr-beer-chart-legend .beer-chart-legend-row.fridgeTemp .beer-chart-legend-value').text( formatForChartLegend(currentDataSet.getValue(row, 3)) );
300313
$('#curr-beer-chart-legend .beer-chart-legend-row.fridgeSet .beer-chart-legend-value').text( formatForChartLegend(currentDataSet.getValue(row, 4)) );
301-
$('#curr-beer-chart-legend .beer-chart-legend-row.roomTemp .beer-chart-legend-value').text( formatForChartLegend(currentDataSet.getValue(row, 5)) );
314+
$('#curr-beer-chart-legend .beer-chart-legend-row.log1Temp .beer-chart-legend-value').text( formatForChartLegend(currentDataSet.getValue(row, 5)) );
315+
$('#curr-beer-chart-legend .beer-chart-legend-row.log2Temp .beer-chart-legend-value').text( formatForChartLegend(currentDataSet.getValue(row, 6)) );
316+
$('#curr-beer-chart-legend .beer-chart-legend-row.log3Temp .beer-chart-legend-value').text( formatForChartLegend(currentDataSet.getValue(row, 7)) );
302317
var state = parseInt(currentDataSet.getValue(row, STATE_COLUMN));
303318
if ( !isNaN(state) ) {
304319
$('#curr-beer-chart-legend .beer-chart-legend-row.state .beer-chart-legend-label').text(STATES[state].text);

‎js/device-config.js

100644100755
+8-4
Original file line numberDiff line numberDiff line change
@@ -362,7 +362,7 @@ function pinTypeToFunctionList(pinType, hwType){
362362
break;
363363
case 'onewire':
364364
if (hwType==2)
365-
functionList = [5, 6, 9];
365+
functionList = [5, 6, 9, 17, 18];
366366
else if (hwType == 3)
367367
functionList = actFunctions; // ds2413 actuator
368368
else if (hwType==4)
@@ -394,8 +394,10 @@ function functionToPinTypes(functionType){
394394
pinTypes = ['free', 'door', 'act'];
395395
break;
396396
case 5: // chamber temp
397-
case 6: // room temp
397+
case 6: // log1 temp
398398
case 9: // beer temp
399+
case 17: // log2 temp
400+
case 18: // log3 temp
399401
pinTypes = ['onewire'];
400402
break;
401403

@@ -416,16 +418,18 @@ function getDeviceFunctionList(){
416418
{val : 3, text: 'Chamber Cooler'},
417419
{val : 4, text: 'Chamber Light'},
418420
{val : 5, text: 'Chamber Temp'},
419-
{val : 6, text: 'Room Temp'},
421+
{val : 6, text: 'Log1 Temp'},
420422
{val : 7, text: 'Chamber Fan'},
421423
{val : 8, text: 'Manual Actuator'},
422-
{val : 9, text: 'Beer Temp'}/*,
424+
{val : 9, text: 'Beer Temp'}, /*,
423425
{val : 10, text: 'Beer Temperature 2'},
424426
{val : 11, text: 'Beer Heater'},
425427
{val : 12, text: 'Beer Cooler'},
426428
{val : 13, text: 'Beer S.G.'},
427429
{val : 14, text: 'Beer Reserved 1'},
428430
{val : 15, text: 'Beer Reserved 2'} */
431+
{val : 17, text: 'Log2 Temp'},
432+
{val : 18, text: 'Log3 Temp'}
429433
];
430434
}
431435

‎previous_beers.php

100644100755
+15-3
Original file line numberDiff line numberDiff line change
@@ -78,9 +78,21 @@
7878
<div class="beer-chart-legend-value">--</div>
7979
<br class="crystal" />
8080
</div>
81-
<div class="beer-chart-legend-row roomTemp">
82-
<div class="toggle roomTemp" onClick="toggleLine(this)"></div>
83-
<div class="beer-chart-legend-label" onClick="toggleLine(this)">Room Temp</div>
81+
<div class="beer-chart-legend-row log1Temp">
82+
<div class="toggle log1Temp" onClick="toggleLine(this)"></div>
83+
<div class="beer-chart-legend-label" onClick="toggleLine(this)">Log1 Temp</div>
84+
<div class="beer-chart-legend-value">--</div>
85+
<br class="crystal" />
86+
</div>
87+
<div class="beer-chart-legend-row log2Temp">
88+
<div class="toggle log2Temp" onClick="toggleLine(this)"></div>
89+
<div class="beer-chart-legend-label" onClick="toggleLine(this)">Log2 Temp</div>
90+
<div class="beer-chart-legend-value">--</div>
91+
<br class="crystal" />
92+
</div>
93+
<div class="beer-chart-legend-row log3Temp">
94+
<div class="toggle log3Temp" onClick="toggleLine(this)"></div>
95+
<div class="beer-chart-legend-label" onClick="toggleLine(this)">Log3 Temp</div>
8496
<div class="beer-chart-legend-value">--</div>
8597
<br class="crystal" />
8698
</div>

0 commit comments

Comments
 (0)