Welding/WeldingSpotPerformance
9
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases 2 Wiki Activity

feat: Добавлен сигнал Oncomming, без обработки

Browse Source
This commit is contained in:
ermolaev_p 2024-12-02 12:46:10 +03:00
parent e5ebd566de
commit 71c8285583
2 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
params/system_params.json
View File

@ -1,11 +1,11 @@
{ {
"a_max_1": 5.41, "a_max_1": 5.41,
"v_max_1": 0.108, "v_max_1": 0.278,
"a_max_2": 35.81, "a_max_2": 35.81,
"v_max_2": 0.678, "v_max_2": 0.7,
"mass_1": 257, "mass_1": 270,
"mass_2": 1, "mass_2": 1,
"k_hardness_1": 1759291, "k_hardness_1": 2148570,
"k_hardness_2": 0, "k_hardness_2": 0,
"torque_max_1": 20, "torque_max_1": 20,
"torque_max_2": 0, "torque_max_2": 0,
@ -13,11 +13,12 @@
"transmission_ratio_2": 1, "transmission_ratio_2": 1,
"position_start_1": 0.08, "position_start_1": 0.08,
"position_start_2": 0.08, "position_start_2": 0.08,
"k_prop": 0.05, "k_prop": 0.075,
"time_capture": 100000, "time_capture": 10,
"UML_time_scaler": 1000, "UML_time_scaler": 1000,
"Closure_signal": "Closing", "Closure_signal": "Closing",
"Squeeze_signal": "Squeeze", "Squeeze_signal": "Squeeze",
"Welding_signal": "Welding", "Welding_signal": "Welding",
"Release_signal": "Relief" "Release_signal": "Relief",
"Oncomming_signal": "Oncomming"
} }

5
src/utils/diagram_parser.py
View File

@ -7,7 +7,8 @@ class DiagramParser:
self.signals = [system_config["Closure_signal"], self.signals = [system_config["Closure_signal"],
system_config["Squeeze_signal"], system_config["Squeeze_signal"],
system_config["Welding_signal"], system_config["Welding_signal"],
system_config["Release_signal"]] system_config["Release_signal"],
system_config["Oncomming_signal"]]
self.boolDict = {} self.boolDict = {}
self.floatDict = {} self.floatDict = {}
@ -22,6 +23,7 @@ class DiagramParser:
for signalName in self.data.columns: for signalName in self.data.columns:
if type (self.data[signalName].iloc[0]) == np.bool: if type (self.data[signalName].iloc[0]) == np.bool:
print("!", signalName)
self.boolDict[signalName] = self._getBoolChanges(signalName) self.boolDict[signalName] = self._getBoolChanges(signalName)
for signalName in self.data.columns: for signalName in self.data.columns:
@ -33,6 +35,7 @@ class DiagramParser:
elif key == self.signals[1]: name = "compression" elif key == self.signals[1]: name = "compression"
elif key == self.signals[2]: name = "welding" elif key == self.signals[2]: name = "welding"
elif key == self.signals[3]: name = "opening" elif key == self.signals[3]: name = "opening"
elif key == self.signals[4]: name = "oncomming"
self.timingsDict[name] = [] self.timingsDict[name] = []
len_items = len(items) len_items = len(items)