Merge pull request #65 from phagemann/bit_parsing

AGMultiRead Bit query
robinson · Oct 31, 2023 · fb5a72f · fb5a72f
2 parents bdaa10e + f1da4ea
commit fb5a72f
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/multi.go b/multi.go
@@ -14,6 +14,7 @@ type S7DataItem struct {
 	WordLen  int
 	DBNumber int
 	Start    int
+	Bit      int
 	Amount   int
 	Data     []byte
 	Error    string
@@ -162,8 +163,11 @@ func (mb *client) AGReadMulti(dataItems []S7DataItem, itemsCount int) (err error
 
 		// Adjusts the offset
 		var addr int
-		if dataItems[i].WordLen == s7wlbit || dataItems[i].WordLen == s7wlcounter || dataItems[i].WordLen == s7wltimer {
+		if dataItems[i].WordLen == s7wlcounter || dataItems[i].WordLen == s7wltimer {
 			addr = dataItems[i].Start
+		} else if dataItems[i].WordLen == s7wlbit {
+			addr = dataItems[i].Start << 3
+			addr += dataItems[i].Bit // Add Bit addr
 		} else {
 			addr = dataItems[i].Start * 8
 		}