|
|
@ -105,24 +105,24 @@ var room = { |
|
|
|
|
|
|
|
|
|
|
|
/* lightCtl reg */ |
|
|
|
/* lightCtl reg */ |
|
|
|
var lightCtl = { |
|
|
|
var lightCtl = { |
|
|
|
hall: lightCtlObj(room.hall, light.hall), |
|
|
|
//hall: lightCtlObj(room.hall, light.hall),
|
|
|
|
din: lightCtlObj(room.din, light.din), |
|
|
|
//din: lightCtlObj(room.din, light.din),
|
|
|
|
liv: lightCtlObj(room.liv, light.liv), |
|
|
|
//liv: lightCtlObj(room.liv, light.liv),
|
|
|
|
kit: lightCtlObj(room.kit, light.kit) |
|
|
|
//kit: lightCtlObj(room.kit, light.kit)
|
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/* peo mqtt */ |
|
|
|
/* peo mqtt */ |
|
|
|
var peo_mqtt = { |
|
|
|
var peo_mqtt = { |
|
|
|
hall: peo(client, room.hall), |
|
|
|
//hall: peo(client, room.hall),
|
|
|
|
din: peo(client, room.din), |
|
|
|
//din: peo(client, room.din),
|
|
|
|
liv: peo(client, room.liv), |
|
|
|
//liv: peo(client, room.liv),
|
|
|
|
kit: peo(client, room.kit) |
|
|
|
//kit: peo(client, room.kit)
|
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
/* 走廊入口 */ |
|
|
|
/* 走廊入口 */ |
|
|
|
var isolat = { |
|
|
|
var isolat = { |
|
|
|
hall: isolatObj(room.hall, light.hall, [p.hall[0], p.hall[1]], lightCtl.hall), |
|
|
|
hall: isolatObj(room.hall, light.hall, [p.hall[0], p.hall[1]], lightCtl.hall) |
|
|
|
//door: isolatObj(room.din, light.din, [p.din[0], p.livb[0]], lightCtl.din),
|
|
|
|
//door: isolatObj(room.din, light.din, [p.din[0], p.livb[0]], lightCtl.din),
|
|
|
|
|
|
|
|
|
|
|
|
} |
|
|
|
} |
|
|
|