Ver 0.01.6

sdurnev · Dec 29, 2019 · 4df4f08 · 4df4f08
1 parent 74a6a80
commit 4df4f08
Show file tree

Hide file tree

Showing 20 changed files with 13 additions and 13 deletions.
diff --git a/.idea/runConfigurations/Build_all.xml b/.idea/runConfigurations/Build_all.xml
diff --git a/.idea/runConfigurations/jan_modbus_tcp_linux.xml b/.idea/runConfigurations/jan_modbus_tcp_linux.xml
diff --git a/.idea/runConfigurations/jan_modbus_tcp_macos.xml b/.idea/runConfigurations/jan_modbus_tcp_macos.xml
diff --git a/.idea/runConfigurations/jan_modbus_tcp_rpi.xml b/.idea/runConfigurations/jan_modbus_tcp_rpi.xml
diff --git a/.idea/runConfigurations/jan_modbus_tcp_windows.xml b/.idea/runConfigurations/jan_modbus_tcp_windows.xml
diff --git a/bin/0.01.4/linux/jan_modbus_tcp_x64_linux b/bin/0.01.4/linux/jan_modbus_tcp_x64_linux
diff --git a/bin/0.01.4/macos/jan_modbus_tcp_macos b/bin/0.01.4/macos/jan_modbus_tcp_macos
diff --git a/bin/0.01.4/rpi/jan_modbus_tcp_rpi_linux b/bin/0.01.4/rpi/jan_modbus_tcp_rpi_linux
diff --git a/bin/0.01.4/win/jan_modbus_tcp_windows.exe b/bin/0.01.4/win/jan_modbus_tcp_windows.exe
diff --git a/bin/0.01.5/linux/jan_modbus_tcp_linux_linux b/bin/0.01.5/linux/jan_modbus_tcp_linux_linux
diff --git a/bin/0.01.5/macos/jan_modbus_tcp_macos_darwin b/bin/0.01.5/macos/jan_modbus_tcp_macos_darwin
diff --git a/bin/0.01.5/rpi/jan_modbus_tcp_rpi_linux b/bin/0.01.5/rpi/jan_modbus_tcp_rpi_linux
diff --git a/bin/0.01.5/win/jan_modbus_tcp_windows.exe b/bin/0.01.5/win/jan_modbus_tcp_windows.exe
diff --git a/bin/build_linux_x64_linux b/bin/build_linux_x64_linux
diff --git a/bin/build_macos b/bin/build_macos
diff --git a/bin/build_rpi_linux b/bin/build_rpi_linux
diff --git a/bin/jan_modbus_ip_mac_0.01.2 b/bin/jan_modbus_ip_mac_0.01.2
diff --git a/bin/jan_modbus_ip_mac_0.01.3 b/bin/jan_modbus_ip_mac_0.01.3
diff --git a/bin/jan_modbus_ip_rpi_0.01.3 b/bin/jan_modbus_ip_rpi_0.01.3
diff --git a/main.go b/main.go
@@ -16,7 +16,7 @@ import (
 !!!!!!!!!!!! VERSION !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 */
-const version = "0.01.5"
+const version = "0.01.6"
 
 /*
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
@@ -108,9 +108,9 @@ func main() {
 	defer handler.Close()
 	client := modbus.NewClient(handler)
 
-	results, err := client.ReadInputRegisters(19000, uint16(*regQuantity)*2)
+	results, err := client.ReadHoldingRegisters(19000, uint16(*regQuantity)*2)
 	if err != nil {
-		fmt.Printf("{\"status\":\"error\", \"error\":\"%s\"}", err)
+		fmt.Printf("{\"status\":\"error\", \"error\":\"%s\", \"version\": \"%s\"}", err, version)
 		//fmt.Printf("%s\n", err)
 	}
 
@@ -129,14 +129,14 @@ func main() {
 
 	for l := 0; l < len(data); l++ {
 		if l == 0 {
-			fmt.Printf("{ \"%s\": ", paramName[l])
+			fmt.Printf("{\"%s\":", paramName[l])
 		} else {
-			fmt.Printf(", \"%s\": ", paramName[l])
+			fmt.Printf(",\"%s\":", paramName[l])
 		}
 		fmt.Print(data[l])
 	}
 	if len(results) != 0 {
-		fmt.Printf(", \"version\": \"%s\"}", version)
+		fmt.Printf(",\"version\":\"%s\"}", version)
 	}
 }