Merge pull request #3067 from SCADA-LTS/fix/#2799_Allow_modbus_tcp_sl…

…ave_id_to_be_zero #2799 Allow modbus tcp slave id to be zero
SCADA-LTS · Dec 18, 2024 · 6c274b5 · 6c274b5
2 parents 017ee5c + 243934a
commit 6c274b5
Show file tree

Hide file tree

Showing 12 changed files with 24 additions and 13 deletions.
diff --git a/src/com/serotonin/mango/vo/dataSource/modbus/ModbusPointLocatorVO.java b/src/com/serotonin/mango/vo/dataSource/modbus/ModbusPointLocatorVO.java
@@ -291,8 +291,8 @@ public void validate(DwrResponseI18n response) {
 		if (!MODBUS_DATA_TYPE_CODES.isValidId(modbusDataType))
 			response.addContextualMessage("modbusDataType",
 					"validate.invalidValue");
-		if (!StringUtils.isBetweenInc(slaveId, 1, 255) && !socketMonitor)
-			response.addContextualMessage("slaveId", "validate.1to255");
+		if (!StringUtils.isBetweenInc(slaveId, 0, 255) && !socketMonitor)
+			response.addContextualMessage("slaveId", "validate.0to255");
 
 		if (!slaveMonitor && !socketMonitor) {
 			int maxEndOffset = 65536 - DataType

diff --git a/webapp-resources/messages_de.properties b/webapp-resources/messages_de.properties
@@ -3368,4 +3368,5 @@ systemSettings.invalidCustomCss=Invalid custom CSS
 systemsettings.reports.dataPointExtendedNameLengthLimit=Point name length limit in reports
 event.ds.recursiveError=Recursive Error
 event.meta.recursiveError=Recursive error in point "{0}": {1}
-validate.cyclicDependency=Cyclic dependency: {0}
+validate.cyclicDependency=Cyclic dependency: {0}
+validate.0to255=Must be between 0 and 255 inclusive
diff --git a/webapp-resources/messages_en.properties b/webapp-resources/messages_en.properties
@@ -3371,4 +3371,5 @@ systemSettings.invalidCustomCss=Invalid custom CSS
 systemsettings.reports.dataPointExtendedNameLengthLimit=Point name length limit in reports
 event.ds.recursiveError=Recursive Error
 event.meta.recursiveError=Recursive error in point "{0}": {1}
-validate.cyclicDependency=Cyclic dependency: {0}
+validate.cyclicDependency=Cyclic dependency: {0}
+validate.0to255=Must be between 0 and 255 inclusive
diff --git a/webapp-resources/messages_es.properties b/webapp-resources/messages_es.properties
@@ -3411,4 +3411,5 @@ systemSettings.invalidCustomCss=Invalid custom CSS
 systemsettings.reports.dataPointExtendedNameLengthLimit=Point name length limit in reports
 event.ds.recursiveError=Recursive Error
 event.meta.recursiveError=Recursive error in point "{0}": {1}
-validate.cyclicDependency=Cyclic dependency: {0}
+validate.cyclicDependency=Cyclic dependency: {0}
+validate.0to255=Must be between 0 and 255 inclusive
diff --git a/webapp-resources/messages_fi.properties b/webapp-resources/messages_fi.properties
@@ -3496,4 +3496,5 @@ systemSettings.invalidCustomCss=Invalid custom CSS
 systemsettings.reports.dataPointExtendedNameLengthLimit=Point name length limit in reports
 event.ds.recursiveError=Recursive Error
 event.meta.recursiveError=Recursive error in point "{0}": {1}
-validate.cyclicDependency=Cyclic dependency: {0}
+validate.cyclicDependency=Cyclic dependency: {0}
+validate.0to255=Must be between 0 and 255 inclusive
diff --git a/webapp-resources/messages_fr.properties b/webapp-resources/messages_fr.properties
@@ -3365,4 +3365,5 @@ systemSettings.invalidCustomCss=Invalid custom CSS
 systemsettings.reports.dataPointExtendedNameLengthLimit=Point name length limit in reports
 event.ds.recursiveError=Recursive Error
 event.meta.recursiveError=Recursive error in point "{0}": {1}
-validate.cyclicDependency=Cyclic dependency: {0}
+validate.cyclicDependency=Cyclic dependency: {0}
+validate.0to255=Must be between 0 and 255 inclusive
diff --git a/webapp-resources/messages_lu.properties b/webapp-resources/messages_lu.properties
@@ -3384,4 +3384,5 @@ systemSettings.invalidCustomCss=Invalid custom CSS
 systemsettings.reports.dataPointExtendedNameLengthLimit=Point name length limit in reports
 event.ds.recursiveError=Recursive Error
 event.meta.recursiveError=Recursive error in point "{0}": {1}
-validate.cyclicDependency=Cyclic dependency: {0}
+validate.cyclicDependency=Cyclic dependency: {0}
+validate.0to255=Must be between 0 and 255 inclusive
diff --git a/webapp-resources/messages_nl.properties b/webapp-resources/messages_nl.properties
@@ -3486,4 +3486,5 @@ systemSettings.invalidCustomCss=Invalid custom CSS
 systemsettings.reports.dataPointExtendedNameLengthLimit=Point name length limit in reports
 event.ds.recursiveError=Recursive Error
 event.meta.recursiveError=Recursive error in point "{0}": {1}
-validate.cyclicDependency=Cyclic dependency: {0}
+validate.cyclicDependency=Cyclic dependency: {0}
+validate.0to255=Must be between 0 and 255 inclusive
diff --git a/webapp-resources/messages_pl.properties b/webapp-resources/messages_pl.properties
@@ -3508,4 +3508,5 @@ systemSettings.invalidCustomCss=Invalid custom CSS
 systemsettings.reports.dataPointExtendedNameLengthLimit=Point name length limit in reports
 event.ds.recursiveError=Recursive Error
 event.meta.recursiveError=Recursive error in point "{0}": {1}
-validate.cyclicDependency=Cyclic dependency: {0}
+validate.cyclicDependency=Cyclic dependency: {0}
+validate.0to255=Must be between 0 and 255 inclusive
diff --git a/webapp-resources/messages_pt.properties b/webapp-resources/messages_pt.properties
@@ -3523,4 +3523,5 @@ systemSettings.invalidCustomCss=Invalid custom CSS
 systemsettings.reports.dataPointExtendedNameLengthLimit=Point name length limit in reports
 event.ds.recursiveError=Recursive Error
 event.meta.recursiveError=Recursive error in point "{0}": {1}
-validate.cyclicDependency=Cyclic dependency: {0}
+validate.cyclicDependency=Cyclic dependency: {0}
+validate.0to255=Must be between 0 and 255 inclusive
diff --git a/webapp-resources/messages_ru.properties b/webapp-resources/messages_ru.properties
@@ -3519,4 +3519,5 @@ systemSettings.invalidCustomCss=Invalid custom CSS
 systemsettings.reports.dataPointExtendedNameLengthLimit=Point name length limit in reports
 event.ds.recursiveError=Recursive Error
 event.meta.recursiveError=Recursive error in point "{0}": {1}
-validate.cyclicDependency=Cyclic dependency: {0}
+validate.cyclicDependency=Cyclic dependency: {0}
+validate.0to255=Must be between 0 and 255 inclusive
diff --git a/webapp-resources/messages_zh.properties b/webapp-resources/messages_zh.properties
@@ -3471,4 +3471,5 @@ systemSettings.invalidCustomCss=Invalid custom CSS
 systemsettings.reports.dataPointExtendedNameLengthLimit=Point name length limit in reports
 event.ds.recursiveError=Recursive Error
 event.meta.recursiveError=Recursive error in point "{0}": {1}
-validate.cyclicDependency=Cyclic dependency: {0}
+validate.cyclicDependency=Cyclic dependency: {0}
+validate.0to255=Must be between 0 and 255 inclusive