Skip to content

Commit 2d6f33f

Browse files
committed
fix the bugs
1 parent 935297c commit 2d6f33f

File tree

3 files changed

+17
-5
lines changed

3 files changed

+17
-5
lines changed

emulate_feedback_generator.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
import can
2-
from python_can import msg
2+
# from python_can import msg
3+
import msg
34
import time
45
import threading
56

emulate_handle.py

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
import tkinter as tk
22
import os
33
import sys
4-
from python_can import sender
4+
# from python_can import sender
5+
import sender
56
import threading
67

78
steering = 0
@@ -95,20 +96,28 @@ def slider_scroll(self, event=None):
9596
print(str(self.scal_steering_var.get()))
9697
print(str(self.scal_brake_var.get()))
9798
print(str(self.scal_throttle_var.get()))
99+
global steering
100+
global brake_var
101+
global throttle_var
102+
steering = self.scal_steering_var.get()
103+
brake_var = self.scal_brake_var.get()
104+
throttle_var = self.scal_throttle_var.get()
98105

99106

100107
def can_sender():
101108
global steering
102109
global brake_var
103110
global throttle_var
104111
# どういった操作を行うかのシナリオの定義
105-
emulation_scenrio = {"axi0" : steering, "axi2" : brake_var, "axi3" : throttle_var}
106112

107113
# ループ
108114
active = True
109115
handleControllerCommand = sender.HandleControllerCommand()
110116
while active:
117+
emulation_scenrio = {"axi0" : steering, "axi2" : brake_var, "axi3" : throttle_var}
111118

119+
# print("hello")
120+
print(emulation_scenrio)
112121
# print を入れると、CANの送信処理が正しく走らなくなるのでデバッグ時以外はprint を消す
113122
# print('十時キー:', joystick.get_axis(0), joystick.get_axis(1), joystick.get_axis(2), joystick.get_axis(3))
114123

sender.py

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,15 @@
11
import can
22
import msg
33
import asyncio
4+
import time
45

56

67
class HandleControllerCommand:
78
def __init__(self):
8-
# self.bus = can.interface.Bus('ws://localhost:54701/', bustype='remote', preserve_timestamps=True)
9+
self.bus = can.interface.Bus('ws://localhost:54701/', bustype='remote', preserve_timestamps=True)
910
# self.bus = can.interface.Bus('test', bustype='virtual', preserve_timestamps=True)
1011
# PIXKITへの送信用
11-
self.bus = can.interface.Bus(bustype='socketcan', channel="slcan0", bitrate=500000, app_name='python-can')
12+
# self.bus = can.interface.Bus(bustype='socketcan', channel="slcan0", bitrate=500000, app_name='python-can')
1213

1314
# CANメッセージを送信するかしないかを判断するFlag
1415
self.sendFlag = False
@@ -58,6 +59,7 @@ def canSend(self):
5859
self.bus.send(self.can_msg_Steering_Command)
5960
self.bus.send(self.can_msg_Brake_Command)
6061
self.bus.send(self.can_msg_Throttle_Command)
62+
time.sleep(0.01)
6163

6264
def startCanSend(self):
6365
self.sendFlag = True

0 commit comments

Comments
 (0)