You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@plc4x.apache.org by sr...@apache.org on 2022/09/01 10:50:54 UTC
[plc4x] 03/03: fix(plc4go/cbus): fix filtering
This is an automated email from the ASF dual-hosted git repository.
sruehl pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/plc4x.git
commit 8334e20f47c1508abf5d177898aa881bf6a0f416
Author: Sebastian Rühl <sr...@apache.org>
AuthorDate: Thu Sep 1 12:50:38 2022 +0200
fix(plc4go/cbus): fix filtering
---
plc4go/internal/cbus/Field.go | 16 ++++++++--------
plc4go/internal/cbus/FieldHandler.go | 16 ++++++++--------
plc4go/internal/cbus/Subscriber.go | 13 ++++++++-----
3 files changed, 24 insertions(+), 21 deletions(-)
diff --git a/plc4go/internal/cbus/Field.go b/plc4go/internal/cbus/Field.go
index aec98236f..84f32cb55 100644
--- a/plc4go/internal/cbus/Field.go
+++ b/plc4go/internal/cbus/Field.go
@@ -137,10 +137,10 @@ func NewSALField(application readWriteModel.ApplicationIdContainer, salCommand s
type SALMonitorField interface {
model.PlcField
GetUnitAddress() readWriteModel.UnitAddress
- GetApplication() readWriteModel.ApplicationIdContainer
+ GetApplication() *readWriteModel.ApplicationIdContainer
}
-func NewSALMonitorField(unitAddress readWriteModel.UnitAddress, application readWriteModel.ApplicationIdContainer, numElements uint16) SALMonitorField {
+func NewSALMonitorField(unitAddress readWriteModel.UnitAddress, application *readWriteModel.ApplicationIdContainer, numElements uint16) SALMonitorField {
return &salMonitorField{
fieldType: SAL_MONITOR,
unitAddress: unitAddress,
@@ -154,10 +154,10 @@ type MMIMonitorField interface {
model.PlcField
CalField
GetUnitAddress() readWriteModel.UnitAddress
- GetApplication() readWriteModel.ApplicationIdContainer
+ GetApplication() *readWriteModel.ApplicationIdContainer
}
-func NewMMIMonitorField(unitAddress readWriteModel.UnitAddress, application readWriteModel.ApplicationIdContainer, numElements uint16) SALMonitorField {
+func NewMMIMonitorField(unitAddress readWriteModel.UnitAddress, application *readWriteModel.ApplicationIdContainer, numElements uint16) SALMonitorField {
return &mmiMonitorField{
fieldType: MMI_STATUS_MONITOR,
unitAddress: unitAddress,
@@ -232,14 +232,14 @@ type salField struct {
type salMonitorField struct {
fieldType FieldType
unitAddress readWriteModel.UnitAddress
- application readWriteModel.ApplicationIdContainer
+ application *readWriteModel.ApplicationIdContainer
numElements uint16
}
type mmiMonitorField struct {
fieldType FieldType
unitAddress readWriteModel.UnitAddress
- application readWriteModel.ApplicationIdContainer
+ application *readWriteModel.ApplicationIdContainer
numElements uint16
}
@@ -531,7 +531,7 @@ func (s salMonitorField) GetUnitAddress() readWriteModel.UnitAddress {
return s.unitAddress
}
-func (s salMonitorField) GetApplication() readWriteModel.ApplicationIdContainer {
+func (s salMonitorField) GetApplication() *readWriteModel.ApplicationIdContainer {
return s.application
}
@@ -581,7 +581,7 @@ func (m mmiMonitorField) GetUnitAddress() readWriteModel.UnitAddress {
return m.unitAddress
}
-func (m mmiMonitorField) GetApplication() readWriteModel.ApplicationIdContainer {
+func (m mmiMonitorField) GetApplication() *readWriteModel.ApplicationIdContainer {
return m.application
}
diff --git a/plc4go/internal/cbus/FieldHandler.go b/plc4go/internal/cbus/FieldHandler.go
index f6fceb055..07c65d5d2 100644
--- a/plc4go/internal/cbus/FieldHandler.go
+++ b/plc4go/internal/cbus/FieldHandler.go
@@ -327,17 +327,17 @@ func (m FieldHandler) handleSALMonitorPattern(match map[string]string) (model.Pl
}
}
- var application readWriteModel.ApplicationIdContainer
+ var application *readWriteModel.ApplicationIdContainer
{
applicationIdArgument := match["application"]
if applicationIdArgument == "*" {
- application = readWriteModel.ApplicationIdContainer_RESERVED_FF
+ application = nil
} else {
- var err error
- application, err = applicationIdFromArgument(applicationIdArgument)
+ applicationId, err := applicationIdFromArgument(applicationIdArgument)
if err != nil {
return nil, errors.Wrap(err, "Error getting application id from argument")
}
+ application = &applicationId
}
}
@@ -368,17 +368,17 @@ func (m FieldHandler) handleMMIMonitorPattern(match map[string]string) (model.Pl
}
}
- var application readWriteModel.ApplicationIdContainer
+ var application *readWriteModel.ApplicationIdContainer
{
applicationIdArgument := match["application"]
if applicationIdArgument == "*" {
- application = readWriteModel.ApplicationIdContainer_RESERVED_FF
+ application = nil
} else {
- var err error
- application, err = applicationIdFromArgument(applicationIdArgument)
+ applicationId, err := applicationIdFromArgument(applicationIdArgument)
if err != nil {
return nil, errors.Wrap(err, "Error getting application id from argument")
}
+ application = &applicationId
}
}
diff --git a/plc4go/internal/cbus/Subscriber.go b/plc4go/internal/cbus/Subscriber.go
index c995aa08e..16774ba95 100644
--- a/plc4go/internal/cbus/Subscriber.go
+++ b/plc4go/internal/cbus/Subscriber.go
@@ -118,9 +118,6 @@ func (m *Subscriber) handleMonitoredMMI(calReply readWriteModel.CALReply) bool {
continue
}
}
- application := field.GetApplication()
- // TODO: filter in unit address
- _ = application
subscriptionType := subscriptionRequest.GetType(fieldName)
// TODO: handle subscriptionType
@@ -191,6 +188,12 @@ func (m *Subscriber) handleMonitoredMMI(calReply readWriteModel.CALReply) bool {
default:
return false
}
+ if application := field.GetApplication(); application != nil {
+ if actualApplicationIdString := application.ApplicationId().String(); applicationString != actualApplicationIdString {
+ log.Debug().Msgf("Current application id %s doesn't match actual id %s", unitAddressString, actualApplicationIdString)
+ continue
+ }
+ }
statusType := "binary"
if isLevel {
statusType = fmt.Sprintf("level=0x%X", blockStart)
@@ -262,9 +265,9 @@ func (m *Subscriber) handleMonitoredSal(sal readWriteModel.MonitoredSAL) bool {
}
}
- if application := field.GetApplication(); application != readWriteModel.ApplicationIdContainer_RESERVED_FF {
+ if application := field.GetApplication(); application != nil {
if actualApplicationIdString := application.ApplicationId().String(); applicationString != actualApplicationIdString {
- log.Debug().Msgf("Current application id %s doesn't matchactual id %s", unitAddressString, actualApplicationIdString)
+ log.Debug().Msgf("Current application id %s doesn't match actual id %s", unitAddressString, actualApplicationIdString)
continue
}
}