Merge branch 'master' into 'can_devel' (7c76571d) · Commits · labrobotica / drivers / comm · GitLab

Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

C

comm
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Incidents
- Service Desk

Snippets Groups Projects

7c76571d

Commit 7c76571d authored 2 years ago by Sergi Hernandez

Downloads
- Plain Diff

Merge branch 'master' into 'can_devel'

# Conflicts:
#   include/can/can.h

parents f0f851a5 b8ffd8ba

No related branches found

No related tags found

Loading

Changes 5

Hide whitespace changes

Inline Side-by-side

Showing

.gitlab-ci.yml 1 addition, 1 deletion

.gitlab-ci.yml
include/can/can.h 1 addition, 0 deletions

include/can/can.h
include/serial/rs232.h 0 additions, 1 deletion

include/serial/rs232.h
src/comm.cpp 26 additions, 12 deletions

src/comm.cpp
src/serial/rs232.cpp 1 addition, 0 deletions

src/serial/rs232.cpp

with 29 additions and 14 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment