Skip to content

Commit a36178e

Browse files
authored
Merge pull request #4 from paulorb/fixPresetHR
fix(ISSUE-3): fix issue on preset single register
2 parents 8397a3b + defeb99 commit a36178e

4 files changed

+6
-5
lines changed

src/main/kotlin/IModbusServerEventListener.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ interface IModbusServerEventListener {
44
fun readHoldingRegister(startAddress: Int ,numberOfRegisters: Int) : List<Short>
55
fun readInputRegister(startAddress: Int ,numberOfRegisters: Int) : List<Short>
66
fun forceSingleCoil(address: Int, value: Boolean)
7-
fun presetSingleRegister(address: Int, value: Boolean)
7+
fun presetSingleRegister(address: Int, value: Short)
88
fun forceMultipleCoils(addressValueList: MutableList<Pair<Int, Boolean>>)
99
fun presetMultipleRegisters(addressValueList: MutableList<Pair<Int, Short>>)
1010

src/main/kotlin/ModbusServerEventListenerReplyAlwaysZero.kt

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,11 @@ class ModbusServerEventListenerReplyAlwaysZero: IModbusServerEventListener {
2424
return
2525
}
2626

27-
override fun presetSingleRegister(address: Int, value: Boolean) {
28-
return
27+
override fun presetSingleRegister(address: Int, value: Short) {
28+
return
2929
}
3030

31+
3132
override fun forceMultipleCoils(addressValueList: MutableList<Pair<Int, Boolean>>) {
3233
return
3334
}

src/main/kotlin/ModbusServerEventListenerReplyRandomNumbers.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ class ModbusServerEventListenerReplyRandomNumbers : IModbusServerEventListener {
4444
return
4545
}
4646

47-
override fun presetSingleRegister(address: Int, value: Boolean) {
47+
override fun presetSingleRegister(address: Int, value: Short) {
4848
return
4949
}
5050

src/main/kotlin/ModbusServerHandler.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ class ModbusServerHandler(private val modbusServerEventListener: IModbusServerEv
9090
val modbusWriteRequest = ModbusPresetSingleRegisterRequest(modbusPacket)
9191
val modbusWritePresetSingleRegisterResponse = ModbusPresetSingleRegisterResponse()
9292
modbusWritePresetSingleRegisterResponse.unitID = modbusWriteRequest.unitID
93-
modbusServerEventListener.presetSingleRegister(modbusWriteRequest.address, modbusWriteRequest.singleRegisterValue.toInt() == 1)
93+
modbusServerEventListener.presetSingleRegister(modbusWriteRequest.address, modbusWriteRequest.singleRegisterValue.toInt().toShort())
9494
modbusWritePresetSingleRegisterResponse.transactionIdentifier = modbusWriteRequest.transactionIdentifier
9595
modbusWritePresetSingleRegisterResponse.setAddress(modbusWriteRequest.address)
9696
modbusWritePresetSingleRegisterResponse.setRegisterValue(modbusWriteRequest.singleRegisterValue)

0 commit comments

Comments
 (0)