Compare commits
2 Commits
2d465ca83d
...
124c2d02ee
| Author | SHA1 | Date | |
|---|---|---|---|
| 124c2d02ee | |||
| 360e64e957 |
13
majtask.py
13
majtask.py
@@ -1,6 +1,7 @@
|
|||||||
|
|
||||||
import zmq
|
import zmq
|
||||||
import time
|
import time
|
||||||
|
import numpy as np
|
||||||
from loguru import logger
|
from loguru import logger
|
||||||
import utils
|
import utils
|
||||||
from utils import PidWrap
|
from utils import PidWrap
|
||||||
@@ -27,10 +28,12 @@ class main_task():
|
|||||||
|
|
||||||
def parse_data(self,data):
|
def parse_data(self,data):
|
||||||
if data.get('code') == 0:
|
if data.get('code') == 0:
|
||||||
self.x += data.get('data')[0]
|
ck_val = data.get('data')
|
||||||
self.y += data.get('data')[1]
|
# logger.debug(ck_val)
|
||||||
self.error_counts += 1
|
if isinstance(ck_val, np.ndarray):
|
||||||
|
self.x += ck_val[0]
|
||||||
|
self.y += ck_val[1]
|
||||||
|
self.error_counts += 1
|
||||||
else:
|
else:
|
||||||
pass
|
pass
|
||||||
|
|
||||||
@@ -91,7 +94,7 @@ class main_task():
|
|||||||
# pid_out = self.pid1.get(self.lane_error*0.65)
|
# pid_out = self.pid1.get(self.lane_error*0.65)
|
||||||
pid_out = self.pid1.get(self.lane_error)
|
pid_out = self.pid1.get(self.lane_error)
|
||||||
# pid_out = -pid_out
|
# pid_out = -pid_out
|
||||||
# logger.debug(f"err={self.lane_error}, pwm out={pid_out}")
|
logger.debug(f"err={self.lane_error}, pwm out={pid_out}")
|
||||||
self.by_cmd.send_speed_omega(pid_out)
|
self.by_cmd.send_speed_omega(pid_out)
|
||||||
|
|
||||||
self.socket.send_string("")
|
self.socket.send_string("")
|
||||||
|
|||||||
Reference in New Issue
Block a user