16mm
/
intval3
1
0
Fork 0
Code Issues 1 Pull Requests 9 Projects Releases Wiki Activity

Sequence feature for bluetooth control does NOT need to be split (yet) into start and stop. intval.mobile.js was using the incorrect callback on the sequence characteristic and should be tested before changes are made.

This commit is contained in:
mmcwilliams 2018-02-07 18:38:19 -05:00
parent eae8e50cf8
commit 42580c46b9
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app/www/static/js/intval.mobile.js
View File

@ -279,16 +279,19 @@ mobile.sequence = function () {
const opts = { const opts = {
type : 'sequence' type : 'sequence'
}; };
const elem = document.getElementById('seq');
if (!mobile.ble.connected) { if (!mobile.ble.connected) {
return alert('Not connected to an INTVAL device.'); return alert('Not connected to an INTVAL3 device.');
} }
ble.write(mobile.ble.device.id, ble.write(mobile.ble.device.id,
mobile.ble.SERVICE_ID, mobile.ble.SERVICE_ID,
mobile.ble.CHAR_ID, mobile.ble.CHAR_ID,
stringToBytes(JSON.stringify(opts)), //check length? stringToBytes(JSON.stringify(opts)), //check length?
mobile.frameSuccess, mobile.sequenceSuccess,
mobile.ble.onError); mobile.ble.onError);
document.getElementById('seq').classList.add('focus'); if (!elem.classList.contains('focus')) {
elem.classList.add('focus');
}
mobile.ble.active = true; mobile.ble.active = true;
}; };
@ -306,6 +309,7 @@ mobile.sequenceSuccess = function () {
}, 20); }, 20);
}; };
//retreive object with list of available Wifi APs, //retreive object with list of available Wifi APs,
//and state of current connection, if available //and state of current connection, if available
mobile.getWifi = function () { mobile.getWifi = function () {

2
index.js
View File

@ -37,6 +37,7 @@ function createServer () {
app.post('/frame', rFrame) app.post('/frame', rFrame)
app.get( '/sequence', rSequence) app.get( '/sequence', rSequence)
app.post('/sequence', rSequence) app.post('/sequence', rSequence)
app.post('/reset', rReset) app.post('/reset', rReset)
app.get( '/status', rStatus) app.get( '/status', rStatus)
app.listen(PORT, () => { app.listen(PORT, () => {
@ -54,7 +55,6 @@ function createBLE () {
ble.on('delay', bDelay) ble.on('delay', bDelay)
ble.on('counter', bCounter) ble.on('counter', bCounter)
ble.on('sequence', bSequence) ble.on('sequence', bSequence)
ble.on('stop', bSequenceStop)
ble.on('reset', bReset) ble.on('reset', bReset)
} }