Feature: GetCommEventLog (0x0C) command

ivanesik · Dec 27, 2022 · 7ae7352 · 7ae7352
1 parent 7dffdda
commit 7ae7352
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 2 deletions.
diff --git a/README.md b/README.md
@@ -94,6 +94,7 @@ Functions:
 - Read Exception Status: **readExceptionStatus** = 0x07
 - Diagnostic: **diagnostic** = 0x08
 - Get Comm Event Counter: **getCommEventCounter** = 0x0B
+- Get Comm Event Log: **getCommEventLog** = 0x0C
 
 - Write multiply coil (one bit) registers: **forceMultipleCoils** = 0x0F
 - Write multiply holding (16 bit bit) registers: **presetMultipleRegisters**= 0x10
@@ -107,7 +108,6 @@ Functions:
   - Read FIFO Queue - 0x18
   - Read File Record - 0x14
   - Write File Record - 0x15
-  - Get Com Event Log - 0x0C
   - Report Server ID - 0x11
   - Encapsulated Interface Transport - 0x2B
 - Presets for diagnostic (0x08) function

diff --git a/Sources/ModSwift/ModSwift.swift b/Sources/ModSwift/ModSwift.swift
@@ -269,6 +269,11 @@ public class ModSwift {
         return createCommand(command: .getCommEventCounter)
     }
 
+    /// Returns package for "Get Comm Event Log" function (0x0C)
+    func getCommEventLog() -> Data {
+        return createCommand(command: .getCommEventLog)
+    }
+
     /// Returns package for force (write) multiple coils function (0x0F)
     func forceMultipleCoils(startAddress: UInt16, values: [Bool]) -> Data {
         var data: [UInt8] = DataHelper.splitIntIntoTwoBytes(values.count)

diff --git a/Sources/ModSwift/Model/Model.swift b/Sources/ModSwift/Model/Model.swift
@@ -41,7 +41,7 @@ enum Command: UInt8 {
     /** Get Com Event Counter */
     case getCommEventCounter = 0x0B
     /** Get Com Event Log */
-    case getComEventLog = 0x0C
+    case getCommEventLog = 0x0C
     /** Report Server ID */
     case reportServerId = 0x11
 

diff --git a/Tests/ModSwiftTests/ModSwiftRtuTests.swift b/Tests/ModSwiftTests/ModSwiftRtuTests.swift
@@ -85,6 +85,12 @@ final class ModSwiftTests: XCTestCase {
         XCTAssertEqual(data, rightData)
     }
 
+    func testGetCommEventLog() {
+        let rightData = Data([0x0B, 0x0C, 0x85, 0x06])
+        let data = modbus.getCommEventLog()
+        XCTAssertEqual(data, rightData)
+    }
+
     func testForceMultipleCoils() {
         // trans 2, prot 2, len 2, slave 1, func 1, addr 2, count 2, data
         let rightData = Data([11, 15, 1, 13, 0, 20, 3, 0x85, 0xA8, 0x05, 0x73, 0xC3])

diff --git a/Tests/ModSwiftTests/ModSwiftTcpTest.swift b/Tests/ModSwiftTests/ModSwiftTcpTest.swift
@@ -86,6 +86,12 @@ class ModSwiftTcpTest: XCTestCase {
         XCTAssertEqual(data, rightData)
     }
 
+    func testGetCommEventLog() {
+        let rightData = Data([0x00, 0x01, 0x00, 0x00, 0x00, 0x02, 0x0B, 0x0C])
+        let data = modbus.getCommEventLog()
+        XCTAssertEqual(data, rightData)
+    }
+
     func testForceMultipleCoils() {
         // trans 2, prot 2, len 2, slave 1, func 1, addr 2, count 2, data
         let rightData = Data([0x00, 0x01, 0x00, 0x00, 0x00, 0x0A, 0x0B, 0x0F, 0x01, 0x0D, 0x00, 0x14, 0x03, 0x85, 0xA8, 0x05])