Publish 0.01.7

sdurnev · Apr 5, 2020 · f48ab3c · f48ab3c
1 parent 53a4802
commit f48ab3c
Show file tree

Hide file tree

Showing 20 changed files with 528 additions and 391 deletions.
diff --git a/.idea/encodings.xml b/.idea/encodings.xml
diff --git a/.idea/runConfigurations/debug_linux.xml b/.idea/runConfigurations/debug_linux.xml
diff --git a/.idea/runConfigurations/debug_linux_generix_bacs_modbus_tcp.xml b/.idea/runConfigurations/debug_linux_generix_bacs_modbus_tcp.xml
diff --git a/.idea/runConfigurations/generix_bacs_modbus_tcp_linux.xml b/.idea/runConfigurations/generix_bacs_modbus_tcp_linux.xml
diff --git a/.idea/runConfigurations/generix_bacs_modbus_tcp_macos.xml b/.idea/runConfigurations/generix_bacs_modbus_tcp_macos.xml
diff --git a/.idea/runConfigurations/generix_bacs_modbus_tcp_rpi.xml b/.idea/runConfigurations/generix_bacs_modbus_tcp_rpi.xml
diff --git a/.idea/runConfigurations/generix_bacs_modbus_tcp_windows.xml b/.idea/runConfigurations/generix_bacs_modbus_tcp_windows.xml
diff --git a/.idea/serialmonitor_settings.xml b/.idea/serialmonitor_settings.xml
diff --git a/README.md b/README.md
@@ -11,21 +11,8 @@ Programm flags:
 
 -id - generix_bacs modbus slave ID (defaut value 1);
 
--m - generix_bacs read areas values 
-
-    -m=1 Alarm values (from 1000 to 109)
-
-    -m=2 Strings values (from 1010 to 1059)
-
-    -m=3 Battary modules (from 1060 to 2709)
-
--q - quantity of generix_bacs battary modules range, value range 1 - 17 (defaut value 1).
-
-    -q=1  module from 1 - 20
-
-    -q=1  module from 21 - 30
       
 
 Example:
 
-`jan_modbus_ip_mac_0.01.2 -ip=192.168.10.10 -port=1502 -id=2 -m=3 -q=2`
+`generix_bacs_modbus_tcp -ip=127.0.0.1 -port=1113 -id=1`
diff --git a/add/tem.txt b/add/tem.txt
@@ -0,0 +1,89 @@
+"ВACS_ALARM_NONE",
+"ВACS_ALARM_GENERAL_ALARМ",
+"ВАСS_ALARM_COMMUNICATION_LOST",
+"CS_ALARM_VOLTAGE_HIGH",
+"ВАСS_ALARM_VOLTAGE_LOW",
+"ВACS_ALARM_ТEMPERATURE_HIGH",
+"ВACS_ALARM_TEMPERATURE_LOW",
+"ВACS_ALARM_RESISTOR_HIGH",
+"ВACS_ALARM_RESISTOR_LOW",
+"ВАСS_ALARM_EQUALISATION_ERR",
+"ВACS_ALARM_VOLTAGE_WARN_HIGH",
+"ВАСS_ALARM_VOLTAGE_WARN_LOW",
+"ВACS_ALARM_TEMPERATURE_WARN_HIGH",
+"ВАСS_ALARM_TEMPERATURE_WARN_LOW",
+"ВACS_ALARM_RESISТOR_WARN_HIGH",
+"ВАСS_ALARM_RESISTOR_WARN_LOW",
+"ВACS_ALARM_MODREV_INCOMPATIBLE",
+
+{"mainunit":{"1000_BACS_ALARM":[BACS_ALARM_NONE, BACS_ALARM_DISCHARGING_STOPPED], "1001_BACS_ALARM": [BACS_STATE_NONE], "1002_BACS_ALARM": [ВACS_ALARM_NONE],"1003_BACS_NUMSTRINGS": 3, "1004_BACS_NUMMODULES": 12},
+"strins": [
+ "string1":{"1010_STRING_01_CUR":0, "1011_ВACS_StrSummVolt": 54,"1012_ВACS_StrAvgVolt": 13,"1013_ВACS_StrCurrAC": -99},
+ "string2":{"1015_STRING_01_CUR":0, "1016_ВACS_StrSummVolt": 54,"1017_ВACS_StrAvgVolt": 13,"1018_ВACS_StrCurrAC": -99},
+ "string3":{"1020_STRING_01_CUR":0, "1021_ВACS_StrSummVolt": 54,"1022_ВACS_StrAvgVolt": 13,"1023_ВACS_StrCurrAC": -99}],
+ "modules":[
+ {"1060_MODULE_001_TEMP"; 19, "1061_MODULE_001_VOLT": 13, "1062_MODULE_001_IMPC": 5, "1063_MODULE_001_ALARM": [ВACS_ALARM_NONE], "1064_MODULE_001_EQ": 0}
+ {"1060_MODULE_001_TEMP"; 21, "1061_MODULE_001_VOLT": 13, "1062_MODULE_001_IMPC": 4, "1063_MODULE_001_ALARM": [ВACS_ALARM_NONE], "1064_MODULE_001_EQ": 0}
+ {"1060_MODULE_001_TEMP"; 22, "1061_MODULE_001_VOLT": 13, "1062_MODULE_001_IMPC": 4, "1063_MODULE_001_ALARM": [ВACS_ALARM_NONE], "1064_MODULE_001_EQ": 0}
+ {"1060_MODULE_001_TEMP"; 22, "1061_MODULE_001_VOLT": 13, "1062_MODULE_001_IMPC": 5, "1063_MODULE_001_ALARM": [ВACS_ALARM_NONE], "1064_MODULE_001_EQ": 0}
+ {"1060_MODULE_001_TEMP"; 21, "1061_MODULE_001_VOLT": 13, "1062_MODULE_001_IMPC": 4, "1063_MODULE_001_ALARM": [ВACS_ALARM_NONE], "1064_MODULE_001_EQ": 0}
+ {"1060_MODULE_001_TEMP"; 22, "1061_MODULE_001_VOLT": 13, "1062_MODULE_001_IMPC": 4, "1063_MODULE_001_ALARM": [ВACS_ALARM_NONE], "1064_MODULE_001_EQ": 0}
+ {"1060_MODULE_001_TEMP"; 21, "1061_MODULE_001_VOLT": 13, "1062_MODULE_001_IMPC": 4, "1063_MODULE_001_ALARM": [ВACS_ALARM_NONE], "1064_MODULE_001_EQ": 0}
+ {"1060_MODULE_001_TEMP"; 19, "1061_MODULE_001_VOLT": 13, "1062_MODULE_001_IMPC": 4, "1063_MODULE_001_ALARM": [ВACS_ALARM_NONE], "1064_MODULE_001_EQ": 0}
+ {"1060_MODULE_001_TEMP"; 20, "1061_MODULE_001_VOLT": 13, "1062_MODULE_001_IMPC": 5, "1063_MODULE_001_ALARM": [ВACS_ALARM_NONE], "1064_MODULE_001_EQ": 0}
+ {"1060_MODULE_001_TEMP"; 21, "1061_MODULE_001_VOLT": 13, "1062_MODULE_001_IMPC": 4, "1063_MODULE_001_ALARM": [ВACS_ALARM_NONE], "1064_MODULE_001_EQ": 0}
+ {"1060_MODULE_001_TEMP"; 21, "1061_MODULE_001_VOLT": 13, "1062_MODULE_001_IMPC": 5, "1063_MODULE_001_ALARM": [ВACS_ALARM_NONE], "1064_MODULE_001_EQ": 0}
+ {"1060_MODULE_001_TEMP"; 23, "1061_MODULE_001_VOLT": 13, "1062_MODULE_001_IMPC": 4, "1063_MODULE_001_ALARM": [ВACS_ALARM_NONE], "1064_MODULE_001_EQ": 0}]}
+
+paramNameStrings := [...]string{
+		"1010_STRING_01_CUR",
+		"1011_ВACS_StrSummVolt",
+		"1012_ВACS_StrAvgVolt",
+		"1013_ВACS_StrCurrAC",
+		"1014_<RESERVED>",
+		"1015_STRING_02_CUR",
+		"1016_ВACS_StrSummVolt",
+		"1017_ВACS_StrAvgVolt",
+		"1018_ВACS_StrCurrAC",
+		"1019_<RESERVED>",
+		"1020_STRING_03_CUR",
+		"1021_ВACS_StrSummVolt",
+		"1022_ВACS_StrAvgVolt",
+		"1023_ВACS_StrCurrAC",
+		"1024_<RESERVED>",
+		"1025_STRING_04_CUR",
+		"1026_ВACS_StrSummVolt",
+		"1027_ВACS_StrAvgVolt",
+		"1028_ВACS_StrCurrAC",
+		"1029_<RESERVED>",
+		"1030_STRING_05_CUR",
+		"1031_ВACS_StrSummVolt",
+		"1032_ВACS_StrAvgVolt",
+		"1033_ВACS_StrCurrAC",
+		"1034_<RESERVED>",
+		"1035_STRING_06_CUR",
+		"1036_ВACS_StrSummVolt",
+		"1037_ВACS_StrAvgVolt",
+		"1038_ВACS_StrCurrAC",
+		"1039_<RESERVED>",
+		"1040_STRING_07_CUR",
+		"1041_ВACS_StrSummVolt",
+		"1042_ВACS_StrAvgVolt",
+		"1043_ВACS_StrCurrAC",
+		"1044_<RESERVED>",
+		"1045_STRING_08_CUR",
+		"1046_ВACS_StrSummVolt",
+		"1047_ВACS_StrAvgVolt",
+		"1048_ВACS_StrCurrAC",
+		"1049_<RESERVED>",
+		"1050_STRING_09_CUR",
+		"1051_ВACS_StrSummVolt",
+		"1052_ВACS_StrAvgVolt",
+		"1053_ВACS_StrCurrAC",
+		"1054_<RESERVED>",
+		"1055_STRING_10_CUR",
+		"1056_ВACS_StrSummVolt",
+		"1057_ВACS_StrAvgVolt",
+		"1058_ВACS_StrCurrAC",
+		"1059_<RESERVED>",
+	}
diff --git a/add/tmp.json b/add/tmp.json
@@ -0,0 +1,112 @@
+{
+  "1000_BACS_ALARM": [
+    "BACS_ALARM_NONE",
+    "BACS_ALARM_DISCHARGING",
+    "BACS_ALARM_FLOAT_CHARGING"
+  ],
+  "1001_BACS_ALARM": [
+    "BACS_STATE_THERMAL_RUNAWAY"
+  ],
+  "1002_BACS_ALARM": [
+    "ВACS_ALARM_TEMPERATURE_WARN_HIGH"
+  ],
+  "1003_BACS_NUMSTRINGS": 3,
+  "1004_BACS_NUMMODULES": 12,
+  "1010_STRING_01_CUR": -9999.00,
+  "1011_ВACS_StrSummVolt": 54.00,
+  "1012_ВACS_StrAvgVolt": 13.00,
+  "1013_ВACS_StrCurrAC": -99.00,
+  "1015_STRING_02_CUR": -9999.00,
+  "1016_ВACS_StrSummVolt": 54.00,
+  "1017_ВACS_StrAvgVolt": 13.00,
+  "1018_ВACS_StrCurrAC": -99.00,
+  "1020_STRING_03_CUR": -9999.00,
+  "1021_ВACS_StrSummVolt": 54.00,
+  "1022_ВACS_StrAvgVolt": 13.00,
+  "1023_ВACS_StrCurrAC": -99.00,
+  "1060_MODULE_001_TEMP": 32.00,
+  "1061_MODULE_001_VOLT": 13.00,
+  "1062_MODULE_001_IMPC": 4.00,
+  "1063_MODULE_001_ALARM": [
+    "ВACS_ALARM_TEMPERATURE_WARN_HIGH"
+  ],
+  "1064_MODULE_001_EQ": 0.00,
+  "1065_MODULE_002_TEMP": 30.00,
+  "1066_MODULE_002_VOLT": 13.00,
+  "1067_MODULE_002_IMPC": 3.00,
+  "1068_MODULE_002_ALARM": [
+    "ВACS_ALARM_TEMPERATURE_WARN_HIGH"
+  ],
+  "1069_MODULE_002_EQ": 0.00,
+  "1070_MODULE_003_TEMP": 30.00,
+  "1071_MODULE_003_VOLT": 13.00,
+  "1072_MODULE_003_IMPC": 4.00,
+  "1073_MODULE_003 ALARM": [
+    "ВACS_ALARM_NONE"
+  ],
+  "1074_MODULE_003_EQ": 0.00,
+  "1075_MODULE_004_TEMP": 27.00,
+  "1076_MODULE_004_VOLT": 13.00,
+  "1077_MODULE_004_IMPC": 4.00,
+  "1078_MODULE_004_ALARM": [
+    "ВACS_ALARM_NONE"
+  ],
+  "1079_MODULE_004_EQ": 0.00,
+  "1080_MODULE_005_TEMP": 29.00,
+  "1081_MODULE_005_VOLT": 13.00,
+  "1082_MODULE_005_IMPC": 3.00,
+  "1083_MODULE_005_ALARM": [
+    "ВACS_ALARM_NONE"
+  ],
+  "1084_MODULE_005_EQ": 0.00,
+  "1085_MODULE_006_TEMP": 31.00,
+  "1086_MODULE_006_VOLT": 13.00,
+  "1087_MODULE_006_IMPC": 3.00,
+  "1088_MODULE_006_ALARM": [
+    "ВACS_ALARM_TEMPERATURE_WARN_HIGH"
+  ],
+  "1089_MODULE_006_EQ": 0.00,
+  "1090_MODULE_007_TEMP": 32.00,
+  "1091_MODULE_007_VOLT": 13.00,
+  "1092_MODULE_007_IMPC": 4.00,
+  "1093_MODULE_007_ALARM": [
+    "ВACS_ALARM_TEMPERATURE_WARN_HIGH"
+  ],
+  "1094_MODULE_007_EQ": 0.00,
+  "1095_MODULE_008_TEMP": 32.00,
+  "1096_MODULE_008_VOLT": 13.00,
+  "1097_MODULE_008_IMPC": 3.00,
+  "1098_MODULE_008_ALARM": [
+    "ВACS_ALARM_TEMPERATURE_WARN_HIGH"
+  ],
+  "1099_MODULE_008_EQ": 0.00,
+  "1100_MODULE_009_TEMP": 33.00,
+  "1101_MODULE_009_VOLT": 13.00,
+  "1102_MODULE_009_IMPC": 4.00,
+  "1103_MODULE_009_ALARM": [
+    "ВACS_ALARM_TEMPERATURE_WARN_HIGH"
+  ],
+  "1104_MODULE_009_EQ": 0.00,
+  "1105_MODULE_010_TEMP": 31.00,
+  "1106_MODULE_010_VOLT": 13.00,
+  "1107_MODULE_010_IMPC": 5.00,
+  "1108_MODULE_010_ALARM": [
+    "ВACS_ALARM_TEMPERATURE_WARN_HIGH"
+  ],
+  "1109_MODULE_010_EQ": 0.00,
+  "1110_MODULE_011_TEMP": 30.00,
+  "1111_MODULE_011_VOLT": 13.00,
+  "1112_MODULE_011_IMPC": 5.00,
+  "1113_MODULE_011_ALARM": [
+    "ВACS_ALARM_TEMPERATURE_WARN_HIGH"
+  ],
+  "1114_MODULE_011_EQ": 0.00,
+  "1115_MODULE_012_TEMP": 28.00,
+  "1116_MODULE_012_VOLT": 13.00,
+  "1117_MODULE_012_IMPC": 3.00,
+  "1118_MODULE_012_ALARM": [
+    "ВACS_ALARM_NONE"
+  ],
+  "1119_MODULE_012_EQ": 0.00,
+  "version": "0.01.7"
+}
diff --git a/bin/0.01.6/linux/generix_bacs_modbus_tcp_linux_linux b/bin/0.01.6/linux/generix_bacs_modbus_tcp_linux_linux
diff --git a/bin/0.01.6/macos/generix_bacs_modbus_tcp_macos_darwin b/bin/0.01.6/macos/generix_bacs_modbus_tcp_macos_darwin
diff --git a/bin/0.01.6/rpi/generix_bacs_modbus_tcp_rpi_linux b/bin/0.01.6/rpi/generix_bacs_modbus_tcp_rpi_linux
diff --git a/bin/0.01.6/win/generix_bacs_modbus_tcp_windows.exe b/bin/0.01.6/win/generix_bacs_modbus_tcp_windows.exe
diff --git a/bin/0.01.7/linux/generix_bacs_modbus_tcp b/bin/0.01.7/linux/generix_bacs_modbus_tcp
diff --git a/bin/0.01.7/macos/generix_bacs_modbus_tcp b/bin/0.01.7/macos/generix_bacs_modbus_tcp
diff --git a/bin/0.01.7/rpi/generix_bacs_modbus_tcp b/bin/0.01.7/rpi/generix_bacs_modbus_tcp
diff --git a/bin/0.01.7/win/generix_bacs_modbus_tcp.exe b/bin/0.01.7/win/generix_bacs_modbus_tcp.exe