Fixed issue with parameter loading

Author: paulorb

examples/configuration_simulation.xml

@@ -4,7 +4,6 @@
         <parameter symbol="PARAM_CURRENT_SELECTION" datatype="INT16">15</parameter>
         <parameter symbol="PARAM_SET_TEMPERATURE" datatype="FLOAT32">5.45</parameter>
         <parameter symbol="PARAM_ENABLE_FAST_MODE" datatype="BOOL">1</parameter>
-        <parameter symbol="PARAM_DISABLE_MAIN_CONVEYOR" datatype="BOOL"/>
     </parameters>
     <configuration initializeUndefinedRegisters="true" initialValue="0">
         <registers>
@@ -24,7 +23,7 @@
             <register addressType="HOLDING_REGISTER" address="6"  datatype="INT16" symbol="RPM_MOTOR6">6</register>
             <register addressType="HOLDING_REGISTER" address="7"  datatype="INT16" symbol="RPM_MOTOR7">7</register>
             <register addressType="HOLDING_REGISTER" address="8"  datatype="INT16" symbol="RPM_MOTOR8">8</register>
-            <register addressType="HOLDING_REGISTER" address="9"  datatype="INT16" symbol="RPM_MOTOR9">9</register>
+            <register addressType="HOLDING_REGISTER" address="22"  datatype="INT16" symbol="RPM_MOTOR9">9</register>
             <register addressType="COIL" address="1" symbol="RELAYON">1</register>
             <register addressType="COIL" address="2" symbol="RELAYON2">1</register>
             <register addressType="COIL" address="3" symbol="RELAYON3">1</register>

src/main/kotlin/ConfigurationParser.kt

@@ -17,7 +17,7 @@ class ConfigurationParser {
     }
     private fun load(): Device? {
         try {
-            val context = JAXBContext.newInstance(Device::class.java, Set::class.java, Random::class.java, Delay::class.java, Linear::class.java, Add::class.java, Sub::class.java, Csv::class.java, IfEqual::class.java)
+            val context = JAXBContext.newInstance(Device::class.java, Set::class.java, Random::class.java, Delay::class.java, Linear::class.java, Add::class.java, Sub::class.java, Csv::class.java, IfEqual::class.java, Parameters::class.java, Parameter::class.java)
             val unmarshaller = context.createUnmarshaller()
             if(fileName.isEmpty()) {
                 val reader = StringReader(this::class.java.classLoader.getResource("configuration.xml")!!.readText())
@@ -181,8 +181,9 @@ data class Set(
     constructor(): this("", "0")
 }
 
+@XmlAccessorType(XmlAccessType.NONE)
 data class Parameters(
-    @field:XmlElement(name = "register")
+    @field:XmlElement(name = "parameter")
     val parameters: MutableList<Parameter>
 ) {
     constructor(): this(mutableListOf())
@@ -196,6 +197,7 @@ data class Parameters(
     }
 }
 
+@XmlAccessorType(XmlAccessType.NONE)
 data class Parameter(
     @XmlAttribute
     val symbol: String,

src/main/kotlin/EnvironmentVariables.kt

@@ -20,15 +20,15 @@ init {
                 if(jsonParameter.datatype == "BOOL" && envParameter.value != "0" &&  envParameter.value != "1"){
                     throw InvalidPropertiesFormatException("Environment variable for parameter ${jsonParameter.symbol} has value ${envParameter.value} which does not conform with its datatype BOOL")
                 }
-                enviromentVars.add(EnvParameter(envParameter.symbol, envParameter.value))
+                enviromentVars.add(EnvParameter(envParameter.symbol, envParameter.value, envParameter.type))
                 found = true
             }
         }
         if (!found) {
             if (jsonParameter.value.isEmpty()) {
                 throw InvalidPropertiesFormatException("Environment variable for parameter ${jsonParameter.symbol} not found, json definition  do not have a default value, which makes it mandatory")
             } else {
-                enviromentVars.add(EnvParameter(jsonParameter.symbol, jsonParameter.value))
+                enviromentVars.add(EnvParameter(jsonParameter.symbol, jsonParameter.value,  jsonParameter.datatype))
             }
         }
     }

src/main/kotlin/Main.kt

@@ -9,7 +9,8 @@ import kotlin.system.exitProcess
 
 data class EnvParameter(
     var symbol : String,
-    var value: String
+    var value: String,
+    var type: String
 )
 @Command(name = "modbussimulatorcli", mixinStandardHelpOptions = true, version = ["CLI 0.0.99"],
     description = ["Modbus TCP Simulator"])
@@ -41,7 +42,7 @@ class Checksum : Callable<Int> {
                 if(parts.count() != 2){
                     throw InvalidPropertiesFormatException("Environment parameter does not follow the format NAME=VALUE")
                 }else{
-                    envParameter.add(EnvParameter(parts[0],parts[1]))
+                    envParameter.add(EnvParameter(parts[0],parts[1], ""))
                 }
             }
         }
@@ -71,7 +72,8 @@ class Checksum : Callable<Int> {
             }
             // if not set default, reading internal xml
             plcMemory = PlcMemory(configuration)
-            plcSimulation = PlcSimulation(configuration, plcMemory,EnvironmentVariables(environmentParameters, configuration), mainCoroutineScope)
+            var envVariables = EnvironmentVariables(environmentParameters, configuration)
+            plcSimulation = PlcSimulation(configuration, plcMemory,envVariables, mainCoroutineScope)
             modbusServer = ModbusServer(plcMemory)
         }
 

src/main/kotlin/PlcSimulation.kt

@@ -89,10 +89,37 @@ class PlcSimulation(
         var value = processValue(element.value)
         var variable = configuration.registers.getVarConfiguration(element.symbol)
         if (variable == null) {
+            val envVar = parameters.resolveEnvVar(element.symbol)
+            if(envVar != null){
+                if(envVar.type == "FLOAT32"){
+                    if(envVar.value.toFloat() != value.toFloat()){
+                        //abort and continue
+                        //since the value does not match the condition
+                        return
+                    }
+                    //execute operations
+                    element.randomElements.forEach { subElement ->
+                        processOperationElement(subElement, configuration, memory)
+                    }
+                }else
+                    if(envVar.type == "INT16" || envVar.type == "BOOL" ){
+                        if(envVar.value.toInt() != value.toInt()){
+                            //abort and continue
+                            //since the value does not match the condition
+                            return
+                        }
+                        //execute operations
+                        element.randomElements.forEach { subElement ->
+                            processOperationElement(subElement, configuration, memory)
+                        }
+                    }else {
+                        println("ERROR: Symbol ${element.symbol} has invalid datatype during IfEqual execution")
+                    }
 
-
-            println("ERROR: Symbol ${element.symbol} not found during IfEqual execution")
-            throw CancellationException("Error - IfEqual")
+            }else {
+                println("ERROR: Symbol ${element.symbol} not found during IfEqual execution")
+                throw CancellationException("Error - IfEqual")
+            }
         } else {
 
             when (variable.addressType) {