From cabf0e4e9d0534e1f1f0f4ca07248c709aee7682 Mon Sep 17 00:00:00 2001 From: MaMe82 Date: Sat, 13 Oct 2018 02:23:10 +0200 Subject: [PATCH] Bugfixes --- common_web/EventConst.go | 4 ++-- web_client/jsDataTriggerAction.go | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/common_web/EventConst.go b/common_web/EventConst.go index ee76a56..5bac8de 100644 --- a/common_web/EventConst.go +++ b/common_web/EventConst.go @@ -3,8 +3,8 @@ package common_web const ( EVT_ANY = int64(0) EVT_LOG = int64(1) - EVT_HID = int64(2) - EVT_TRIGGER = int64(2) + EVT_HID = int64(3) + EVT_TRIGGER = int64(4) ) type EvtTriggerType int64 diff --git a/web_client/jsDataTriggerAction.go b/web_client/jsDataTriggerAction.go index 258e250..d331e83 100644 --- a/web_client/jsDataTriggerAction.go +++ b/web_client/jsDataTriggerAction.go @@ -129,7 +129,7 @@ func (dst *jsTriggerAction) fromGo(src *pb.TriggerAction) { switch srcTrigger := src.Trigger.(type) { case *pb.TriggerAction_SshLogin: dst.ChangeTriggerType(TriggerSshLogin) - dstTrigger := &jsTriggerSSHLogin{Object: dst.ActionData} + dstTrigger := &jsTriggerSSHLogin{Object: dst.TriggerData} dstTrigger.LoginUser = srcTrigger.SshLogin.LoginUser case *pb.TriggerAction_DhcpLeaseGranted: dst.ChangeTriggerType(TriggerDhcpLeaseGranted) @@ -145,18 +145,18 @@ func (dst *jsTriggerAction) fromGo(src *pb.TriggerAction) { dst.ChangeTriggerType(TriggerServiceStarted) case *pb.TriggerAction_GpioIn: dst.ChangeTriggerType(TriggerGPIOIn) - dstTrigger := &jsTriggerGPIOIn{Object: dst.ActionData} + dstTrigger := &jsTriggerGPIOIn{Object: dst.TriggerData} dstTrigger.GpioNum = GPIONum(srcTrigger.GpioIn.GpioNum) dstTrigger.Edge = GPIOInEdge(srcTrigger.GpioIn.GpioInEdge) dstTrigger.PullUpDown = GPIOInPullUpDown(srcTrigger.GpioIn.PullUpDown) case *pb.TriggerAction_GroupReceive: dst.ChangeTriggerType(TriggerGroupReceive) - dstTrigger := &jsTriggerGroupReceive{Object: dst.ActionData} + dstTrigger := &jsTriggerGroupReceive{Object: dst.TriggerData} dstTrigger.GroupName = srcTrigger.GroupReceive.GroupName dstTrigger.Value = srcTrigger.GroupReceive.Value case *pb.TriggerAction_GroupReceiveSequence: dst.ChangeTriggerType(TriggerGroupReceiveSequence) - dstTrigger := &jsTriggerGroupReceiveSequence{Object: dst.ActionData} + dstTrigger := &jsTriggerGroupReceiveSequence{Object: dst.TriggerData} dstTrigger.GroupName = srcTrigger.GroupReceiveSequence.GroupName dstTrigger.ValueSequence = srcTrigger.GroupReceiveSequence.Values default: