Skip to content

Commit d579992

Browse files
author
Your Name
committed
Auton Docker
1 parent f6a47b2 commit d579992

File tree

9 files changed

+43
-16
lines changed

9 files changed

+43
-16
lines changed

.env.prod

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
GPS_PORT=/dev/serial/by-id/usb-Lord_Microstrain_Lord_Inertial_Sensor_0000_6284.114124-if00
1+
GPS_PORT=/dev/null
22
GPS_PORT_AUX=/dev/null
33
WEBCAM_PORT=/dev/null
44
RLSENSE_PORT=/dev/bus/usb
5-
TEENSY_PORT=/dev/serial/by-id/usb-FTDI_FT232R_USB_UART_AD01TF04-if00-port0
6-
FEATHER_PORT=/dev/serial/by-id/usb-Adafruit_Adafruit_Feather_M0_77D70E005154384153202020FF18250B-if00
5+
TEENSY_PORT=/dev/serial/by-id/usb-FTDI_FT232R_USB_UART_AL037JPG-if00-port0
6+
FEATHER_PORT=/dev/null

docker_auton/Dockerfile

Lines changed: 20 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,44 @@
11
# FROM nvidia/cuda:11.6.2-base-ubuntu20.04 as CUDA
22

3-
FROM osrf/ros:noetic-desktop-full-focal
4-
3+
#FROM arm64v8/ros:noetic-perception-focal
4+
#FROM ros:noetic-ros-base-focal
55
# COPY --from=CUDA /usr/local/cuda /usr/local/
6+
#FROM arm64v8/ros:noetic-ros-base-focal
7+
68

9+
FROM ubuntu:focal@sha256:420b6f4cc783dc199667eae3316d9e066bd6e19931448c1e4b6f9a3759e52106
710

11+
ENV DEBIAN_FRONTEND noninteractive
812
RUN apt update
913
RUN apt-get install -y -qq \
1014
python3-pip \
1115
python3-tk \
12-
vim git tmux tree sl htop x11-apps
16+
vim git tmux tree sl htop x11-apps curl
1317

14-
RUN apt-get install -y -qq \
18+
RUN apt-get update && apt-get install -y lsb-release && apt-get clean all
19+
20+
# RUN curl -s https://raw.githubusercontent.com/ros/rosdistro/master/ros.asc
21+
# RUN apt-key add -
22+
23+
# https://wiki.ros.org/noetic/Installation/Ubuntu
24+
25+
# RUN apt-get install -y -qq \
26+
# ros-noetic-desktop-full \
1527
ros-noetic-rosserial \
1628
ros-noetic-foxglove-bridge \
1729
ros-noetic-microstrain-inertial-driver \
1830
ros-noetic-realsense2-camera \
1931
ros-noetic-realsense2-description \
20-
ros-${ROS_DISTRO}-mavros ros-${ROS_DISTRO}-mavros-extras ros-${ROS_DISTRO}-mavros-msgs
32+
ros-noetic-mavros ros-noetic-mavros-extras ros-noetic-mavros-msgs
2133

2234
# Run this now to cache it separately from other requirements
2335
# COPY cuda-requirements_TEMP_DO_NOT_EDIT.txt cuda-requirements.txt
2436
# RUN pip3 install -r cuda-requirements.txt
2537

38+
# COPY ./python-requirements_TEMP_DO_NOT_EDIT.txt python-requirements.txt
39+
# RUN pip3 install -r python-requirements.txt
2640

27-
COPY python-requirements_TEMP_DO_NOT_EDIT.txt python-requirements.txt
28-
RUN pip3 install -r python-requirements.txt
29-
30-
RUN echo 'source "/opt/ros/$ROS_DISTRO/setup.bash" --' >> ~/.bashrc
41+
# RUN echo 'source "/opt/ros/$ROS_DISTRO/setup.bash" --' >> ~/.bashrc
3142
RUN echo 'cd rb_ws' >> ~/.bashrc
3243
RUN echo 'catkin_make >/dev/null' >> ~/.bashrc
3344
RUN echo 'source devel/setup.bash' >> ~/.bashrc
File renamed without changes.

rb_ws/=

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Requirement already satisfied: numpy in /usr/local/lib/python3.8/dist-packages (1.20.3)

rb_ws/python-requirements.txt

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
matplotlib==3.1.2
2+
NavPy==1.0
3+
numba==0.58.0
4+
numpy<1.21.0
5+
osqp==0.6.3
6+
pandas==2.0.3
7+
pymap3d==3.0.1
8+
scipy==1.10.1
9+
trimesh==3.23.5
10+
utm==0.7.0
11+
keyboard==0.13.5
12+
tk==0.1.0
13+
pyembree

rb_ws/src/buggy/launch/debug_steer.launch

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,5 @@
22

33
<launch>
44
<node name="debug_steer" pkg="buggy" type="debug_steer.py" output="screen" args="--self_name NAND"/>
5+
<node name="bnyahaj" pkg="buggy" type="ros_to_bnyahaj.py" respawn="true" output="screen" args="--self_name NAND --teensy_name ttyUSB0"/>
56
</launch>

rb_ws/src/buggy/launch/nand-system.launch

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

33
<launch>
44

5-
<node name="bnyahaj" pkg="buggy" type="ros_to_bnyahaj.py" respawn="true" output="screen" args="--self_name NAND --teensy_name nand-teensy"/>
5+
<node name="bnyahaj" pkg="buggy" type="ros_to_bnyahaj.py" respawn="true" output="screen" args="--self_name NAND --teensy_name ttyUSB0"/>
66

77
<node name="foxglove" pkg="foxglove_bridge" type="foxglove_bridge" />
88
<node name="telematics" pkg="buggy" type="telematics.py" />

rb_ws/src/buggy/scripts/debug/debug_steer.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ def __init__(self, self_name) -> None:
2424

2525
# Outputs a continuous sine wave ranging from -50 to 50, with a period of 500 ticks
2626
def sin_steer(self, tick_count):
27-
return 50 * np.sin((2 * np.pi) * tick_count/500)
27+
return 20 * np.sin((2 * np.pi) * tick_count/1000)
2828

2929
#returns a constant steering angle of 42 degrees
3030
def constant_steer(self, _):
@@ -42,6 +42,7 @@ def loop(self):
4242

4343
tick_count += 1
4444
steer_cmd = self.sin_steer(tick_count)
45+
# print(steer_cmd)
4546
rate.sleep()
4647

4748

setup_prod.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -87,10 +87,10 @@ cp cuda-requirements.txt docker_auton
8787
mv docker_auton/cuda-requirements.txt docker_auton/cuda-requirements_TEMP_DO_NOT_EDIT.txt
8888

8989
echo "Building containers..."
90-
docker compose -f $dockerfile build
90+
docker-compose -f $dockerfile build
9191

9292
echo "Starting containers..."
93-
docker compose -f $dockerfile --env-file .env.prod up -d
93+
docker-compose -f $dockerfile --env-file .env.prod up -d
9494

9595
sleep 0.5
9696

0 commit comments

Comments
 (0)