Skip to content

Commit e0a4f99

Browse files
mstep44mstep44
authored
Merge pull request #14 from Delta-Robotics-Inc/bugfix/linux-discover
Bugfix/linux discover
2 parents d25446f + fffd68f commit e0a4f99

File tree

80 files changed

+5775
-3942
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

80 files changed

+5775
-3942
lines changed

‎.devcontainer/devcontainer.json

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
// For format details, see https://aka.ms/devcontainer.json. For config options, see the
2+
// README at: https://github.com/devcontainers/templates/tree/main/src/ubuntu
3+
{
4+
"name": "Ubuntu with Python 3.11 and COM port passthrough",
5+
"build": {
6+
"dockerfile": "../Dockerfile"
7+
},
8+
// Run `ls -l /dev/ttyS*` on your system (bash or WSL) and add the devices you want to use here
9+
"runArgs": [
10+
"--device=/dev/ttyS0",
11+
"--device=/dev/ttyS1",
12+
"--device=/dev/ttyS2",
13+
"--device=/dev/ttyS3"
14+
],
15+
"forwardPorts": [],
16+
"postCreateCommand": "sudo chmod a+rw /dev/ttyS*",
17+
"remoteUser": "vscode"
18+
}
19+

‎.github/workflows/pypublish.yml

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

‎.gitignore

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,11 @@
1-
test-env/
2-
asus-test-env/
3-
ThermoflexSessions/
4-
ExampleSessions/
5-
devtest/
6-
scratch/
7-
communication/
1+
test-env/
2+
asus-venv/
3+
asus-venv311/
4+
venv*
5+
6+
ThermoflexSessions/
7+
ExampleSessions/
8+
devtest/
9+
scratch/
10+
communication/
811
protoc-28.2-win64/

‎.vscode/settings.json

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
11
{
2-
"files.autoSave": "afterDelay"
2+
"python.analysis.extraPaths": [
3+
"./python-serial/src"
4+
]
35
}

‎Dockerfile

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
# Use the Ubuntu Jammy base from Microsoft’s devcontainer images
2+
FROM mcr.microsoft.com/devcontainers/base:jammy
3+
4+
# Install prerequisites and add the deadsnakes PPA for Python 3.11
5+
RUN apt-get update && \
6+
apt-get install -y software-properties-common && \
7+
add-apt-repository ppa:deadsnakes/ppa && \
8+
apt-get update && \
9+
apt-get install -y python3.11 python3.11-venv python3.11-dev python3-pip && \
10+
apt-get clean && rm -rf /var/lib/apt/lists/*
11+
12+
# Set the default python3 to point to Python 3.11
13+
RUN update-alternatives --install /usr/bin/python3 python3 /usr/bin/python3.11 1
14+
15+
# Optionally, upgrade pip
16+
RUN python3 -m pip install --upgrade pip
17+
18+
# Create the dialout group if it doesn't exist and add the vscode user to it
19+
RUN groupadd -f dialout && usermod -aG dialout vscode
20+
21+
# Set default shell to bash
22+
SHELL ["/bin/bash", "-c"]

‎ExampleSessions/output/logdata_output.csv

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
1-
DATETIME,DEVICE ID,STATUS TYPE,uptime,errors,volt_supply,pot_values,can_id,firmware,board_ver,muscle_count,log_interval,vrd_scalar,vrd_offset,max_current,min_v_supply,enable_status,control_mode,pwm_out,load_amps,load_voltdrop,load_ohms,SMA_default_mode,SMA_default_setpoint,SMA_rcontrol_kp,SMA_rcontrol_ki,SMA_rcontrol_kd,vld_scalar,vld_offset,r_sns_ohms,amp_gain,af_mohms,delta_mohms,trainstate
2-
11/18/2024 16:53:50.755,66051,status node dump,647,255,3.817204475402832,0.4713541567325592,0,0.0,0.0,2,500,0.05376344174146652,0.0,80.0,7.0,,,,,,,,,,,,,,,,,,
3-
11/18/2024 16:53:51.565,66051,status node compact,648,255,3.826164722442627,0.470703125,,,,,,,,,,,,,,,,,,,,,,,,,,,
4-
11/18/2024 16:53:51.862,66051,status node compact,649,255,3.822580575942993,0.4713541567325592,,,,,,,,,,,,,,,,,,,,,,,,,,,
5-
11/18/2024 16:53:52.461,66051,status node compact,649,255,3.8189964294433594,0.4710286557674408,,,,,,,,,,,,,,,,,,,,,,,,,,,
6-
11/18/2024 16:53:53.658,66051,status node compact,650,255,3.8189964294433594,0.4710286557674408,,,,,,,,,,,,,,,,,,,,,,,,,,,
7-
11/18/2024 16:53:54.260,66051,status node compact,651,255,3.8189964294433594,0.4716796875,,,,,,,,,,,,,,,,,,,,,,,,,,,
8-
11/18/2024 16:53:54.861,66051,status node compact,652,255,3.817204475402832,0.4713541567325592,,,,,,,,,,,,,,,,,,,,,,,,,,,
9-
11/18/2024 16:53:55.462,66051,status node compact,652,255,3.826164722442627,0.4713541567325592,,,,,,,,,,,,,,,,,,,,,,,,,,,
10-
11/18/2024 16:53:56.665,66051,status node compact,653,255,3.817204475402832,0.4720052182674408,,,,,,,,,,,,,,,,,,,,,,,,,,,
11-
11/18/2024 16:53:57.271,66051,status node compact,654,255,3.813620090484619,0.4716796875,,,,,,,,,,,,,,,,,,,,,,,,,,,
12-
11/18/2024 16:53:57.890,66051,status node compact,655,255,3.820788621902466,0.4716796875,,,,,,,,,,,,,,,,,,,,,,,,,,,
13-
11/18/2024 16:53:58.750,66051,status node compact,655,255,3.820788621902466,0.4713541567325592,,,,,,,,,,,,,,,,,,,,,,,,,,,
14-
11/18/2024 16:53:59.677,66051,status node compact,656,255,3.8189964294433594,0.4713541567325592,,,,,,,,,,,,,,,,,,,,,,,,,,,
1+
DATETIME,DEVICE ID,STATUS TYPE,uptime,errors,volt_supply,pot_values,can_id,firmware,board_ver,muscle_count,log_interval,vrd_scalar,vrd_offset,max_current,min_v_supply,enable_status,control_mode,pwm_out,load_amps,load_voltdrop,load_ohms,SMA_default_mode,SMA_default_setpoint,SMA_rcontrol_kp,SMA_rcontrol_ki,SMA_rcontrol_kd,vld_scalar,vld_offset,r_sns_ohms,amp_gain,af_mohms,delta_mohms,trainstate
2+
11/18/2024 16:53:50.755,66051,status node dump,647,255,3.817204475402832,0.4713541567325592,0,0.0,0.0,2,500,0.05376344174146652,0.0,80.0,7.0,,,,,,,,,,,,,,,,,,
3+
11/18/2024 16:53:51.565,66051,status node compact,648,255,3.826164722442627,0.470703125,,,,,,,,,,,,,,,,,,,,,,,,,,,
4+
11/18/2024 16:53:51.862,66051,status node compact,649,255,3.822580575942993,0.4713541567325592,,,,,,,,,,,,,,,,,,,,,,,,,,,
5+
11/18/2024 16:53:52.461,66051,status node compact,649,255,3.8189964294433594,0.4710286557674408,,,,,,,,,,,,,,,,,,,,,,,,,,,
6+
11/18/2024 16:53:53.658,66051,status node compact,650,255,3.8189964294433594,0.4710286557674408,,,,,,,,,,,,,,,,,,,,,,,,,,,
7+
11/18/2024 16:53:54.260,66051,status node compact,651,255,3.8189964294433594,0.4716796875,,,,,,,,,,,,,,,,,,,,,,,,,,,
8+
11/18/2024 16:53:54.861,66051,status node compact,652,255,3.817204475402832,0.4713541567325592,,,,,,,,,,,,,,,,,,,,,,,,,,,
9+
11/18/2024 16:53:55.462,66051,status node compact,652,255,3.826164722442627,0.4713541567325592,,,,,,,,,,,,,,,,,,,,,,,,,,,
10+
11/18/2024 16:53:56.665,66051,status node compact,653,255,3.817204475402832,0.4720052182674408,,,,,,,,,,,,,,,,,,,,,,,,,,,
11+
11/18/2024 16:53:57.271,66051,status node compact,654,255,3.813620090484619,0.4716796875,,,,,,,,,,,,,,,,,,,,,,,,,,,
12+
11/18/2024 16:53:57.890,66051,status node compact,655,255,3.820788621902466,0.4716796875,,,,,,,,,,,,,,,,,,,,,,,,,,,
13+
11/18/2024 16:53:58.750,66051,status node compact,655,255,3.820788621902466,0.4713541567325592,,,,,,,,,,,,,,,,,,,,,,,,,,,
14+
11/18/2024 16:53:59.677,66051,status node compact,656,255,3.8189964294433594,0.4713541567325592,,,,,,,,,,,,,,,,,,,,,,,,,,,

0 commit comments

Comments
 (0)