Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
494 commits
Select commit Hold shift + click to select a range
ca4486b
pre test
carperca23 May 10, 2024
980ce94
pre test funciona
carperca23 May 11, 2024
233256c
ahora sí k sí
alvarolp02 May 11, 2024
8eaa67e
a
alvarolp02 May 11, 2024
8e3f5e5
a
alvarolp02 May 11, 2024
3bb3e6f
e
alvarolp02 May 11, 2024
5d8cc91
test 1
carperca23 May 11, 2024
acab18f
test senos y circuitillo funciona
carperca23 May 11, 2024
3c80268
test 2
alvarolp02 May 11, 2024
f1634f1
test más cerca de funcionar
carperca23 May 11, 2024
f8220df
100Hz control and automatic epos_lib_path
alvarolp02 May 12, 2024
ab26922
rosbag record added to launch files
alvarolp02 May 15, 2024
2c48101
mpc control implementation
alvarolp02 May 16, 2024
400e1c1
deleted folder
alvarolp02 May 16, 2024
667de60
mpc folder added
alvarolp02 May 16, 2024
f007302
Created slam that uses ICP
Joroba3 May 16, 2024
f35a78e
[feat]: Implement braking procedure on AS_FInished status/WIP
Angelgares May 16, 2024
46c58a2
custom point type with errors
alvarolp02 May 16, 2024
b9f57f6
[refactor]: Ensure consistent PID application during braking/WIP
Angelgares May 16, 2024
9c6faee
nodes changed from Map to PointCloud2
alvarolp02 May 16, 2024
674797e
break control corrected
alvarolp02 May 17, 2024
b9e1881
Merge pull request #52 from ARUSfs/feature/slam_marrano
alvarolp02 May 17, 2024
6949db8
joystick implementation
carperca23 May 17, 2024
79bd12c
Merge branch 'feature/tests' of https://github.com/ARUSfs/DRIVERLESS …
carperca23 May 17, 2024
95e99c6
joystick bueno
carperca23 May 17, 2024
82e277e
Merge branch 'feature/tests' of https://github.com/ARUSfs/DRIVERLESS …
carperca23 May 17, 2024
6143540
Merge branch 'develop' into feature/tests
alvarolp02 May 17, 2024
ad43b5b
joysticj bueno bueno
carperca23 May 17, 2024
72f24d4
Merge pull request #53 from ARUSfs/feature/tests
alvarolp02 May 17, 2024
de7c26b
merge problems corrected
alvarolp02 May 17, 2024
4b26164
lidar code optimized
alvarolp02 May 17, 2024
2c731b9
inspection simplified
alvarolp02 May 17, 2024
cca2dc6
[refator]: PS4 Joystick range smooth
Angelgares May 17, 2024
8e9baa4
params adjusted
alvarolp02 May 18, 2024
df36001
Merge branch 'feature/pretest_17_05' of github.com:ARUSfs/DRIVERLESS …
alvarolp02 May 18, 2024
a081037
data association adapted to pointCloud2 perception
alvarolp02 May 18, 2024
df0c2c2
Merge pull request #54 from ARUSfs/feature/pretest_17_05
alvarolp02 May 18, 2024
43beeee
compilation problems fixed
alvarolp02 May 18, 2024
c6cb072
Changed variables and removed other to improve readability
Joroba3 May 19, 2024
d2eb692
Merge pull request #55 from ARUSfs/feature/slam_corrections
alvarolp02 May 19, 2024
1cbb834
Merge branch 'develop' into feature/mpc_controller
alvarolp02 May 21, 2024
b728806
Merge pull request #56 from ARUSfs/feature/mpc_controller
alvarolp02 May 21, 2024
39ac58a
errors fixed and controller reorganized
alvarolp02 May 22, 2024
2d9fc9a
controller config added
alvarolp02 May 22, 2024
6246542
Merge pull request #58 from ARUSfs/feature/hotfix
alvarolp02 May 22, 2024
0bb2bcc
brake control added
alvarolp02 May 24, 2024
3691a58
params adjusted
alvarolp02 May 24, 2024
7c84c38
[test]: Speed controller
Angelgares May 24, 2024
7f68b1e
ahora sí fufa
alvarolp02 May 24, 2024
948b1bb
accel. control prototype
alvarolp02 May 25, 2024
b84f08d
AS_status semaphore
alvarolp02 May 25, 2024
f8e5d0c
senos funcionan
alvarolp02 May 25, 2024
a665d97
fin de test
alvarolp02 May 26, 2024
1293358
Created PP_cpp package and some base classes
Joroba3 May 26, 2024
2ec36d2
mantener dirección cuando se pierde la ruta
alvarolp02 May 26, 2024
87070a0
Finished class that calculates the pursuit point given the path and …
Joroba3 May 26, 2024
734e4e7
Changed path type and moved header file
Joroba3 May 26, 2024
4dbfdf4
fixes from rosbags
alvarolp02 May 26, 2024
33f2548
acceleration fixed
alvarolp02 May 26, 2024
b9a4510
controller with config and launchs fixed
alvarolp02 May 26, 2024
0a94ede
WIP finishing controller node
Joroba3 May 26, 2024
e0fa9c2
Merge pull request #59 from ARUSfs/feature/test_25_05
alvarolp02 May 26, 2024
8ac3f74
launchs hotfix
alvarolp02 May 26, 2024
d228748
Merge pull request #61 from ARUSfs/feature/hotfix
alvarolp02 May 26, 2024
df0a898
LQR params adjusted
alvarolp02 May 26, 2024
8bf17f0
can bus filters
alvarolp02 May 27, 2024
18f19bf
inspection params
alvarolp02 May 27, 2024
7a00dc8
can filters activated
alvarolp02 May 27, 2024
1f11a9c
fin de test
alvarolp02 May 28, 2024
6cc5ec7
Merge pull request #63 from ARUSfs/feature/test_27_05
alvarolp02 May 28, 2024
29ba273
v0.2
gxnzalx55 May 29, 2024
c7b4db4
v0.2
gxnzalx55 May 29, 2024
3552bde
v0.3
gxnzalx55 May 29, 2024
edb38fc
v1.0
gxnzalx55 May 29, 2024
27d7f3e
Merge pull request #64 from ARUSfs/feature/car_state_implementation
alvarolp02 May 29, 2024
c507fc2
global pp almost working
alvarolp02 May 30, 2024
fd258be
global pp working
alvarolp02 May 30, 2024
05e6490
Comienzos del can_c
carperca23 May 31, 2024
56bccb6
can c ++ V0.1
carperca23 Jun 1, 2024
4e4f6bb
fix canBusOn
carperca23 Jun 1, 2024
1a1619c
skidpad localization working, slam issues
alvarolp02 Jun 2, 2024
0f4bb32
skidpad control, falta slam
alvarolp02 Jun 2, 2024
28ae7f4
slam positioning added to state
alvarolp02 Jun 3, 2024
06aeeb4
Merge pull request #65 from ARUSfs/feature/update_car_state
alvarolp02 Jun 3, 2024
5ab55f9
Merge remote-tracking branch 'origin/develop' into feature/global_pur…
alvarolp02 Jun 3, 2024
346a824
slam fixed
alvarolp02 Jun 3, 2024
5a13534
Merge pull request #66 from ARUSfs/feature/global_pure_purstuit
alvarolp02 Jun 3, 2024
37c7e83
acceleration with slam v0
igsais Jun 3, 2024
e4f4e26
slam fixed
alvarolp02 Jun 3, 2024
fc838ef
car state updated
alvarolp02 Jun 3, 2024
141ac4f
Merge pull request #67 from ARUSfs/feature/skidpad_control
alvarolp02 Jun 3, 2024
7427ec0
Acceleration sin marrano con ransacn't
igsais Jun 3, 2024
9b4dd1e
[refactor]: App name
Angelgares Jun 4, 2024
ac1651d
reinforced heuristic in ransac
igsais Jun 4, 2024
0e62cc0
accel. params adjusted and visualization added
alvarolp02 Jun 5, 2024
ce8aace
Merge branch 'develop' into feature/slam_acceleration
alvarolp02 Jun 5, 2024
b9e64ce
Merge pull request #70 from ARUSfs/feature/slam_acceleration
alvarolp02 Jun 5, 2024
ebb8367
[change:] replace char with uint_t and canRead() with canReadWait().
carperca23 Jun 6, 2024
9c18056
Merge branch 'feature/can_c' of https://github.com/ARUSfs/DRIVERLESS …
carperca23 Jun 6, 2024
826556a
planning config updated and params adjusted
alvarolp02 Jun 8, 2024
2277605
visualization config update
alvarolp02 Jun 8, 2024
65c228b
Merge pull request #72 from ARUSfs/feature/hotfix
alvarolp02 Jun 8, 2024
e72ced4
publishing limovelo map
alvarolp02 Jun 9, 2024
b3abe03
limovelo inclination corrected on map and localization
alvarolp02 Jun 9, 2024
1e472d4
limovelo acceleration and launch files updated
alvarolp02 Jun 10, 2024
b6774ad
delaunay param hotfix
alvarolp02 Jun 10, 2024
377410e
Merge pull request #74 from ARUSfs/feature/limovelo_integration
alvarolp02 Jun 10, 2024
0d336ff
Merge branch 'develop' into feature/can_c
alvarolp02 Jun 10, 2024
f507425
[refactor]: can imu topic
alvarolp02 Jun 10, 2024
99568b0
[Refactor]: can topics changed
alvarolp02 Jun 10, 2024
aa86971
[refactor]: types errors
carperca23 Jun 10, 2024
ca8af44
[arreglito]: putos paréntesis
carperca23 Jun 10, 2024
0e9ae09
skidpad params updated
alvarolp02 Jun 10, 2024
d3ed049
test finished
Angelgares Jun 10, 2024
3fbfbfa
params changed
alvarolp02 Jun 12, 2024
ba32a59
Merge pull request #75 from ARUSfs/feature/test_10_06
alvarolp02 Jun 12, 2024
dcd47cb
[feat]: AS_status and min_vel only checked in controller, boot sh add…
alvarolp02 Jun 12, 2024
e9fc4d1
Merge pull request #76 from ARUSfs/feature/controller_fix
alvarolp02 Jun 12, 2024
358fd3f
params adjusted for event's curve (TODO: fix AS_status CAN reading)
Angelgares Jun 13, 2024
869937d
yaw_rate in car_state node
Jun 20, 2024
1cdcd73
evento presentación exitoso
Angelgares Jun 20, 2024
ea89e13
motorSpeed funca
carperca23 Jun 21, 2024
57e795f
Esto medio funciona
carperca23 Jun 21, 2024
702992f
firt correction
Jun 24, 2024
e89a657
Listo para Jerez
carperca23 Jun 26, 2024
28ccd58
Ahora sí listo para Jerez
carperca23 Jun 26, 2024
2d1f0ed
topic correction and small fixes
alvarolp02 Jun 26, 2024
55ac40f
camera prepared for VSV
Angelgares Jun 27, 2024
3ebda4b
Funciona salvo subscribers
ananovasg Jun 27, 2024
4e7151a
Hotfix
ananovasg Jun 27, 2024
4653228
fufa a falta de testeo
ananovasg Jun 27, 2024
5d3f41e
de-skewing working
alvarolp02 Jun 28, 2024
674c662
retoques
carperca23 Jun 28, 2024
12db9b9
cambiamiento de launchs
carperca23 Jun 28, 2024
5e7a0cb
remove can python
carperca23 Jun 28, 2024
5b2288b
desguarrada
alvarolp02 Jun 28, 2024
186f74b
Merge pull request #77 from ARUSfs/feature/ev_presentacion
alvarolp02 Jun 28, 2024
8b69492
uncomment hotfix
alvarolp02 Jun 28, 2024
66027d1
Merge pull request #78 from ARUSfs/feature/lidar_correction
alvarolp02 Jun 28, 2024
a74631f
missionHandle
carperca23 Jun 28, 2024
310ced2
publish icp_map at 10Hz
alvarolp02 Jun 28, 2024
0c2b9d1
RES range msg added
carperca23 Jun 28, 2024
b87d9be
puto epos
alvarolp02 Jun 29, 2024
adce8d3
Listo para chambear
carperca23 Jun 29, 2024
cd07d1c
epos4 works with car kvaser
alvarolp02 Jun 29, 2024
a9d68d3
Merge branch 'feature/can_c' of github.com:ARUSfs/DRIVERLESS into fea…
alvarolp02 Jun 29, 2024
586cdce
Merge branch 'develop' into feature/can_c
alvarolp02 Jun 29, 2024
ab26ffc
imycamera updated for VSV
alvarolp02 Jun 29, 2024
a1b0aad
in process
alvarolp02 Jun 29, 2024
cabd0b7
print n of channels
alvarolp02 Jun 30, 2024
fbe6002
camera checked for VSV
Angelgares Jun 30, 2024
4666473
Driverless VSV completed!
Angelgares Jul 1, 2024
0d38cf8
remove videos
Angelgares Jul 1, 2024
5a768d6
Merge pull request #80 from ARUSfs/feature/can_c
alvarolp02 Jul 1, 2024
716aaff
cooking
alvarolp02 Jul 2, 2024
4f01792
smooth steering transition
javiuv Jul 3, 2024
7eccefe
mission test
carperca23 Jul 8, 2024
56357a9
mission test
Angelgares Jul 8, 2024
80d0ced
listo para testear
carperca23 Jul 8, 2024
1c7f141
ahora si q si listo para el testeo
Angelgares Jul 8, 2024
a1a799a
no puedo mas
Angelgares Jul 8, 2024
5c03a91
launch
carperca23 Jul 8, 2024
3f8c330
Merge branch 'feature/mission' of https://github.com/ARUSfs/DRIVERLES…
carperca23 Jul 8, 2024
88f67a4
depurando
carperca23 Jul 8, 2024
1250dfd
arreglos
carperca23 Jul 8, 2024
e7d14fe
arreglos2
carperca23 Jul 8, 2024
d946e14
estiamtion implemented
alvarolp02 Jul 8, 2024
dd6cfdd
funciona
Angelgares Jul 8, 2024
89b95d4
todo gucci
carperca23 Jul 8, 2024
c65c713
Merge pull request #81 from ARUSfs/feature/mission
carperca23 Jul 8, 2024
956527a
marrano lap counter
alvarolp02 Jul 9, 2024
dbf107b
dist corrected
alvarolp02 Jul 9, 2024
8d3f34c
slam improved with motion estimation
alvarolp02 Jul 11, 2024
4d7ce44
marrano fino fino
alvarolp02 Jul 12, 2024
f86a6d2
ponderation updated, acceleration tested with icp slam
alvarolp02 Jul 13, 2024
d530155
Merge branch 'develop' into feature/improve_marrano
alvarolp02 Jul 13, 2024
e7d8ced
Merge pull request #82 from ARUSfs/feature/improve_marrano
alvarolp02 Jul 13, 2024
3978600
launchs updated
alvarolp02 Jul 13, 2024
7a1eb81
Merge pull request #83 from ARUSfs/develop
alvarolp02 Jul 13, 2024
a9164ab
acceleration con marrano local piola repiola
alvarolp02 Jul 14, 2024
1f4e438
skidpad fino filipino
alvarolp02 Jul 15, 2024
57758a6
remove loginfo
alvarolp02 Jul 15, 2024
46ac17a
Merge pull request #84 from ARUSfs/feature/skidpad_dev
alvarolp02 Jul 15, 2024
33f3d8a
[refactor] don limpio
alvarolp02 Jul 23, 2024
6c3edfb
skidpad y acceleration revisados
alvarolp02 Jul 23, 2024
efb887d
ebs test 24_07
Angelgares Jul 24, 2024
dbf1276
autocross launch
alvarolp02 Jul 25, 2024
90da108
cooking skidpad
alvarolp02 Jul 25, 2024
eb5503b
skidpad pro
alvarolp02 Jul 26, 2024
5037054
autoX and trackdrive with marrano
alvarolp02 Jul 26, 2024
c8989c9
1M bitrate
carperca23 Jul 26, 2024
cb5b0a4
change datalogger messages can line
carperca23 Jul 26, 2024
b8e9f1b
cambiar el can0 a 1M
carperca23 Jul 26, 2024
1b95516
accel_control syntax error
carperca23 Jul 26, 2024
fbad015
Publicar el hash del commit actual
carperca23 Jul 26, 2024
f49f178
Ruta universal para publicar el hash :)
carperca23 Jul 26, 2024
2863294
Close can
carperca23 Jul 26, 2024
157176a
Merge pull request #86 from ARUSfs/feature/test_jerez
alvarolp02 Jul 26, 2024
01daec5
stanley control working
alvarolp02 Jul 26, 2024
929a581
hotfix
alvarolp02 Jul 26, 2024
4d6495c
pub temp
carperca23 Jul 26, 2024
0b95e86
fumaditas varias
alvarolp02 Jul 27, 2024
0e22fa3
brake light
carperca23 Jul 27, 2024
4721dcd
some fixes
alvarolp02 Jul 27, 2024
788754f
brake light from controller
alvarolp02 Jul 27, 2024
dcfd7ea
fix launchs
alvarolp02 Jul 27, 2024
faa517c
Merge pull request #87 from ARUSfs/feature/stanley_control
alvarolp02 Jul 27, 2024
b1dace4
trackdrive update
alvarolp02 Jul 27, 2024
f9b66bb
test nocturno empujando terminado
Angelgares Jul 28, 2024
fe7bafd
pub dl info
carperca23 Jul 28, 2024
a264661
test fixes
alvarolp02 Jul 28, 2024
d25a96b
ultimo test terminado
alvarolp02 Jul 29, 2024
e240050
brake light corrected
alvarolp02 Jul 29, 2024
9a5ff5e
debugging datalogger
alvarolp02 Jul 29, 2024
0ae2dc4
Arreglos dataLogger steering, cones_count_all
carperca23 Jul 29, 2024
fe706cb
publish target speed in all nodes
alvarolp02 Jul 30, 2024
7e5f9fc
brake hydr
carperca23 Jul 30, 2024
4c74a79
Merge branch 'feature/test_27_07' of https://github.com/ARUSfs/DRIVER…
carperca23 Jul 30, 2024
a5d368a
target speed publishing corrections
alvarolp02 Jul 30, 2024
5626ec4
skidpad antiguo para run a 5ms
alvarolp02 Jul 30, 2024
210ad17
update to skidpad 5ms
alvarolp02 Aug 3, 2024
9c4f99e
arreglos para escruti
alvarolp02 Aug 3, 2024
e8c5f88
ebs test terminadogit add .!
Angelgares Aug 4, 2024
c4abf8b
practice terminado
Angelgares Aug 4, 2024
ba3190e
ACCELERATION FSS TERMINADO
Angelgares Aug 4, 2024
23cef0b
FSS terminado
Angelgares Aug 4, 2024
1fc1873
pequeño arreglito
alvarolp02 Aug 6, 2024
5cc4754
Merge pull request #89 from ARUSfs/feature/test_27_07
alvarolp02 Aug 6, 2024
c20f944
speed profile for pure pursuit
alvarolp02 Aug 7, 2024
7376d92
track generator from slam finished
alvarolp02 Aug 9, 2024
955d4a1
speed profile fully working
alvarolp02 Aug 9, 2024
4300b3f
variable LAD
alvarolp02 Aug 10, 2024
faa711e
datalogger 0x511
carperca23 Aug 12, 2024
eb04487
timer 0x511
carperca23 Aug 12, 2024
44f653f
test 14_09_2024 for validation
Angelgares Sep 14, 2024
3a2c79a
telemetry script
Angelgares Sep 20, 2024
7e7e9f3
telemetry launch at boot
Angelgares Sep 20, 2024
4c93153
Comment telemetry node for the moment
alvarolp02 Oct 10, 2024
99f0a32
Fix ugly launchs
alvarolp02 Oct 10, 2024
8715194
real launchs fixed
alvarolp02 Oct 10, 2024
50b0992
can wheelspeeds
alvarolp02 Oct 11, 2024
d6a872a
comilals
alvarolp02 Oct 11, 2024
cd7aa9f
comillas2
alvarolp02 Oct 11, 2024
de4f4bc
feed forward test
alvarolp02 Oct 11, 2024
fb074b6
fix feed forward
alvarolp02 Oct 11, 2024
fb6e5e4
feed forward test workinggit add .git add .
Angelgares Oct 11, 2024
1351a9e
wheel speed working
Angelgares Oct 11, 2024
b3de085
feed forward added
alvarolp02 Oct 11, 2024
d36d194
minor fixes before release
alvarolp02 Oct 11, 2024
6495522
Merge pull request #90 from ARUSfs/feature/pre_FSG
alvarolp02 Oct 11, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
1 change: 1 addition & 0 deletions .flake8
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
[flake8]
exclude = .git,__pycache__
max-line-length = 100
per-file-ignores = __init__.py:F401
6 changes: 3 additions & 3 deletions .github/workflows/python-linting.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,6 @@ jobs:
flake8 . --count --select=E9,F63,F7,F82,E101,E112 --show-source --statistics
# exit-zero treats all errors as warnings.
flake8 . --count --exit-zero --max-complexity=10 --statistics
- name: Test with pytest
run: |
pytest
# - name: Test with pytest
# run: |
# pytest
54 changes: 54 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ share/python-wheels/
.installed.cfg
*.egg
MANIFEST
.catkin_tools/

# PyInstaller
# Usually these files are written by a python script from a template
Expand Down Expand Up @@ -110,6 +111,7 @@ venv/
ENV/
env.bak/
venv.bak/
.vscode/

# Spyder project settings
.spyderproject
Expand All @@ -128,3 +130,55 @@ dmypy.json

# Pyre type checker
.pyre/

devel/
logs/
build/
bin/
lib/
msg_gen/
srv_gen/
msg/*Action.msg
msg/*ActionFeedback.msg
msg/*ActionGoal.msg
msg/*ActionResult.msg
msg/*Feedback.msg
msg/*Goal.msg
msg/*Result.msg
msg/_*.py
build_isolated/
devel_isolated/

# Generated by dynamic reconfigure
*.cfgc
/cfg/cpp/
/cfg/*.py

# Ignore generated docs
*.dox
*.wikidoc

# eclipse stuff
.project
.cproject

# qcreator stuff
CMakeLists.txt.user

srv/_*.py
*.pcd
*.pyc
qtcreator-*
*.user

/planning/cfg
/planning/docs
/planning/src

*~

# Emacs
.#*

# Catkin custom files
CATKIN_IGNORE
6 changes: 6 additions & 0 deletions requirements.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
numpy==1.23.3
opencv-python==4.6.0.66
pytest==7.1.3
torch==1.12.1
torchvision==0.13.1
typing-extensions==4.3.0
17 changes: 17 additions & 0 deletions setup_venv.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
#!/bin/bash

if [[ ! -d $HOME/.venv/DV ]]; then
python3 -m venv $HOME/.venv/DV
echo "alias activate='. ~/.venv/DV/bin/activate'" >> $HOME/.bash_aliases
echo "To activate the virtual environment, you can just type 'activate'.\nSimilarly, to deactivate just write 'deactivate'."
elif [[ ! -f "./requirements.txt" ]]; then
echo "Script must be run from the repository's main directory"
exit 1
fi

. ~/.venv/DV/bin/activate

pip3 install -r ./requirements.txt
echo "Updated requirements.txt dependencies."

deactivate
205 changes: 205 additions & 0 deletions src/car_interface/can/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,205 @@
cmake_minimum_required(VERSION 3.0.2)
project(can)

## Compile as C++11, supported in ROS Kinetic and newer
# add_compile_options(-std=c++11)

## Find catkin macros and libraries
## if COMPONENTS list like find_package(catkin REQUIRED COMPONENTS xyz)
## is used, also find other catkin packages
find_package(catkin REQUIRED COMPONENTS
rospy
std_msgs
)

## System dependencies are found with CMake's conventions
# find_package(Boost REQUIRED COMPONENTS system)


## Uncomment this if the package has a setup.py. This macro ensures
## modules and global scripts declared therein get installed
## See http://ros.org/doc/api/catkin/html/user_guide/setup_dot_py.html
# catkin_python_setup()

################################################
## Declare ROS messages, services and actions ##
################################################

## To declare and build messages, services or actions from within this
## package, follow these steps:
## * Let MSG_DEP_SET be the set of packages whose message types you use in
## your messages/services/actions (e.g. std_msgs, actionlib_msgs, ...).
## * In the file package.xml:
## * add a build_depend tag for "message_generation"
## * add a build_depend and a exec_depend tag for each package in MSG_DEP_SET
## * If MSG_DEP_SET isn't empty the following dependency has been pulled in
## but can be declared for certainty nonetheless:
## * add a exec_depend tag for "message_runtime"
## * In this file (CMakeLists.txt):
## * add "message_generation" and every package in MSG_DEP_SET to
## find_package(catkin REQUIRED COMPONENTS ...)
## * add "message_runtime" and every package in MSG_DEP_SET to
## catkin_package(CATKIN_DEPENDS ...)
## * uncomment the add_*_files sections below as needed
## and list every .msg/.srv/.action file to be processed
## * uncomment the generate_messages entry below
## * add every package in MSG_DEP_SET to generate_messages(DEPENDENCIES ...)

## Generate messages in the 'msg' folder
# add_message_files(
# FILES
# Message1.msg
# Message2.msg
# )

## Generate services in the 'srv' folder
# add_service_files(
# FILES
# Service1.srv
# Service2.srv
# )

## Generate actions in the 'action' folder
# add_action_files(
# FILES
# Action1.action
# Action2.action
# )

## Generate added messages and services with any dependencies listed here
# generate_messages(
# DEPENDENCIES
# std_msgs
# )

################################################
## Declare ROS dynamic reconfigure parameters ##
################################################

## To declare and build dynamic reconfigure parameters within this
## package, follow these steps:
## * In the file package.xml:
## * add a build_depend and a exec_depend tag for "dynamic_reconfigure"
## * In this file (CMakeLists.txt):
## * add "dynamic_reconfigure" to
## find_package(catkin REQUIRED COMPONENTS ...)
## * uncomment the "generate_dynamic_reconfigure_options" section below
## and list every .cfg file to be processed

## Generate dynamic reconfigure parameters in the 'cfg' folder
# generate_dynamic_reconfigure_options(
# cfg/DynReconf1.cfg
# cfg/DynReconf2.cfg
# )

###################################
## catkin specific configuration ##
###################################
## The catkin_package macro generates cmake config files for your package
## Declare things to be passed to dependent projects
## INCLUDE_DIRS: uncomment this if your package contains header files
## LIBRARIES: libraries you create in this project that dependent projects also need
## CATKIN_DEPENDS: catkin_packages dependent projects also need
## DEPENDS: system dependencies of this project that dependent projects also need
catkin_package(
# INCLUDE_DIRS include
# LIBRARIES can_interface
# CATKIN_DEPENDS rospy std_msgs
# DEPENDS system_lib
)

###########
## Build ##
###########

## Specify additional locations of header files
## Your package locations should be listed before other locations
include_directories(
# include
${catkin_INCLUDE_DIRS}
)

## Declare a C++ library
# add_library(${PROJECT_NAME}
# src/${PROJECT_NAME}/can_interface.cpp
# )

## Add cmake target dependencies of the library
## as an example, code may need to be generated before libraries
## either from message generation or dynamic reconfigure
# add_dependencies(${PROJECT_NAME} ${${PROJECT_NAME}_EXPORTED_TARGETS} ${catkin_EXPORTED_TARGETS})

## Declare a C++ executable
## With catkin_make all packages are built within a single CMake context
## The recommended prefix ensures that target names across packages don't collide
# add_executable(${PROJECT_NAME}_node src/can_interface_node.cpp)

## Rename C++ executable without prefix
## The above recommended prefix causes long target names, the following renames the
## target back to the shorter version for ease of user use
## e.g. "rosrun someones_pkg node" instead of "rosrun someones_pkg someones_pkg_node"
# set_target_properties(${PROJECT_NAME}_node PROPERTIES OUTPUT_NAME node PREFIX "")

## Add cmake target dependencies of the executable
## same as for the library above
# add_dependencies(${PROJECT_NAME}_node ${${PROJECT_NAME}_EXPORTED_TARGETS} ${catkin_EXPORTED_TARGETS})

## Specify libraries to link a library or executable target against
# target_link_libraries(${PROJECT_NAME}_node
# ${catkin_LIBRARIES}
# )

#############
## Install ##
#############

# all install targets should use catkin DESTINATION variables
# See http://ros.org/doc/api/catkin/html/adv_user_guide/variables.html

## Mark executable scripts (Python etc.) for installation
## in contrast to setup.py, you can choose the destination
# catkin_install_python(PROGRAMS
# scripts/my_python_script
# DESTINATION ${CATKIN_PACKAGE_BIN_DESTINATION}
# )

## Mark executables for installation
## See http://docs.ros.org/melodic/api/catkin/html/howto/format1/building_executables.html
# install(TARGETS ${PROJECT_NAME}_node
# RUNTIME DESTINATION ${CATKIN_PACKAGE_BIN_DESTINATION}
# )

## Mark libraries for installation
## See http://docs.ros.org/melodic/api/catkin/html/howto/format1/building_libraries.html
# install(TARGETS ${PROJECT_NAME}
# ARCHIVE DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION}
# LIBRARY DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION}
# RUNTIME DESTINATION ${CATKIN_GLOBAL_BIN_DESTINATION}
# )

## Mark cpp header files for installation
# install(DIRECTORY include/${PROJECT_NAME}/
# DESTINATION ${CATKIN_PACKAGE_INCLUDE_DESTINATION}
# FILES_MATCHING PATTERN "*.h"
# PATTERN ".svn" EXCLUDE
# )

## Mark other files for installation (e.g. launch and bag files, etc.)
# install(FILES
# # myfile1
# # myfile2
# DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION}
# )

#############
## Testing ##
#############

## Add gtest based cpp test target and link libraries
# catkin_add_gtest(${PROJECT_NAME}-test test/test_can_interface.cpp)
# if(TARGET ${PROJECT_NAME}-test)
# target_link_libraries(${PROJECT_NAME}-test ${PROJECT_NAME})
# endif()

## Add folders to be run by python nosetests
# catkin_add_nosetests(test)
4 changes: 4 additions & 0 deletions src/car_interface/can/launch/can_interface.launch
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
<launch>
<node pkg="can" name="can_interface" type="main.py">
</node>
</launch>
65 changes: 65 additions & 0 deletions src/car_interface/can/package.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,65 @@
<?xml version="1.0"?>
<package format="2">
<name>can</name>
<version>0.0.0</version>
<description>The can package</description>

<!-- One maintainer tag required, multiple allowed, one person per tag -->
<!-- Example: -->
<!-- <maintainer email="jane.doe@example.com">Jane Doe</maintainer> -->
<maintainer email="jorge@pm.me">jorge</maintainer>


<!-- One license tag required, multiple allowed, one license per tag -->
<!-- Commonly used license strings: -->
<!-- BSD, MIT, Boost Software License, GPLv2, GPLv3, LGPLv2.1, LGPLv3 -->
<license>TODO</license>


<!-- Url tags are optional, but multiple are allowed, one per tag -->
<!-- Optional attribute type can be: website, bugtracker, or repository -->
<!-- Example: -->
<!-- <url type="website">http://wiki.ros.org/can_interface</url> -->


<!-- Author tags are optional, multiple are allowed, one per tag -->
<!-- Authors do not have to be maintainers, but could be -->
<!-- Example: -->
<!-- <author email="jane.doe@example.com">Jane Doe</author> -->


<!-- The *depend tags are used to specify dependencies -->
<!-- Dependencies can be catkin packages or system dependencies -->
<!-- Examples: -->
<!-- Use depend as a shortcut for packages that are both build and exec dependencies -->
<!-- <depend>roscpp</depend> -->
<!-- Note that this is equivalent to the following: -->
<!-- <build_depend>roscpp</build_depend> -->
<!-- <exec_depend>roscpp</exec_depend> -->
<!-- Use build_depend for packages you need at compile time: -->
<!-- <build_depend>message_generation</build_depend> -->
<!-- Use build_export_depend for packages you need in order to build against this package: -->
<!-- <build_export_depend>message_generation</build_export_depend> -->
<!-- Use buildtool_depend for build tool packages: -->
<!-- <buildtool_depend>catkin</buildtool_depend> -->
<!-- Use exec_depend for packages you need at runtime: -->
<!-- <exec_depend>message_runtime</exec_depend> -->
<!-- Use test_depend for packages you need only for testing: -->
<!-- <test_depend>gtest</test_depend> -->
<!-- Use doc_depend for packages you need only for building documentation: -->
<!-- <doc_depend>doxygen</doc_depend> -->
<buildtool_depend>catkin</buildtool_depend>
<build_depend>rospy</build_depend>
<build_depend>std_msgs</build_depend>
<build_export_depend>rospy</build_export_depend>
<build_export_depend>std_msgs</build_export_depend>
<exec_depend>rospy</exec_depend>
<exec_depend>std_msgs</exec_depend>


<!-- The export tag contains other, unspecified, tags -->
<export>
<!-- Other tools can request additional information be placed here -->

</export>
</package>
Loading