1.增加模式选择(暂时只有手动和锁定)

2.优化代码,修改定时方式
This commit is contained in:
STT 2021-11-26 19:10:23 +08:00
parent 5f98f0d582
commit 794aed33dd
4 changed files with 53 additions and 29 deletions

6
.idea/vcs.xml Normal file
View File

@ -0,0 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="VcsDirectoryMappings">
<mapping directory="$PROJECT_DIR$" vcs="Git" />
</component>
</project>

View File

@ -1,13 +1,26 @@
import struct
from remote_control_unit import RemoteControlUnit
class Control:
def __init__(self):
self.mode = ['lock', 'manual']
self.data = {'mode': self.mode[1], 'thrust': 0, 'rudder': 0, }
self.mode = ['lock', 'manual', 'line']
self.data = {'mode': 'lock', 'thrust': 0, 'rudder': 0, }
def run(self, usv):
if self.data['mode'] == self.mode[1]:
def c_run(self, usv):
self.choose_mode(usv)
self.control(usv)
def control(self, usv):
# 锁定
if self.data['mode'] == 'lock':
self.data['thrust'] = 0
self.data['rudder'] = 0
# 手动
elif self.data['mode'] == 'manual':
self.data['rudder'] = int(1.4881 * (usv.futaba.receive_data['channel1'] - 1024))
self.data['thrust'] = int(-1.4881 * (usv.futaba.receive_data['channel3'] - 1024))
def choose_mode(self, usv):
if usv.futaba.receive_data['channel5'] > 1360:
self.data['mode'] = self.mode[1]
elif usv.futaba.receive_data['channel5'] < 688:
self.data['mode'] = self.mode[2]
else:
self.data['mode'] = self.mode[0]

View File

@ -16,12 +16,24 @@ class RemoteControlUnit:
self.buffer = []
self.packet = array.array('B')
def run(self, usv):
self.buffer += self.sbus.read()
self.decode(usv)
def rcu_run(self, usv):
self.decode()
self.send_command(usv)
def send_command(self, usv):
self.send_data = self.receive_data.copy()
self.send_data['channel1'] = int(
1024 + ((usv.control.data['rudder'] + usv.control.data['thrust']) * 0.672)) # 左电机
self.send_data['channel3'] = int(
1024 + ((usv.control.data['thrust'] - usv.control.data['rudder']) * 0.672)) # 右电机
self.encode()
self.sbus.write(self.packet.tobytes())
def decode(self, ):
"""读取数据并解包数据"""
self.buffer += self.sbus.read(25)
def decode(self, usv):
"""解包数据"""
while len(self.buffer) >= 25:
if self.buffer[0] != 0x0f:
del self.buffer[0]
@ -56,16 +68,6 @@ class RemoteControlUnit:
self.receive_data['flag'] = self.buffer[23]
del self.buffer[:25]
self.send_data = self.receive_data.copy()
self.send_data['channel1'] = int(
1024 + ((usv.control.data['rudder'] + usv.control.data['thrust']) * 0.672)) # 左电机
self.send_data['channel3'] = int(
1024 + ((usv.control.data['thrust'] - usv.control.data['rudder']) * 0.672)) # 右电机
self.encode()
self.sbus.write(self.packet.tobytes())
break
def encode(self):

15
usv.py
View File

@ -1,3 +1,5 @@
import threading
from remote_control_unit import RemoteControlUnit
from control import Control
from settings import Settings
@ -8,16 +10,17 @@ class UsvControl:
def __init__(self):
self.settings = Settings()
self.futaba = RemoteControlUnit(self.settings.sbus_com)
self.futaba = RemoteControlUnit(self.settings.sbus_com, )
self.control = Control()
def run(self):
while True:
self.futaba.run(self)
self.control.run(self)
def main_run(self):
self.futaba.rcu_run(self)
self.control.c_run(self)
timer_10 = threading.Timer(0.005, self.main_run, )
timer_10.start()
# 按间距中的绿色按钮以运行脚本。
if __name__ == '__main__':
usv1 = UsvControl()
usv1.run()
usv1.main_run()