Skip to content

Commit 6862d5d

Browse files
Merge pull request #39 from Association-INTech/callback
Callback
2 parents e446960 + 32f3c22 commit 6862d5d

32 files changed

Lines changed: 2309 additions & 3330 deletions

src/high_level/models/model_CNN1DExtractor.onnx

100644100755
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
version https://git-lfs.github.com/spec/v1
2-
oid sha256:ec91de319de14d1d4abfc25475fb2673f9e99281a3c40d6ec3927e4c717551ab
3-
size 26896656
2+
oid sha256:c6e563a65705687b38687736543538e62cba2ec9242ab26e7ac5db0813857085
3+
size 36662
6.19 MB
Binary file not shown.

src/high_level/models/model_CNN1DResNetExtractor.onnx

Lines changed: 0 additions & 3 deletions
This file was deleted.

src/high_level/models/model_TemporalResNetExtractor.onnx

Lines changed: 0 additions & 3 deletions
This file was deleted.
Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
import time
2-
from actionneur_capteur.lidar import Lidar
2+
from drivers.lidar import Lidar
33

44

5-
IP = '192.168.0.20'
5+
IP = "192.168.0.20"
66
PORT = 10940
77

8-
if __name__ == '__main__':
8+
if __name__ == "__main__":
99
sensor = Lidar(IP, PORT)
1010
sensor.stop()
1111
# sensor.singleRead(0, 1080)
1212
time.sleep(2)
1313

14-
sensor.startContinuous(0, 1080)
15-
sensor.startPlotter()
14+
sensor.start_continuous(0, 1080)
15+
sensor.start_plotter()

src/high_level/scripts/launch_serveur.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
log_serveur = logging.getLogger("src.HL")
2121
log_serveur.setLevel(level=logging.DEBUG)
2222

23-
log_lidar = logging.getLogger("src.HL.actionneur_capteur.Lidar")
23+
log_lidar = logging.getLogger("src.HL.driver.Lidar")
2424
log_lidar.setLevel(level=logging.INFO)
2525

2626
boot = Server()

src/high_level/scripts/live_display_lidar.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import time
22

3-
from actionneur_capteur import Lidar
3+
from drivers import Lidar
44

55
IP = "192.168.0.10"
66
PORT = 10940

src/high_level/scripts/min_lidar.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
import numpy as np
77

8-
from src.actionneur_capteur.lidar import Lidar
8+
from src.drivers.lidar import Lidar
99

1010
IP = "192.168.0.10"
1111
PORT = 10940

src/high_level/scripts/onetime_lidar.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
from actionneur_capteur import Lidar
1+
from drivers import Lidar
22

33
IP = "192.168.0.10"
44
PORT = 10940

src/high_level/scripts/remote_control_controller.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
import struct
33
import time
44
from threading import Thread
5-
5+
from high_level.autotech_constant import IP
66
import pygame
77

88
###################################################
@@ -15,7 +15,7 @@ def send_data():
1515
global target_speed, direction
1616
while True:
1717
packet = struct.pack("ff", target_speed, direction)
18-
sock.sendto(packet, ("192.168.1.10", 5556))
18+
sock.sendto(packet, (IP, 5556))
1919
time.sleep(0.05)
2020

2121

@@ -25,7 +25,7 @@ def send_data():
2525
direction = 0
2626
target_speed = 0
2727

28-
max_target_speed = 2
28+
max_target_speed = 7
2929
min_target_speed = -2
3030
angle_degree_max = 18
3131

0 commit comments

Comments
 (0)