Skip to content

Added support for vibration sensors #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
joymyr wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Added support for vibration sensors #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 15 additions & 0 deletions src/zigbee/conbee-to-fimp.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,6 +143,21 @@ func (cr *ConbeeToFimpRouter) mapSensorEvent(evt *conbee.ConbeeEvent) {
val = val/100
msg = fimpgo.NewFloatMessage("evt.sensor.report", "sensor_humid", val, map[string]string{"unit":"%"}, nil, nil)
adr = &fimpgo.Address{MsgType: fimpgo.MsgTypeEvt, ResourceType: fimpgo.ResourceTypeDevice, ResourceName: "conbee", ResourceAddress: cr.instanceId, ServiceName: "sensor_humid", ServiceAddress: serviceAddress}
case "vibration":
val, ok := evt.State[k].(bool)
if !ok {
log.Debug("can't parse the vibration value")
continue
}
var status string
if val {
status = "activ"
} else {
status = "deactiv"
}
valS := map[string]string{"event": "tamper_force_open", "status": status}
msg = fimpgo.NewStrMapMessage("evt.alarm.report", "alarm_burglar", valS, nil, nil, nil)
adr = &fimpgo.Address{MsgType: fimpgo.MsgTypeEvt, ResourceType: fimpgo.ResourceTypeDevice, ResourceName: "conbee", ResourceAddress: cr.instanceId, ServiceName: "alarm_burglar", ServiceAddress: serviceAddress}
}
}else if evt.ResourceType == "lights" {
serviceAddress = "l"+evt.Id+"_0"
Expand Down
38 changes: 35 additions & 3 deletions src/zigbee/net-service.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -224,6 +224,23 @@ func (ns *NetworkService) SendInclusionReport(deviceType, deviceId string) error
Version: "1",
}}

alarmInterfaces := []fimptype.Interface{{
Type: "in",
MsgType: "cmd.alarm.get_report",
ValueType: "null",
Version: "1",
}, {
Type: "in",
MsgType: "cmd.alarm.clear",
ValueType: "string",
Version: "1",
}, {
Type: "out",
MsgType: "evt.alarm.report",
ValueType: "str_map",
Version: "1",
}}

sceneInterfaces := []fimptype.Interface{{
Type: "in",
MsgType: "cmd.scene.set",
Expand Down Expand Up @@ -334,6 +351,20 @@ func (ns *NetworkService) SendInclusionReport(deviceType, deviceId string) error
Interfaces: presenceSensorInterfaces,
}

burglarService := fimptype.Service{
Name: "alarm_burglar",
Alias: "Burglar detection",
Address: "/rt:dev/rn:conbee/ad:1/sv:alarm_burglar/ad:",
Enabled: true,
Groups: []string{"ch_0"},
Props: map[string]interface{}{
"sup_events": []string{"tamper_force_open"},
},
Tags: nil,
PropSetReference: "",
Interfaces: alarmInterfaces,
}

if deviceType == "lights" {
lightDeviceDescriptor := conbee.Light{}
resp , err := ns.conbeeClient.SendConbeeRequest("GET", "lights/"+deviceId, nil, &lightDeviceDescriptor)
Expand Down Expand Up @@ -388,7 +419,10 @@ func (ns *NetworkService) SendInclusionReport(deviceType, deviceId string) error
services = append(services,contactService)
case "ZHAPresence":
presenceService.Address = presenceService.Address + serviceAddres
services = append(services,presenceService)
services = append(services, presenceService)
case "ZHAVibration":
burglarService.Address = burglarService.Address + serviceAddres
services = append(services, burglarService)
case "ZHAAlarm":
log.Debug("<net> ZHAAlarm not mapped")
case "ZHACarbonMonoxide":
Expand All @@ -403,8 +437,6 @@ func (ns *NetworkService) SendInclusionReport(deviceType, deviceId string) error
log.Debug("<net> ZHAPressure not mapped")
case "ZHAThermostat":
log.Debug("<net> ZHAThermostat not mapped")
case "ZHAVibration":
log.Debug("<net> ZHAVibration not mapped")
case "ZHAWater":
log.Debug("<net> ZHAWater not mapped")
}
Expand Down