Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

E

ECSS Services
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Terraform modules
- Incidents
- Service Desk

Snippets Groups Projects

264020c8

Commit 264020c8 authored 5 years ago by athatheo Committed by kongr45gpen 5 years ago

Downloads
- Patches
- Plain Diff

Merge branch 'master' of gitlab.com:acubesat/obc/ecss-services into ECSS_ST13_large_packet_transfer

# Conflicts:
#	CMakeLists.txt
#	src/Services/EventReportService.cpp

parent 50f1021c

No related branches found

No related tags found

Loading

Changes 8

Hide whitespace changes

Inline Side-by-side

Showing

CMakeLists.txt 2 additions, 1 deletion

CMakeLists.txt
inc/ECSS_Definitions.hpp 2 additions, 0 deletions

inc/ECSS_Definitions.hpp
inc/ServicePool.hpp 2 additions, 0 deletions

inc/ServicePool.hpp
inc/Services/LargePacketTransferService.hpp 82 additions, 0 deletions

inc/Services/LargePacketTransferService.hpp
src/Message.cpp 1 addition, 0 deletions

src/Message.cpp
src/Services/LargePacketTransferService.cpp 55 additions, 0 deletions

src/Services/LargePacketTransferService.cpp
src/main.cpp 19 additions, 6 deletions

src/main.cpp
test/Services/LargePacketTransferService.cpp 71 additions, 0 deletions

test/Services/LargePacketTransferService.cpp

with 234 additions and 7 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