gitea/APIs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

重新优化安全区参数设定功能

Browse Source
This commit is contained in:
gitea
2024-09-25 13:47:22 +08:00
parent 65bd6f2bce
commit 1f4656f0b9
4 changed files with 19 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
code/openapi.py
View File

@@ -1,4 +1,4 @@
from json import load, dumps, loads, dump
from json import load, dumps, loads
from os import listdir
from inspect import currentframe
from socket import socket, AF_INET, SOCK_STREAM
@@ -783,6 +783,8 @@ class HmiRequest(object):
case "safety.safety_area.safety_area_enable":
req["c"]["safety.safety_area.safety_area_enable"]["id"] = kwargs["id"]
req["c"]["safety.safety_area.safety_area_enable"]["enable"] = kwargs["enable"]
case "safety.safety_area.set_param":
req["c"]["safety.safety_area.set_param"] = kwargs["data"]
case _:
pass
@@ -1474,13 +1476,13 @@ class HmiRequest(object):
:param percent: 0-200，整机灵敏度百分比
:return:
"""
res = self.get_collision_params
keys = res.keys()
data = self.get_collision_params
keys = data.keys()
kwargs.update({"enable": enable, "mode": mode, "action": action, "percent": percent})
for _ in keys:
if _ in kwargs.keys():
res[_] = kwargs[_]
self.execution("collision.set_params", data=res)
data[_] = kwargs[_]
self.execution("collision.set_params", data=data)
def set_collision_state(self, collision_state: bool):
"""
@@ -1719,7 +1721,7 @@ class HmiRequest(object):
"""
self.execution("safety.safety_area.safety_area_enable", protocol_flag=1, id=id, enable=enable)
def set_safety_area_param(self, id: int, enable: bool, **kwargs): # 不生效，待确认
def set_safety_area_param(self, id: int, enable: bool, **kwargs):
"""
设定单独安全区的参数
:param id: 安全区 id
@@ -1727,15 +1729,13 @@ class HmiRequest(object):
:param kwargs: 其他参数，参考 get_safety_area_params 的返回值形式
:return: None
"""
res = self.get_safety_area_params["g"]["safety_area_data"]["safety_area_setting"][id]
keys = res.keys()
data = self.get_safety_area_params["g"]["safety_area_data"]["safety_area_setting"][id]
keys = data.keys()
kwargs.update({"id": id, "enable": enable})
for _ in keys:
if _ in kwargs.keys():
res[_] = kwargs[_]
with open(f"{clibs.PREFIX}/json/safety.safety_area.set_param.json", mode="w", encoding="utf-8") as f:
dump({"c": {"safety.safety_area.set_param": res}}, f, indent=4)
self.execution("safety.safety_area.set_param", protocol_flag=1)
data[_] = kwargs[_]
self.execution("safety.safety_area.set_param", protocol_flag=1, data=data)
self.execution("safety.safety_area.safety_area_enable", protocol_flag=1, id=id, enable=enable)
@property