Skip to content

Commit a6a170c

Browse files
vitotaivitotai
authored
Merge pull request #79 from geschwaerzler/ds2413-actuators
DS2413 actuators
2 parents 231d626 + 77139ab commit a6a170c

File tree

3 files changed

+107
-2
lines changed

3 files changed

+107
-2
lines changed

‎htmljs/src/js/script-setup.js‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,12 @@ var devices = {
99
} else if (f.h == 5) {
1010
g = window.extsensorContainer.cloneNode(true);
1111
g.querySelector("span.device-value").innerHTML = (typeof f.v === "undefined") ? "-" : f.v;
12+
} else if (f.h == 3) {
13+
g = window.owContainer.cloneNode(true);
14+
g.querySelector("span.device-address").innerHTML = f.a;
15+
g.querySelector("span.device-channel").innerHTML = f.n;
16+
g.querySelector("select.device-pintype").value = f.x;
17+
g.querySelector("span.device-value").innerHTML = (typeof f.v === "undefined") ? "-" : ((f.v) ? "active" : "inactive")
1218
} else {
1319
g = window.pinContainer.cloneNode(true);
1420
g.querySelector("select.device-pintype").value = f.x;
@@ -67,6 +73,10 @@ function cmdfrom(b) {
6773
c.p = a.p;
6874
if (c.h == 2) {
6975
c.a = a.a
76+
} else if (c.h == 3) {
77+
c.a = a.a;
78+
c.n = a.n;
79+
c.x = d.querySelector("select.device-pintype").value
7080
} else if (c.h == 1) {
7181
c.x = d.querySelector("select.device-pintype").value
7282
}
@@ -177,6 +187,7 @@ function init() {
177187
window.sensorContainer = detachNode(".device-container.sensor-device");
178188
window.pinContainer = detachNode(".device-container.pin-device");
179189
window.extsensorContainer = detachNode(".device-container.extsensor-device");
190+
window.owContainer = detachNode(".device-container.ow-device");
180191

181192
BWF.init({
182193
error: function(a) {

‎htmljs/src/setup.html‎

Lines changed: 95 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -260,7 +260,101 @@
260260
</div>
261261
</div>
262262

263-
<!-- build:include partials/footer.html -->
263+
<div class='device-container ow-device'>
264+
<table>
265+
<tr>
266+
<td ROWSPAN=2>
267+
<div class='device-title'></div>
268+
<br>
269+
<button>apply</button>
270+
</td>
271+
<td>
272+
<div class='device-setting-container'>
273+
<span class='setting-name'>Device slot</span>
274+
<select class='slot-select'>
275+
<option value='-1'>Unassigned</option>
276+
<option value='0'>0</option>
277+
<option value='1'>1</option>
278+
<option value='2'>2</option>
279+
<option value='3'>3</option>
280+
<option value='4'>4</option>
281+
<option value='5'>5</option>
282+
<option value='6'>6</option>
283+
<option value='7'>7</option>
284+
<option value='8'>8</option>
285+
<option value='9'>9</option>
286+
<option value='10'>10</option>
287+
<option value='11'>11</option>
288+
<option value='12'>12</option>
289+
<option value='13'>13</option>
290+
<option value='14'>14</option>
291+
<option value='15'>15</option>
292+
</select>
293+
</div>
294+
</td>
295+
<td>
296+
<div class='device-setting-container'>
297+
<span class='setting-name'>Hardware Type</span>
298+
<span class='setting-value device-type'>1-wire actuator</span>
299+
</div>
300+
</td>
301+
<td>
302+
<div class='device-setting-container device-address-container'>
303+
<span class='setting-name'>Address</span>
304+
<span class='setting-value device-address'></span>
305+
</div>
306+
</td>
307+
<td>
308+
<div class='device-setting-container device-channel-container'>
309+
<span class='setting-name'>Channel</span>
310+
<span class='setting-value device-channel'></span>
311+
</div>
312+
</td>
313+
</tr>
314+
<tr>
315+
<td>
316+
<div class='device-setting-container'>
317+
<span class='setting-name'>Controller PIN</span>
318+
<span class='setting-value device-pin'></span>
319+
</div>
320+
</td>
321+
<td>
322+
<div class='device-setting-container'>
323+
<span class='setting-name'>Value</span>
324+
<span class='setting-value device-value'></span>
325+
</div>
326+
</td>
327+
<td>
328+
<div class='device-setting-container'>
329+
<span class='setting-name'>Function</span>
330+
<select class='setting-value device-function'>
331+
<option value=0>None</option>
332+
<option value=1>Chamber Door</option>
333+
<option value=2>Chamber Heater</option>
334+
<option value=3>Chamber Cooler</option>
335+
<option value=4>Chamber Light</option>
336+
<option value=7>Chamber Fan</option>
337+
<option value=14>Capper</option>
338+
<option value=15>PTC Cooler</option>
339+
340+
</select>
341+
</div>
342+
</td>
343+
<td>
344+
<div class='device-setting-container device-pintype-container'>
345+
<span class='setting-name'>Pin type</span>
346+
<select class='setting-value device-pintype'>
347+
<option value=0>Not Inverted</option>
348+
<option value=1>Inverted</option>
349+
</select>
350+
</div>
351+
</td>
352+
</tr>
353+
</table>
354+
</div>
355+
</div>
356+
357+
<!-- build:include partials/footer.html -->
264358
<!-- /build -->
265359

266360
<div id="blockscreen" class="modal">

‎src/DS2413.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ class DS2413
8686
}
8787

8888
// assumes pio is either 0 or 1, which translates to masks 0x1 and 0x2
89-
uint8_t pioMask(pio_t pio) { return pio++; }
89+
uint8_t pioMask(pio_t pio) { return ++pio; }
9090

9191
/*
9292
* Reads the output state of a given channel, defaulting to a given value on error.

0 commit comments

Comments
 (0)