A few fixes
This commit is contained in:
1 parent
1fe46061e0
commit
e6aab4229d
2 files changed
+10
-7
No files matched your search
+1
-1
@@ -196,7 +196,7 @@ applyPresets = (currentRequest) ->
|
|||||||
|
|
||||||
for k, v of parameters
|
for k, v of parameters
|
||||||
unpacked = device.unpack(currentRequest.sessionData.deviceData, v)
|
unpacked = device.unpack(currentRequest.sessionData.deviceData, v)
|
||||||
if unpacked[0] and (vv = deviceData.values.value.get(unpacked[0]))?
|
if unpacked[0] and (vv = currentRequest.sessionData.deviceData.values.value.get(unpacked[0]))?
|
||||||
parameters[k] = vv[0]
|
parameters[k] = vv[0]
|
||||||
|
|
||||||
if whiteList?
|
if whiteList?
|
||||||
|
|||||||
+9
-6
@@ -687,10 +687,10 @@ processDeclaration = (sessionData, path, _timestamps, values) ->
|
|||||||
|
|
||||||
if values?.value?
|
if values?.value?
|
||||||
if isObject == 0 and isWritable == 1
|
if isObject == 0 and isWritable == 1
|
||||||
cur = setValues.setValues.get(sub)
|
cur = syncState.setValues.get(sub)
|
||||||
if not cur?
|
if not cur?
|
||||||
cur = [deviceData.values.value.get(sub), values.value]
|
cur = [deviceData.values.value.get(sub), values.value]
|
||||||
setValues.setValues.set(sub, cur)
|
syncState.setValues.set(sub, cur)
|
||||||
else
|
else
|
||||||
cur[1] = values.value
|
cur[1] = values.value
|
||||||
else
|
else
|
||||||
@@ -988,10 +988,13 @@ rpcResponse = (sessionData, id, rpcRes, callback) ->
|
|||||||
parameterList.push(
|
parameterList.push(
|
||||||
[p[0]].concat(device.sanitizeParameterValue([rpcReq.instanceValues[p[0]], p[2]])))
|
[p[0]].concat(device.sanitizeParameterValue([rpcReq.instanceValues[p[0]], p[2]])))
|
||||||
|
|
||||||
sessionData.rpcRequest = {
|
if not parameterList.length
|
||||||
type: 'SetParameterValues'
|
sessionData.rpcRequest = null
|
||||||
parameterList: parameterList
|
else
|
||||||
}
|
sessionData.rpcRequest = {
|
||||||
|
type: 'SetParameterValues'
|
||||||
|
parameterList: parameterList
|
||||||
|
}
|
||||||
|
|
||||||
timestamp = sessionData.timestamp
|
timestamp = sessionData.timestamp
|
||||||
revision = sessionData.revisions.reduce(((a, b) -> a + (b >> 1)), 0) + 1
|
revision = sessionData.revisions.reduce(((a, b) -> a + (b >> 1)), 0) + 1
|
||||||
|
|||||||
Reference in new issue
Block a user