Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Develop #16

Merged
merged 153 commits into from
Dec 20, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
153 commits
Select commit Hold shift + click to select a range
c37bbc3
add files and start node
supertoto29 Sep 3, 2021
7ae9665
add files start node
supertoto29 Sep 3, 2021
05d78ad
fix for compilation
supertoto29 Sep 3, 2021
aa717e2
fix constructor
supertoto29 Sep 3, 2021
1d673ed
update package.xml
supertoto29 Sep 3, 2021
1b1d50f
version bump
supertoto29 Sep 3, 2021
dc73c20
fix compilation run_depend to exec_depend
supertoto29 Sep 3, 2021
e3d1285
change devcontainer.json
supertoto29 Sep 3, 2021
100aba5
add serial connection
supertoto29 Sep 3, 2021
4d38f8b
change private variables
supertoto29 Sep 3, 2021
0b00cb7
change order for initialization
supertoto29 Sep 3, 2021
97e9744
test of node
supertoto29 Sep 3, 2021
64a3ced
from unneed files
supertoto29 Sep 3, 2021
f44c33a
change for launch
supertoto29 Sep 3, 2021
b506477
remove bootstrap
supertoto29 Sep 3, 2021
5f12872
starting the node
supertoto29 Sep 6, 2021
1221b57
add checksum same as IMU
supertoto29 Sep 7, 2021
4140b7b
start transmit
supertoto29 Sep 7, 2021
bf06352
fix condition
supertoto29 Sep 7, 2021
052e4ef
Merge pull request #1 from sonia-auv/feature/init-node
supertoto29 Sep 7, 2021
d559c35
start working with the sensor
supertoto29 Sep 8, 2021
d9f6272
add license for serial.cc and serial.h
supertoto29 Sep 8, 2021
193739a
change path for usb to debug
supertoto29 Sep 8, 2021
2e838b9
fix dialout for sonia user in the docker
supertoto29 Sep 8, 2021
b1c8136
changes to the code
supertoto29 Sep 8, 2021
fd50b40
start to add error gestion
supertoto29 Sep 8, 2021
2366e24
add logs
supertoto29 Sep 8, 2021
7753fe7
fix bool function
supertoto29 Sep 8, 2021
87fafb0
add verification of sensor version
supertoto29 Sep 8, 2021
f99669a
test for fixed branch
supertoto29 Sep 8, 2021
b037d0e
change the checksum
supertoto29 Sep 8, 2021
f64e39f
test crc8 failed
supertoto29 Sep 8, 2021
d4f5c8c
got checksum to work
supertoto29 Sep 9, 2021
8a4d625
add features for config of the sensor
supertoto29 Sep 10, 2021
b14d828
add check for cmd and flush CMD
supertoto29 Sep 12, 2021
6fa57c9
change lauch for 2 subs
supertoto29 Sep 12, 2021
f245d9b
add config files
supertoto29 Sep 12, 2021
a6113d1
add different launch file for auvs
supertoto29 Sep 12, 2021
c4d14dd
change debug msg for errors to ROS_ASSERT_MSG
supertoto29 Sep 12, 2021
166badf
add definitions to sonia common
supertoto29 Sep 12, 2021
b91509a
service starts
supertoto29 Sep 12, 2021
b9be893
change service
supertoto29 Sep 13, 2021
ba56b53
fix the init loop
supertoto29 Sep 13, 2021
e9d7fc3
structure with the service
supertoto29 Sep 13, 2021
66b588b
add error message
supertoto29 Sep 13, 2021
3d1e2db
bump package
supertoto29 Sep 13, 2021
3c7f483
Fix typo
supertoto29 Sep 13, 2021
a3afba8
add service functionnality
supertoto29 Sep 13, 2021
de43f94
cleanup code
supertoto29 Sep 13, 2021
0e2062a
code cleanup
supertoto29 Sep 13, 2021
066feac
finish cleanup
supertoto29 Sep 13, 2021
0f9539c
remove definitions
supertoto29 Sep 13, 2021
0a13167
Add multiple send
supertoto29 Sep 13, 2021
e62a5ab
small changes to multiples send
supertoto29 Sep 13, 2021
c9d2efc
fix typo
supertoto29 Sep 13, 2021
907cdfe
add feature from multiple package
supertoto29 Sep 14, 2021
ffdeb42
Merge pull request #2 from sonia-auv/feature/add-usb-com
supertoto29 Sep 14, 2021
59de27a
Merge pull request #3 from sonia-auv/feature/separate_send
supertoto29 Sep 14, 2021
85ef9bc
start the lost packet management
supertoto29 Sep 17, 2021
4853806
added roles for manage packet
supertoto29 Sep 17, 2021
2327a5f
fix typo
supertoto29 Sep 17, 2021
928d4de
modify serial for timeout to work resend after 10s
supertoto29 Sep 18, 2021
4b555a9
fct for managing packet for master and slave
supertoto29 Sep 18, 2021
d00718f
bump package
supertoto29 Sep 18, 2021
6aa43e3
slave configuration
supertoto29 Sep 18, 2021
9e5fc88
Merge branch 'feature/lost-package-management' of github.com:sonia-au…
supertoto29 Sep 18, 2021
a5744ba
added queue protection and package lost
supertoto29 Sep 18, 2021
744b54e
Update sharedQueue.h
supertoto29 Sep 21, 2021
7a5648a
Merge pull request #4 from sonia-auv/feature/lost-package-management
0x72D0 Sep 22, 2021
6e4b554
fix transmit for master. Thread was going crazy
supertoto29 Sep 24, 2021
002500d
fixing the image name on fix workflow
supertoto29 Sep 24, 2021
873ebbe
test for environement variable
supertoto29 Sep 24, 2021
adbaf12
change in dev container
supertoto29 Sep 24, 2021
d7e8357
env variable is set
supertoto29 Sep 25, 2021
d375410
use env variables for launch files
supertoto29 Sep 25, 2021
5dc777a
fix the init sequence
supertoto29 Sep 26, 2021
d045046
ready for pool test & change inverted checksum
supertoto29 Sep 27, 2021
2594b2b
fix service
supertoto29 Sep 27, 2021
1e6fa50
fix typo
supertoto29 Sep 27, 2021
cfe7b24
change service init to match the proc
supertoto29 Sep 27, 2021
b7b4cfa
Merge pull request #5 from sonia-auv/fix/transmit
supertoto29 Sep 27, 2021
230ab96
Add flush cmd to service
supertoto29 Sep 27, 2021
ffd83d5
fix switch case missing break
supertoto29 Sep 27, 2021
fe48a83
move define to sonia common
supertoto29 Sep 27, 2021
94d76af
add checkum for service
supertoto29 Sep 28, 2021
2177a4b
change queue stream message
supertoto29 Sep 28, 2021
0b7f44d
added extra sleep for slave read
supertoto29 Sep 28, 2021
1228437
change sleep for the read packet
supertoto29 Sep 28, 2021
421c5b1
Merge branch 'fix/local-launch' of github.com:sonia-auv/provider_unde…
supertoto29 Sep 28, 2021
96729e0
add rate, slave cmd check & send_cmd functions
supertoto29 Sep 29, 2021
f19d652
fix checksum with zero paddings
supertoto29 Sep 29, 2021
4aa4e7a
reduce ros_info quantity
supertoto29 Sep 29, 2021
50ef423
fix error
supertoto29 Sep 29, 2021
6260d39
add read mutex to stop the thread race
supertoto29 Sep 29, 2021
3fa3962
change read thread
supertoto29 Sep 29, 2021
91954da
fix typo
supertoto29 Sep 29, 2021
c109fa8
clean up the master send & receive
supertoto29 Sep 29, 2021
2767017
test without mutex
supertoto29 Sep 29, 2021
80fbe00
had sleep and redo for master
supertoto29 Sep 30, 2021
1583382
redo the command if no answer
supertoto29 Sep 30, 2021
4894eb7
add send for master
supertoto29 Sep 30, 2021
db5250f
code cleanup
supertoto29 Oct 1, 2021
6595819
added debug and checks to avoid deadlocks
supertoto29 Oct 1, 2021
c7baa32
added empty queues
supertoto29 Oct 1, 2021
e0b0c9a
increase rate
supertoto29 Oct 1, 2021
347e6ef
test with master sending message once
supertoto29 Oct 1, 2021
37d9e79
nothing to say
supertoto29 Oct 1, 2021
dc3d408
fix workflow feature
supertoto29 Oct 1, 2021
9bbee18
Merge branch 'feature/master-non-blocking' of github.com:sonia-auv/pr…
supertoto29 Oct 1, 2021
1b2da51
Merge pull request #6 from sonia-auv/fix/local-launch
supertoto29 Oct 4, 2021
86e13c7
Merge pull request #7 from sonia-auv/fix/clean-up
supertoto29 Oct 15, 2021
65ecf01
change to simple driver
supertoto29 Oct 23, 2021
a6b7f2d
change init functions
supertoto29 Oct 23, 2021
7d04e03
switch to string instead of shared queue
supertoto29 Oct 24, 2021
a3b16d5
change in service to reduce code size
supertoto29 Oct 24, 2021
d8106c7
Update package.xml
supertoto29 Oct 24, 2021
5f3a513
add definitions for rapid developement
supertoto29 Oct 24, 2021
34d254a
add service for setting modem
supertoto29 Oct 24, 2021
7df8c75
change base image to latest
supertoto29 Oct 25, 2021
a06e79e
add debug message
supertoto29 Oct 25, 2021
d590e62
remove ros topic and service from destructor
supertoto29 Oct 25, 2021
4ed0e73
add more debug message
supertoto29 Oct 25, 2021
1058689
remove serial flush at the start
supertoto29 Oct 25, 2021
5488f56
remove unned ros_info
supertoto29 Oct 25, 2021
7363b90
remove string clear unneed
supertoto29 Oct 25, 2021
6f1f74b
bump package
supertoto29 Oct 25, 2021
d8da306
retry with O_NDELAY
supertoto29 Oct 25, 2021
a12fffc
increase rate for read
supertoto29 Oct 25, 2021
8e6c3a8
reverts changes
supertoto29 Oct 25, 2021
39b4c5d
add rate and comment debug message
supertoto29 Oct 25, 2021
870b7a9
change position for setting up sensor
supertoto29 Oct 25, 2021
7e14047
give time for thread to start
supertoto29 Oct 25, 2021
5223079
remove debug message
supertoto29 Oct 25, 2021
02feda4
back to shared Queue
supertoto29 Oct 25, 2021
d15e23b
change serial constructor
supertoto29 Oct 25, 2021
bf83fad
Merge pull request #8 from sonia-auv/fix/refactor-driver
supertoto29 Oct 26, 2021
b312ab4
fix workflow for package
supertoto29 Oct 26, 2021
f21bfa8
Merge pull request #9 from sonia-auv/fix/refactor-driver
supertoto29 Oct 27, 2021
403eace
starting the custom packet. Problem with the array
supertoto29 Oct 28, 2021
514a824
change to char array to test
supertoto29 Nov 8, 2021
e58ffe5
conversion from string to char array complete
supertoto29 Nov 8, 2021
3431ffc
prevent decay of array
supertoto29 Nov 8, 2021
2e9dd97
decay removed send and receive working
supertoto29 Nov 8, 2021
a0b2af2
remove from local project definition
supertoto29 Nov 8, 2021
d28faa2
add send to ROS. to test
supertoto29 Nov 22, 2021
765b9ed
test to change made to parse message
supertoto29 Nov 24, 2021
47d2dec
fix export to ros hardcoded
supertoto29 Nov 29, 2021
c2d4130
fix export to ros array to msg
supertoto29 Nov 29, 2021
098879d
fix send message
supertoto29 Nov 29, 2021
96759dd
remove comments
supertoto29 Dec 16, 2021
876e95f
remove sharedqueue not used
supertoto29 Dec 16, 2021
6d09c59
remove the custom packet from provider
supertoto29 Dec 16, 2021
8f615de
Merge pull request #15 from sonia-auv/feature/move-custom-mesg
supertoto29 Dec 19, 2021
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 6 additions & 4 deletions .devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// For format details, see https://aka.ms/vscode-remote/devcontainer.json or this file's README at:
// https://github.com/microsoft/vscode-dev-containers/tree/v0.128.0/containers/docker-existing-dockerfile
{
"name": "<ENTER_YOUR_NODE_NAME>",
"name": "provider_underwater_com",
// Sets the run context to one level up instead of the .devcontainer folder.
"context": "..",
// Update the 'dockerFile' property if you aren't using the standard 'Dockerfile' filename.
Expand All @@ -19,12 +19,14 @@
"--security-opt",
"seccomp=unconfined",
"--rm",
"--privileged",
"--network",
"host"
],
"mounts": [
"source=vscode-server-extension,target=/home/sonia/.vscode-server/extensions,type=volume"
"source=vscode-server-extension,target=/home/sonia/.vscode-server/extensions,type=volume",
"source=/dev,target=/dev,type=bind"
],
"workspaceMount": "target=/home/sonia/ros_sonia_ws/src/<ENTER_YOUR_NODE_NAME>,type=volume",
"workspaceFolder": "/home/sonia/ros_sonia_ws/src/<ENTER_YOUR_NODE_NAME>"
"workspaceMount": "target=/home/sonia/ros_sonia_ws/src/provider_underwater_com,type=volume",
"workspaceFolder": "/home/sonia/ros_sonia_ws/src/provider_underwater_com"
}
4 changes: 2 additions & 2 deletions .github/workflows/docker-image-perception-develop.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
ARCH: x86
TARGET_TYPE: perception
TARGET_VERSION: develop
IMAGE_NAME: template_name
IMAGE_NAME: provider_underwater_com
GITHUB_REMOTE_URL: docker.pkg.github.com/${{ github.repository }}
steps:
- uses: actions/checkout@v2
Expand Down Expand Up @@ -45,7 +45,7 @@ jobs:
ARCH: arm64
TARGET_TYPE: perception
TARGET_VERSION: develop
IMAGE_NAME: template_name
IMAGE_NAME: provider_underwater_com
GITHUB_REMOTE_URL: docker.pkg.github.com/${{ github.repository }}
steps:
- uses: actions/checkout@v2
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/docker-image-perception-feature.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
ARCH: x86
TARGET_TYPE: perception
TARGET_VERSION: feature
IMAGE_NAME: template_name
IMAGE_NAME: provider_underwater_com
GITHUB_REMOTE_URL: docker.pkg.github.com/${{ github.repository }}
steps:
- uses: actions/checkout@v2
Expand All @@ -40,7 +40,7 @@ jobs:
ARCH: arm64
TARGET_TYPE: perception
TARGET_VERSION: feature
IMAGE_NAME: template_name
IMAGE_NAME: provider_underwater_com
GITHUB_REMOTE_URL: docker.pkg.github.com/${{ github.repository }}
steps:
- uses: actions/checkout@v2
Expand Down
103 changes: 103 additions & 0 deletions .github/workflows/docker-image-perception-fix.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,103 @@
name: Docker Image CI - Fix Branch

on:
push:
branches: [fix/**]

jobs:
build-ros-perception-x86-64:
name: "Build ROS perception X86/64"
runs-on: ubuntu-latest
env:
BASE_IMAGE: "docker.pkg.github.com/sonia-auv/sonia_common/sonia_common:x86-perception-latest"
ARCH: x86
TARGET_TYPE: perception
TARGET_VERSION: fix
IMAGE_NAME: provider_underwater_com
GITHUB_REMOTE_URL: docker.pkg.github.com/${{ github.repository }}
steps:
- uses: actions/checkout@v2
- name: Login to Github Package Registry
run: |
echo "${{ secrets.GITHUB_TOKEN }}" | docker login docker.pkg.github.com -u ${{ github.actor }} --password-stdin
- name: Build the docker image (perception based)
run: |
docker build . --tag build-fix-${GITHUB_REF##*/}-${GITHUB_RUN_NUMBER} --build-arg BUILD_DATE=$(date '+%Y-%m-%d_%H:%M:%S') --build-arg VERSION=${GITHUB_REF##*/}-$(date ' +%Y-%m-%d_%H:%M:%S') --build-arg BASE_IMAGE=${BASE_IMAGE}

- name: Create Docker Image Tag
run: |
docker tag build-fix-${GITHUB_REF##*/}-${GITHUB_RUN_NUMBER} ${GITHUB_REMOTE_URL}/${IMAGE_NAME}:${ARCH}-${TARGET_TYPE}-${TARGET_VERSION}-${GITHUB_REF##*/}

- name: Push Image to Github Packages Registry
run: |
docker push --all-tags ${GITHUB_REMOTE_URL}/${IMAGE_NAME}

build-ros-perception-arm64:
name: "Build ROS perception ARM64"
runs-on: ubuntu-latest
env:
BASE_IMAGE: "docker.pkg.github.com/sonia-auv/sonia_common/sonia_common:arm64-perception-latest"
ARCH: arm64
TARGET_TYPE: perception
TARGET_VERSION: fix
IMAGE_NAME: provider_underwater_com
GITHUB_REMOTE_URL: docker.pkg.github.com/${{ github.repository }}
steps:
- uses: actions/checkout@v2
- name: Login to Github Package Registry
run: |
echo "${{ secrets.GITHUB_TOKEN }}" | docker login docker.pkg.github.com -u ${{ github.actor }} --password-stdin
- name: Enable Docker Daemon Experimental Fixes
run: |
sudo rm /etc/docker/daemon.json
echo '{"experimental": true , "cgroup-parent": "/actions_job" }' | sudo tee -a /etc/docker/daemon.json
sudo service docker restart
docker version

- name: Install QEMU to be able to compile on X86 into ARM64
run: |
sudo apt-get update
sudo apt-get install qemu binfmt-support qemu-user-static
docker run --rm --privileged multiarch/qemu-user-static --reset -p yes

- name: Build the docker image (perception based)
run: |
docker build . --tag build-fix-${GITHUB_REF##*/}-${GITHUB_RUN_NUMBER} --build-arg BUILD_DATE=$(date '+%Y-%m-%d_%H:%M:%S') --build-arg VERSION=${GITHUB_REF##*/}-$(date ' +%Y-%m-%d_%H:%M:%S') --build-arg BASE_IMAGE=${BASE_IMAGE}

- name: Create Docker Image Tag
run: |
docker tag build-fix-${GITHUB_REF##*/}-${GITHUB_RUN_NUMBER} ${GITHUB_REMOTE_URL}/${IMAGE_NAME}:${ARCH}-${TARGET_TYPE}-${TARGET_VERSION}-${GITHUB_REF##*/}

- name: Push Image to Github Packages Registry
run: |
docker push --all-tags ${GITHUB_REMOTE_URL}/${IMAGE_NAME}

notify-success:
name: "Notify Slack - Success"
runs-on: ubuntu-latest
needs: [build-ros-perception-x86-64, build-ros-perception-arm64]
if: success()
steps:
- name: Notify Slack Success
env:
SLACK_BOT_TOKEN: ${{ secrets.SLACK_BOT_TOKEN }}
uses: voxmedia/github-action-slack-notify-build@v1
with:
channel: github-ci-notifications
status: SUCCESS
color: good

notify-fail:
name: "Notify Slack - Failure"
runs-on: ubuntu-latest
needs: [build-ros-perception-x86-64, build-ros-perception-arm64]
if: failure()
steps:
- name: Notify Slack Fail
env:
SLACK_BOT_TOKEN: ${{ secrets.SLACK_BOT_TOKEN }}
uses: voxmedia/github-action-slack-notify-build@v1
with:
channel: github-ci-notifications
status: FAILED
color: danger
4 changes: 2 additions & 2 deletions .github/workflows/docker-image-perception-master.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
BASE_IMAGE: "docker.pkg.github.com/sonia-auv/sonia_common/sonia_common:x86-perception-latest"
ARCH: x86
TARGET_TYPE: perception
IMAGE_NAME: template_name
IMAGE_NAME: provider_underwater_com
GITHUB_REMOTE_URL: docker.pkg.github.com/${{ github.repository }}
steps:
- uses: actions/checkout@v2
Expand Down Expand Up @@ -48,7 +48,7 @@ jobs:
BASE_IMAGE: "docker.pkg.github.com/sonia-auv/sonia_common/sonia_common:arm64-perception-latest"
ARCH: arm64
TARGET_TYPE: perception
IMAGE_NAME: template_name
IMAGE_NAME: provider_underwater_com
GITHUB_REMOTE_URL: docker.pkg.github.com/${{ github.repository }}
steps:
- uses: actions/checkout@v2
Expand Down
4 changes: 2 additions & 2 deletions .vscode/launch.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"type": "ros",
"request": "launch",
"preLaunchTask": "build",
"target": "/home/sonia/ros_sonia_ws/src/<ENTER_YOUR_NODE_NAME>/launch/<ENTER_YOUR_NODE_NAME>.launch",
"target": "/home/sonia/ros_sonia_ws/src/provider_underwater_com/launch/provider_underwater_com.launch",
}
]
}
}
68 changes: 67 additions & 1 deletion .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,71 @@
"python.autoComplete.extraPaths": [
"/home/sonia/base_lib_ws/devel/lib/python2.7/dist-packages",
"/opt/ros/melodic/lib/python2.7/dist-packages"
]
],
"python.analysis.extraPaths": [
"/home/sonia/base_lib_ws/devel/lib/python2.7/dist-packages",
"/opt/ros/melodic/lib/python2.7/dist-packages"
],
"files.associations": {
"cctype": "cpp",
"clocale": "cpp",
"cmath": "cpp",
"cstdarg": "cpp",
"cstddef": "cpp",
"cstdio": "cpp",
"cstdlib": "cpp",
"cstring": "cpp",
"ctime": "cpp",
"cwchar": "cpp",
"cwctype": "cpp",
"array": "cpp",
"atomic": "cpp",
"strstream": "cpp",
"*.tcc": "cpp",
"bitset": "cpp",
"chrono": "cpp",
"complex": "cpp",
"condition_variable": "cpp",
"cstdint": "cpp",
"deque": "cpp",
"list": "cpp",
"unordered_map": "cpp",
"vector": "cpp",
"exception": "cpp",
"fstream": "cpp",
"functional": "cpp",
"initializer_list": "cpp",
"iomanip": "cpp",
"iosfwd": "cpp",
"iostream": "cpp",
"istream": "cpp",
"limits": "cpp",
"mutex": "cpp",
"new": "cpp",
"ostream": "cpp",
"numeric": "cpp",
"ratio": "cpp",
"sstream": "cpp",
"stdexcept": "cpp",
"streambuf": "cpp",
"system_error": "cpp",
"thread": "cpp",
"cfenv": "cpp",
"cinttypes": "cpp",
"tuple": "cpp",
"type_traits": "cpp",
"utility": "cpp",
"typeindex": "cpp",
"typeinfo": "cpp",
"algorithm": "cpp",
"iterator": "cpp",
"map": "cpp",
"memory": "cpp",
"memory_resource": "cpp",
"optional": "cpp",
"random": "cpp",
"set": "cpp",
"string": "cpp",
"string_view": "cpp"
}
}
53 changes: 0 additions & 53 deletions BOOTSTRAP.md

This file was deleted.

Loading