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

9321e1f1

Commit 9321e1f1 authored 6 years ago by athatheocsd

Downloads
- Plain Diff

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

Merge branch 'master' of https://gitlab.com/acubesat/obc/ecss-services into ECSS_ST-05_enable_disable

# Conflicts:
#	src/main.cpp

parents a269430a 11fea649

No related branches found

No related tags found

No related merge requests found

Changes 12

Hide whitespace changes

Inline Side-by-side

Showing

.idea/codeStyles/Project.xml 1 addition, 1 deletion

.idea/codeStyles/Project.xml
.idea/misc.xml 11 additions, 8 deletions

.idea/misc.xml
CMakeLists.txt 1 addition, 0 deletions

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

inc/ECSS_Definitions.hpp
inc/ErrorHandler.hpp 157 additions, 0 deletions

inc/ErrorHandler.hpp
inc/Message.hpp 8 additions, 1 deletion

inc/Message.hpp
inc/Services/RequestVerificationService.hpp 3 additions, 0 deletions

inc/Services/RequestVerificationService.hpp
inc/macros.hpp 7 additions, 0 deletions

inc/macros.hpp
src/ErrorHandler.cpp 77 additions, 0 deletions

src/ErrorHandler.cpp
src/Message.cpp 23 additions, 21 deletions

src/Message.cpp
src/main.cpp 10 additions, 0 deletions

src/main.cpp
test/ErrorHandler.cpp 69 additions, 0 deletions

test/ErrorHandler.cpp

with 370 additions and 31 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