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

a3e1adda

Commit a3e1adda authored 6 years ago by athatheocsd

Downloads
- Plain Diff

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

# Conflicts:
#	CMakeLists.txt

Added some subservice observable 6.5.6 of the standard.

parents 6de9b5a6 d37ec7c2

No related branches found

No related tags found

Loading

Changes 16

Hide whitespace changes

Inline Side-by-side

Showing

CMakeLists.txt 3 additions, 6 deletions

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

inc/ECSS_Definitions.hpp
inc/ErrorHandler.hpp 9 additions, 1 deletion

inc/ErrorHandler.hpp
inc/Platform/STM32F7/MemoryAddressLimits.hpp 18 additions, 0 deletions

inc/Platform/STM32F7/MemoryAddressLimits.hpp
inc/Services/EventReportService.hpp 18 additions, 0 deletions

inc/Services/EventReportService.hpp
inc/Services/MemoryManagementService.hpp 50 additions, 6 deletions

inc/Services/MemoryManagementService.hpp
inc/Services/RequestVerificationService.hpp 32 additions, 57 deletions

inc/Services/RequestVerificationService.hpp
src/ErrorHandler.cpp 3 additions, 24 deletions

src/ErrorHandler.cpp
src/Platform/x86/Service.cpp 3 additions, 1 deletion

src/Platform/x86/Service.cpp
src/Services/EventReportService.cpp 3 additions, 0 deletions

src/Services/EventReportService.cpp
src/Services/MemoryManagementService.cpp 183 additions, 38 deletions

src/Services/MemoryManagementService.cpp
src/Services/RequestVerificationService.cpp 44 additions, 87 deletions

src/Services/RequestVerificationService.cpp
src/main.cpp 39 additions, 13 deletions

src/main.cpp
test/ErrorHandler.cpp 10 additions, 10 deletions

test/ErrorHandler.cpp
test/Services/MemoryManagementService.cpp 58 additions, 12 deletions

test/Services/MemoryManagementService.cpp
test/Services/RequestVerificationService.cpp 53 additions, 44 deletions

test/Services/RequestVerificationService.cpp

with 529 additions and 299 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