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 2023/02/15 16:43:39 UTC
[plc4x] branch develop updated (34ac8a1342 -> 488b457cdc)
This is an automated email from the ASF dual-hosted git repository.
sruehl pushed a change to branch develop
in repository https://gitbox.apache.org/repos/asf/plc4x.git
from 34ac8a1342 feat(plc4go/spi): added DiffHex and hex highlighting
new 5ce69b511f feat(bacnet): vendor update
new 488b457cdc fix(bacnet): replace the dummy tag number so deep equals doesn't crap out
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../model/BACnetUnconfirmedServiceRequestIAm.go | 2 +-
.../bacnetip/readwrite/model/BACnetVendorId.go | 78 +++++++++++++---------
.../BACnetUnconfirmedServiceRequestIAm.java | 2 +-
.../java/bacnetip/readwrite/BACnetVendorId.java | 11 +--
.../resources/protocols/bacnetip/bacnetip.mspec | 2 +-
5 files changed, 57 insertions(+), 38 deletions(-)
[plc4x] 02/02: fix(bacnet): replace the dummy tag number so deep equals doesn't crap out
Posted by sr...@apache.org.
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 488b457cdc5eb3aa812688d242dae1d43c411739
Author: Sebastian Rühl <sr...@apache.org>
AuthorDate: Wed Feb 15 17:43:29 2023 +0100
fix(bacnet): replace the dummy tag number so deep equals doesn't crap out
---
.../bacnetip/readwrite/model/BACnetUnconfirmedServiceRequestIAm.go | 2 +-
.../java/bacnetip/readwrite/BACnetUnconfirmedServiceRequestIAm.java | 2 +-
protocols/bacnetip/src/main/resources/protocols/bacnetip/bacnetip.mspec | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetUnconfirmedServiceRequestIAm.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetUnconfirmedServiceRequestIAm.go
index 0504ab4a20..8dd8454b93 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetUnconfirmedServiceRequestIAm.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetUnconfirmedServiceRequestIAm.go
@@ -198,7 +198,7 @@ func BACnetUnconfirmedServiceRequestIAmParseWithBuffer(ctx context.Context, read
if pullErr := readBuffer.PullContext("segmentationSupported"); pullErr != nil {
return nil, errors.Wrap(pullErr, "Error pulling for segmentationSupported")
}
- _segmentationSupported, _segmentationSupportedErr := BACnetSegmentationTaggedParseWithBuffer(ctx, readBuffer, uint8(uint8(0)), TagClass(TagClass_APPLICATION_TAGS))
+ _segmentationSupported, _segmentationSupportedErr := BACnetSegmentationTaggedParseWithBuffer(ctx, readBuffer, uint8(uint8(9)), TagClass(TagClass_APPLICATION_TAGS))
if _segmentationSupportedErr != nil {
return nil, errors.Wrap(_segmentationSupportedErr, "Error parsing 'segmentationSupported' field of BACnetUnconfirmedServiceRequestIAm")
}
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetUnconfirmedServiceRequestIAm.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetUnconfirmedServiceRequestIAm.java
index abe18d7208..8c28aa7309 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetUnconfirmedServiceRequestIAm.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetUnconfirmedServiceRequestIAm.java
@@ -171,7 +171,7 @@ public class BACnetUnconfirmedServiceRequestIAm extends BACnetUnconfirmedService
new DataReaderComplexDefault<>(
() ->
BACnetSegmentationTagged.staticParse(
- readBuffer, (short) (0), (TagClass) (TagClass.APPLICATION_TAGS)),
+ readBuffer, (short) (9), (TagClass) (TagClass.APPLICATION_TAGS)),
readBuffer));
BACnetVendorIdTagged vendorId =
diff --git a/protocols/bacnetip/src/main/resources/protocols/bacnetip/bacnetip.mspec b/protocols/bacnetip/src/main/resources/protocols/bacnetip/bacnetip.mspec
index e347f9ccaa..17922a9a49 100644
--- a/protocols/bacnetip/src/main/resources/protocols/bacnetip/bacnetip.mspec
+++ b/protocols/bacnetip/src/main/resources/protocols/bacnetip/bacnetip.mspec
@@ -946,7 +946,7 @@
['I_AM' *IAm
[simple BACnetApplicationTagObjectIdentifier deviceIdentifier ]
[simple BACnetApplicationTagUnsignedInteger maximumApduLengthAcceptedLength ]
- [simple BACnetSegmentationTagged('0', 'TagClass.APPLICATION_TAGS') segmentationSupported ]
+ [simple BACnetSegmentationTagged('9', 'TagClass.APPLICATION_TAGS') segmentationSupported ]
[simple BACnetVendorIdTagged('2', 'TagClass.APPLICATION_TAGS') vendorId ]
]
['I_HAVE' *IHave
[plc4x] 01/02: feat(bacnet): vendor update
Posted by sr...@apache.org.
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 5ce69b511f4599d1ae15ec1d32af4153e5446c7e
Author: Sebastian Rühl <sr...@apache.org>
AuthorDate: Wed Feb 15 17:42:53 2023 +0100
feat(bacnet): vendor update
---
.../bacnetip/readwrite/model/BACnetVendorId.go | 78 +++++++++++++---------
.../java/bacnetip/readwrite/BACnetVendorId.java | 11 +--
2 files changed, 54 insertions(+), 35 deletions(-)
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetVendorId.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetVendorId.go
index 259a4fd55b..6d10136ee0 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetVendorId.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetVendorId.go
@@ -43,7 +43,7 @@ const (
BACnetVendorId_MC_QUAY_INTERNATIONAL BACnetVendorId = 3
BACnetVendorId_POLAR_SOFT BACnetVendorId = 4
BACnetVendorId_JOHNSON_CONTROLS_INC BACnetVendorId = 5
- BACnetVendorId_AMERICAN_AUTO_MATRIX BACnetVendorId = 6
+ BACnetVendorId_ABB_FORMERLY_AMERICAN_AUTO_MATRIX BACnetVendorId = 6
BACnetVendorId_SIEMENS_SCHWEIZAG_FORMERLY_LANDIS_STAEFA_DIVISION_EUROPE BACnetVendorId = 7
BACnetVendorId_DELTA_CONTROLS BACnetVendorId = 8
BACnetVendorId_SIEMENS_SCHWEIZAG BACnetVendorId = 9
@@ -74,7 +74,7 @@ const (
BACnetVendorId_NOTIFIER BACnetVendorId = 34
BACnetVendorId_RELIABLE_CONTROLS_CORPORATION BACnetVendorId = 35
BACnetVendorId_TRIDIUM_INC BACnetVendorId = 36
- BACnetVendorId_SIERRA_MONITOR_CORPORATION BACnetVendorId = 37
+ BACnetVendorId_MSA_SAFETY BACnetVendorId = 37
BACnetVendorId_SILICON_ENERGY BACnetVendorId = 38
BACnetVendorId_KIEBACK_PETER_GMBH_COKG BACnetVendorId = 39
BACnetVendorId_ANACON_SYSTEMS_INC BACnetVendorId = 40
@@ -208,7 +208,7 @@ const (
BACnetVendorId_FUJIIT_CO_LTD BACnetVendorId = 168
BACnetVendorId_VACON_PLC BACnetVendorId = 169
BACnetVendorId_LEADER_CONTROLS BACnetVendorId = 170
- BACnetVendorId_CYLON_CONTROLS_LTD BACnetVendorId = 171
+ BACnetVendorId_ABB_FORMERLY_CYLON_CONTROLS_LTD BACnetVendorId = 171
BACnetVendorId_COMPAS BACnetVendorId = 172
BACnetVendorId_MITSUBISHI_ELECTRIC_BUILDING_TECHNO_SERVICE_CO_LTD BACnetVendorId = 173
BACnetVendorId_BUILDING_CONTROL_INTEGRATORS BACnetVendorId = 174
@@ -960,7 +960,7 @@ const (
BACnetVendorId_WTECAG BACnetVendorId = 925
BACnetVendorId_IMI_HYDRONIC_ENGINEERING_INTERNATIONALSA BACnetVendorId = 926
BACnetVendorId_ARIGO_SOFTWARE BACnetVendorId = 927
- BACnetVendorId_MSA_SAFETY BACnetVendorId = 928
+ BACnetVendorId_MSA_SAFETY1 BACnetVendorId = 928
BACnetVendorId_SMART_SOLUCOES_LTDAMERCATO BACnetVendorId = 929
BACnetVendorId_PIATRA_ENGINEERING BACnetVendorId = 930
BACnetVendorId_ODIN_AUTOMATION_SYSTEMSLLC BACnetVendorId = 931
@@ -1434,6 +1434,7 @@ const (
BACnetVendorId_RISHABH_INSTRUMENTS_LIMITED BACnetVendorId = 1403
BACnetVendorId_THING_WAREHOUSELLC BACnetVendorId = 1404
BACnetVendorId_INNOFRIENDS_GMBH BACnetVendorId = 1405
+ BACnetVendorId_METRONICAKP_SPJ BACnetVendorId = 1406
BACnetVendorId_UNKNOWN_VENDOR BACnetVendorId = 0xFFFF
)
@@ -1448,7 +1449,7 @@ func init() {
BACnetVendorId_MC_QUAY_INTERNATIONAL,
BACnetVendorId_POLAR_SOFT,
BACnetVendorId_JOHNSON_CONTROLS_INC,
- BACnetVendorId_AMERICAN_AUTO_MATRIX,
+ BACnetVendorId_ABB_FORMERLY_AMERICAN_AUTO_MATRIX,
BACnetVendorId_SIEMENS_SCHWEIZAG_FORMERLY_LANDIS_STAEFA_DIVISION_EUROPE,
BACnetVendorId_DELTA_CONTROLS,
BACnetVendorId_SIEMENS_SCHWEIZAG,
@@ -1479,7 +1480,7 @@ func init() {
BACnetVendorId_NOTIFIER,
BACnetVendorId_RELIABLE_CONTROLS_CORPORATION,
BACnetVendorId_TRIDIUM_INC,
- BACnetVendorId_SIERRA_MONITOR_CORPORATION,
+ BACnetVendorId_MSA_SAFETY,
BACnetVendorId_SILICON_ENERGY,
BACnetVendorId_KIEBACK_PETER_GMBH_COKG,
BACnetVendorId_ANACON_SYSTEMS_INC,
@@ -1613,7 +1614,7 @@ func init() {
BACnetVendorId_FUJIIT_CO_LTD,
BACnetVendorId_VACON_PLC,
BACnetVendorId_LEADER_CONTROLS,
- BACnetVendorId_CYLON_CONTROLS_LTD,
+ BACnetVendorId_ABB_FORMERLY_CYLON_CONTROLS_LTD,
BACnetVendorId_COMPAS,
BACnetVendorId_MITSUBISHI_ELECTRIC_BUILDING_TECHNO_SERVICE_CO_LTD,
BACnetVendorId_BUILDING_CONTROL_INTEGRATORS,
@@ -2365,7 +2366,7 @@ func init() {
BACnetVendorId_WTECAG,
BACnetVendorId_IMI_HYDRONIC_ENGINEERING_INTERNATIONALSA,
BACnetVendorId_ARIGO_SOFTWARE,
- BACnetVendorId_MSA_SAFETY,
+ BACnetVendorId_MSA_SAFETY1,
BACnetVendorId_SMART_SOLUCOES_LTDAMERCATO,
BACnetVendorId_PIATRA_ENGINEERING,
BACnetVendorId_ODIN_AUTOMATION_SYSTEMSLLC,
@@ -2839,6 +2840,7 @@ func init() {
BACnetVendorId_RISHABH_INSTRUMENTS_LIMITED,
BACnetVendorId_THING_WAREHOUSELLC,
BACnetVendorId_INNOFRIENDS_GMBH,
+ BACnetVendorId_METRONICAKP_SPJ,
BACnetVendorId_UNKNOWN_VENDOR,
}
}
@@ -4653,6 +4655,10 @@ func (e BACnetVendorId) VendorId() uint16 {
{ /* '1405' */
return 1405
}
+ case 1406:
+ { /* '1406' */
+ return 1406
+ }
case 141:
{ /* '141' */
return 141
@@ -10263,6 +10269,10 @@ func (e BACnetVendorId) VendorName() string {
{ /* '1405' */
return "Innofriends GmbH"
}
+ case 1406:
+ { /* '1406' */
+ return "Metronic AKP Sp. J."
+ }
case 141:
{ /* '141' */
return "Yaskawa America, Inc."
@@ -10397,7 +10407,7 @@ func (e BACnetVendorId) VendorName() string {
}
case 171:
{ /* '171' */
- return "Cylon Controls, Ltd."
+ return "ABB (Formerly Cylon Controls, Ltd)"
}
case 172:
{ /* '172' */
@@ -11277,7 +11287,7 @@ func (e BACnetVendorId) VendorName() string {
}
case 37:
{ /* '37' */
- return "Sierra Monitor Corporation"
+ return "MSA Safety"
}
case 370:
{ /* '370' */
@@ -12293,7 +12303,7 @@ func (e BACnetVendorId) VendorName() string {
}
case 6:
{ /* '6' */
- return "American Auto-Matrix"
+ return "ABB (Formerly American Auto-Matrix)"
}
case 60:
{ /* '60' */
@@ -14968,6 +14978,8 @@ func BACnetVendorIdByValue(value uint16) (enum BACnetVendorId, ok bool) {
return BACnetVendorId_THING_WAREHOUSELLC, true
case 1405:
return BACnetVendorId_INNOFRIENDS_GMBH, true
+ case 1406:
+ return BACnetVendorId_METRONICAKP_SPJ, true
case 141:
return BACnetVendorId_YASKAWA_AMERICA_INC, true
case 142:
@@ -15035,7 +15047,7 @@ func BACnetVendorIdByValue(value uint16) (enum BACnetVendorId, ok bool) {
case 170:
return BACnetVendorId_LEADER_CONTROLS, true
case 171:
- return BACnetVendorId_CYLON_CONTROLS_LTD, true
+ return BACnetVendorId_ABB_FORMERLY_CYLON_CONTROLS_LTD, true
case 172:
return BACnetVendorId_COMPAS, true
case 173:
@@ -15475,7 +15487,7 @@ func BACnetVendorIdByValue(value uint16) (enum BACnetVendorId, ok bool) {
case 369:
return BACnetVendorId_ROLBIT_LTD, true
case 37:
- return BACnetVendorId_SIERRA_MONITOR_CORPORATION, true
+ return BACnetVendorId_MSA_SAFETY, true
case 370:
return BACnetVendorId_SYNAPSYS_SOLUTIONS_LTD, true
case 371:
@@ -15983,7 +15995,7 @@ func BACnetVendorIdByValue(value uint16) (enum BACnetVendorId, ok bool) {
case 599:
return BACnetVendorId_PNTECHJSC, true
case 6:
- return BACnetVendorId_AMERICAN_AUTO_MATRIX, true
+ return BACnetVendorId_ABB_FORMERLY_AMERICAN_AUTO_MATRIX, true
case 60:
return BACnetVendorId_NEX_LIGHT, true
case 600:
@@ -16705,7 +16717,7 @@ func BACnetVendorIdByValue(value uint16) (enum BACnetVendorId, ok bool) {
case 927:
return BACnetVendorId_ARIGO_SOFTWARE, true
case 928:
- return BACnetVendorId_MSA_SAFETY, true
+ return BACnetVendorId_MSA_SAFETY1, true
case 929:
return BACnetVendorId_SMART_SOLUCOES_LTDAMERCATO, true
case 93:
@@ -17770,6 +17782,8 @@ func BACnetVendorIdByName(value string) (enum BACnetVendorId, ok bool) {
return BACnetVendorId_THING_WAREHOUSELLC, true
case "INNOFRIENDS_GMBH":
return BACnetVendorId_INNOFRIENDS_GMBH, true
+ case "METRONICAKP_SPJ":
+ return BACnetVendorId_METRONICAKP_SPJ, true
case "YASKAWA_AMERICA_INC":
return BACnetVendorId_YASKAWA_AMERICA_INC, true
case "DEO_SCONTROLSYSTEMS_GMBH":
@@ -17836,8 +17850,8 @@ func BACnetVendorIdByName(value string) (enum BACnetVendorId, ok bool) {
return BACnetVendorId_HONEYWELL_INC, true
case "LEADER_CONTROLS":
return BACnetVendorId_LEADER_CONTROLS, true
- case "CYLON_CONTROLS_LTD":
- return BACnetVendorId_CYLON_CONTROLS_LTD, true
+ case "ABB_FORMERLY_CYLON_CONTROLS_LTD":
+ return BACnetVendorId_ABB_FORMERLY_CYLON_CONTROLS_LTD, true
case "COMPAS":
return BACnetVendorId_COMPAS, true
case "MITSUBISHI_ELECTRIC_BUILDING_TECHNO_SERVICE_CO_LTD":
@@ -18276,8 +18290,8 @@ func BACnetVendorIdByName(value string) (enum BACnetVendorId, ok bool) {
return BACnetVendorId_OJ_ELECTRONICSAS, true
case "ROLBIT_LTD":
return BACnetVendorId_ROLBIT_LTD, true
- case "SIERRA_MONITOR_CORPORATION":
- return BACnetVendorId_SIERRA_MONITOR_CORPORATION, true
+ case "MSA_SAFETY":
+ return BACnetVendorId_MSA_SAFETY, true
case "SYNAPSYS_SOLUTIONS_LTD":
return BACnetVendorId_SYNAPSYS_SOLUTIONS_LTD, true
case "ACME_ENGINEERING_PROD_LTD":
@@ -18784,8 +18798,8 @@ func BACnetVendorIdByName(value string) (enum BACnetVendorId, ok bool) {
return BACnetVendorId_SWISSPHONE_TELECOMAG, true
case "PNTECHJSC":
return BACnetVendorId_PNTECHJSC, true
- case "AMERICAN_AUTO_MATRIX":
- return BACnetVendorId_AMERICAN_AUTO_MATRIX, true
+ case "ABB_FORMERLY_AMERICAN_AUTO_MATRIX":
+ return BACnetVendorId_ABB_FORMERLY_AMERICAN_AUTO_MATRIX, true
case "NEX_LIGHT":
return BACnetVendorId_NEX_LIGHT, true
case "HORNERAPGLLC":
@@ -19506,8 +19520,8 @@ func BACnetVendorIdByName(value string) (enum BACnetVendorId, ok bool) {
return BACnetVendorId_IMI_HYDRONIC_ENGINEERING_INTERNATIONALSA, true
case "ARIGO_SOFTWARE":
return BACnetVendorId_ARIGO_SOFTWARE, true
- case "MSA_SAFETY":
- return BACnetVendorId_MSA_SAFETY, true
+ case "MSA_SAFETY1":
+ return BACnetVendorId_MSA_SAFETY1, true
case "SMART_SOLUCOES_LTDAMERCATO":
return BACnetVendorId_SMART_SOLUCOES_LTDAMERCATO, true
case "ARGUS_CONTROL_SYSTEMS_LTD":
@@ -20629,6 +20643,8 @@ func (e BACnetVendorId) PLC4XEnumName() string {
return "THING_WAREHOUSELLC"
case BACnetVendorId_INNOFRIENDS_GMBH:
return "INNOFRIENDS_GMBH"
+ case BACnetVendorId_METRONICAKP_SPJ:
+ return "METRONICAKP_SPJ"
case BACnetVendorId_YASKAWA_AMERICA_INC:
return "YASKAWA_AMERICA_INC"
case BACnetVendorId_DEO_SCONTROLSYSTEMS_GMBH:
@@ -20695,8 +20711,8 @@ func (e BACnetVendorId) PLC4XEnumName() string {
return "HONEYWELL_INC"
case BACnetVendorId_LEADER_CONTROLS:
return "LEADER_CONTROLS"
- case BACnetVendorId_CYLON_CONTROLS_LTD:
- return "CYLON_CONTROLS_LTD"
+ case BACnetVendorId_ABB_FORMERLY_CYLON_CONTROLS_LTD:
+ return "ABB_FORMERLY_CYLON_CONTROLS_LTD"
case BACnetVendorId_COMPAS:
return "COMPAS"
case BACnetVendorId_MITSUBISHI_ELECTRIC_BUILDING_TECHNO_SERVICE_CO_LTD:
@@ -21135,8 +21151,8 @@ func (e BACnetVendorId) PLC4XEnumName() string {
return "OJ_ELECTRONICSAS"
case BACnetVendorId_ROLBIT_LTD:
return "ROLBIT_LTD"
- case BACnetVendorId_SIERRA_MONITOR_CORPORATION:
- return "SIERRA_MONITOR_CORPORATION"
+ case BACnetVendorId_MSA_SAFETY:
+ return "MSA_SAFETY"
case BACnetVendorId_SYNAPSYS_SOLUTIONS_LTD:
return "SYNAPSYS_SOLUTIONS_LTD"
case BACnetVendorId_ACME_ENGINEERING_PROD_LTD:
@@ -21643,8 +21659,8 @@ func (e BACnetVendorId) PLC4XEnumName() string {
return "SWISSPHONE_TELECOMAG"
case BACnetVendorId_PNTECHJSC:
return "PNTECHJSC"
- case BACnetVendorId_AMERICAN_AUTO_MATRIX:
- return "AMERICAN_AUTO_MATRIX"
+ case BACnetVendorId_ABB_FORMERLY_AMERICAN_AUTO_MATRIX:
+ return "ABB_FORMERLY_AMERICAN_AUTO_MATRIX"
case BACnetVendorId_NEX_LIGHT:
return "NEX_LIGHT"
case BACnetVendorId_HORNERAPGLLC:
@@ -22365,8 +22381,8 @@ func (e BACnetVendorId) PLC4XEnumName() string {
return "IMI_HYDRONIC_ENGINEERING_INTERNATIONALSA"
case BACnetVendorId_ARIGO_SOFTWARE:
return "ARIGO_SOFTWARE"
- case BACnetVendorId_MSA_SAFETY:
- return "MSA_SAFETY"
+ case BACnetVendorId_MSA_SAFETY1:
+ return "MSA_SAFETY1"
case BACnetVendorId_SMART_SOLUCOES_LTDAMERCATO:
return "SMART_SOLUCOES_LTDAMERCATO"
case BACnetVendorId_ARGUS_CONTROL_SYSTEMS_LTD:
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetVendorId.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetVendorId.java
index d6a712ec50..3ad63e9cba 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetVendorId.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetVendorId.java
@@ -32,7 +32,8 @@ public enum BACnetVendorId {
MC_QUAY_INTERNATIONAL((int) 3, (int) 3, (String) "McQuay International"),
POLAR_SOFT((int) 4, (int) 4, (String) "PolarSoft"),
JOHNSON_CONTROLS_INC((int) 5, (int) 5, (String) "Johnson Controls, Inc."),
- AMERICAN_AUTO_MATRIX((int) 6, (int) 6, (String) "American Auto-Matrix"),
+ ABB_FORMERLY_AMERICAN_AUTO_MATRIX(
+ (int) 6, (int) 6, (String) "ABB (Formerly American Auto-Matrix)"),
SIEMENS_SCHWEIZAG_FORMERLY_LANDIS_STAEFA_DIVISION_EUROPE(
(int) 7, (int) 7, (String) "Siemens Schweiz AG (Formerly: Landis & Staefa Division Europe)"),
DELTA_CONTROLS((int) 8, (int) 8, (String) "Delta Controls"),
@@ -68,7 +69,7 @@ public enum BACnetVendorId {
NOTIFIER((int) 34, (int) 34, (String) "Notifier"),
RELIABLE_CONTROLS_CORPORATION((int) 35, (int) 35, (String) "Reliable Controls Corporation"),
TRIDIUM_INC((int) 36, (int) 36, (String) "Tridium Inc."),
- SIERRA_MONITOR_CORPORATION((int) 37, (int) 37, (String) "Sierra Monitor Corporation"),
+ MSA_SAFETY((int) 37, (int) 37, (String) "MSA Safety"),
SILICON_ENERGY((int) 38, (int) 38, (String) "Silicon Energy"),
KIEBACK_PETER_GMBH_COKG((int) 39, (int) 39, (String) "Kieback & Peter GmbH & Co KG"),
ANACON_SYSTEMS_INC((int) 40, (int) 40, (String) "Anacon Systems, Inc."),
@@ -225,7 +226,8 @@ public enum BACnetVendorId {
FUJIIT_CO_LTD((int) 168, (int) 168, (String) "Fuji IT Co., Ltd."),
VACON_PLC((int) 169, (int) 169, (String) "Vacon Plc"),
LEADER_CONTROLS((int) 170, (int) 170, (String) "Leader Controls"),
- CYLON_CONTROLS_LTD((int) 171, (int) 171, (String) "Cylon Controls, Ltd."),
+ ABB_FORMERLY_CYLON_CONTROLS_LTD(
+ (int) 171, (int) 171, (String) "ABB (Formerly Cylon Controls, Ltd)"),
COMPAS((int) 172, (int) 172, (String) "Compas"),
MITSUBISHI_ELECTRIC_BUILDING_TECHNO_SERVICE_CO_LTD(
(int) 173, (int) 173, (String) "Mitsubishi Electric Building Techno-Service Co., Ltd."),
@@ -1069,7 +1071,7 @@ public enum BACnetVendorId {
IMI_HYDRONIC_ENGINEERING_INTERNATIONALSA(
(int) 926, (int) 926, (String) "IMI Hydronic Engineering International SA"),
ARIGO_SOFTWARE((int) 927, (int) 927, (String) "ARIGO Software"),
- MSA_SAFETY((int) 928, (int) 928, (String) "MSA Safety"),
+ MSA_SAFETY1((int) 928, (int) 928, (String) "MSA Safety"),
SMART_SOLUCOES_LTDAMERCATO((int) 929, (int) 929, (String) "Smart Solucoes Ltda – MERCATO"),
PIATRA_ENGINEERING((int) 930, (int) 930, (String) "PIATRA Engineering"),
ODIN_AUTOMATION_SYSTEMSLLC((int) 931, (int) 931, (String) "ODIN Automation Systems, LLC"),
@@ -1612,6 +1614,7 @@ public enum BACnetVendorId {
RISHABH_INSTRUMENTS_LIMITED((int) 1403, (int) 1403, (String) "Rishabh Instruments Limited"),
THING_WAREHOUSELLC((int) 1404, (int) 1404, (String) "Thing Warehouse LLC"),
INNOFRIENDS_GMBH((int) 1405, (int) 1405, (String) "Innofriends GmbH"),
+ METRONICAKP_SPJ((int) 1406, (int) 1406, (String) "Metronic AKP Sp. J."),
UNKNOWN_VENDOR((int) 0xFFFF, (int) 0xFFFF, (String) "Unknown");
private static final Map<Integer, BACnetVendorId> map;