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

完成了电流->转矩的转变，基本完成

Browse Source
This commit is contained in:
gitea
2025-01-22 16:14:19 +08:00
parent 7f815ac63e
commit 92bdf133f2
48 changed files with 662 additions and 870240 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
code/common/clibs.py
View File

@ -66,42 +66,12 @@ def insert_logdb(_level, _module, _content):
cursor.execute("insert into logs (level, module, content) values (?, ?, ?)", data)
def insert_logdb_multi(data):
if db_state == "readwrite":
global conn, cursor, lock
# data = [_level, _module, repr(_content)]
# cursor.execute("insert into logs (level, module, content) values (?, ?, ?)", data)
try:
lock.acquire(True)
cursor.executemany("insert into logs (level, module, content) values (?, ?, ?)", data)
finally:
lock.release()
class GetThreadResult(threading.Thread):
def __init__(self, func, args=()):
super(GetThreadResult, self).__init__()
self.func = func
self.args = args
self.result = None
def run(self):
self.result = self.func(*self.args)
def get_result(self):
threading.Thread.join(self) # 等待线程执行完毕
try:
return self.result
except Exception:
return None
# PREFIX = 'assets' # for pyinstaller packaging
PREFIX = '../assets' # for source code testing and debug
log_path = f"{PREFIX}/logs"
levels = ["DEBUG", "INFO", "WARNING", "ERROR"]
db_state = "readwrite"
data_dp, data_at = {}, {}
data_dp, data_at, data_dd = {}, {}, {}
conn, cursor, w2t, tl_prg, f_records, stop, running = None, None, None, None, None, True, False
ip_addr = "192.168.0.160"

12
code/common/openapi.py
View File

@ -1,6 +1,5 @@
import json
import socket
import inspect
from inspect import currentframe
import threading
import functools
@ -10,9 +9,6 @@ import selectors
import time
from common import clibs
from os import listdir
from pymodbus.payload import BinaryPayloadBuilder
from pymodbus.constants import Endian
import os.path
from ctypes import *
import hashlib
@ -161,12 +157,12 @@ class ModbusRequest(object):
clibs.insert_logdb("INFO", "openapi", f"modbus: 40102 将 {pon} 写入")
def write_axis(self, axis):
result = self.__c.convert_to_registers(int(axis), self.__c.DATATYPE.INT32, word_order="little")
result = self.__c.convert_to_registers(int(axis), self.__c.DATATYPE.INT32, "little")
self.__c.write_registers(40103, result)
clibs.insert_logdb("INFO", "openapi", f"modbus: 40103 将 {axis} 写入")
def write_speed_max(self, speed):
result = self.__c.convert_to_registers(float(speed), self.__c.DATATYPE.FLOAT32, word_order="little")
result = self.__c.convert_to_registers(float(speed), self.__c.DATATYPE.FLOAT32, "little")
self.__c.write_registers(40105, result)
clibs.insert_logdb("INFO", "openapi", f"modbus: 40105 将 {speed} 写入")
@ -315,7 +311,7 @@ class ModbusRequest(object):
def read_scenario_time(self):
results = self.__c.read_holding_registers(40601, count=2)
result = self.__c.convert_from_registers(results.registers, data_type=self.__c.DATATYPE.FLOAT32, word_order="little")
result = self.__c.convert_from_registers(registers=results.registers, data_type=self.__c.DATATYPE.FLOAT32, word_order="little")
return result
def read_brake_done(self):
@ -750,7 +746,7 @@ class HmiRequest(object):
req = json.load(f_json)
except Exception as Err:
clibs.insert_logdb("ERROR", "openapi", f"hr-execution: 暂不支持 {command} 功能，或确认该功能存在... {Err}")
clibs.w2t(f"hr-execution: 暂不支持 {command} 功能，或确认该功能存在... {Err}", "red")
clibs.w2t(f"hr-execution: 暂不支持 {command} 功能，或确认该功能存在... {Err}", "red", "CommandError")
if p_flag == 0: # for old protocols
match command: