Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
E
ECSS Services
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Deploy
Releases
Package registry
Model registry
Operate
Terraform modules
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
AcubeSat-OBC
ECSS Services
Commits
91d282f0
Unverified
Commit
91d282f0
authored
6 years ago
by
Dimitrios Stoupis
Browse files
Options
Downloads
Patches
Plain Diff
Fix CI's complaints
parent
c6c91302
No related branches found
Branches containing commit
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
inc/Message.hpp
+1
-1
1 addition, 1 deletion
inc/Message.hpp
src/Services/MemMangService.cpp
+4
-4
4 additions, 4 deletions
src/Services/MemMangService.cpp
with
5 additions
and
5 deletions
inc/Message.hpp
+
1
−
1
View file @
91d282f0
...
...
@@ -331,7 +331,7 @@ public:
* PTC = 3, PFC = 16
*/
uint64_t
readUint64
()
{
return
(
(
uint64_t
)
readWord
()
<<
32
)
|
(
uint64_t
)
readWord
();
return
(
static_cast
<
uint64_t
>
(
readWord
()
)
<<
32
)
|
static_cast
<
uint64_t
>
(
readWord
()
)
;
}
/**
...
...
This diff is collapsed.
Click to expand it.
src/Services/MemMangService.cpp
+
4
−
4
View file @
91d282f0
...
...
@@ -12,7 +12,7 @@ MemoryManagementService::RawDataMemoryManagement::RawDataMemoryManagement(
// Function declarations for the raw data memory management subservice
void
MemoryManagementService
::
RawDataMemoryManagement
::
loadRawData
(
Message
&
request
)
{
//
void MemoryManagementService::RawDataMemoryManagement::loadRawData(Message &request) {
/**
* Bare in mind that there is currently no error checking for invalid parameters.
* A future version will include error checking and the corresponding error report/notification,
...
...
@@ -21,7 +21,7 @@ void MemoryManagementService::RawDataMemoryManagement::loadRawData(Message &requ
* @todo Add error checking and reporting for the parameters
* @todo Add failure reporting
*/
uint8_t
memoryID
=
request
.
readEnum8
();
// Read the memory ID from the request
/*
uint8_t memoryID = request.readEnum8(); // Read the memory ID from the request
uint8_t iterationCount = 0; // Get the iteration count
uint16_t dataLength = 0; // Data length to read (updated for each new iteration)
uint32_t startAddress = 0; // Start address for the memory read (updated in each new iteration)
...
...
@@ -32,12 +32,12 @@ void MemoryManagementService::RawDataMemoryManagement::loadRawData(Message &requ
if (memoryID == MemoryManagementService::MemoryID::RAM) {
for (std::size_t i = 0; i < dataLength; i++) {
//*(uint64_t *)startAddress = memoryData[i];
//
\
*(uint64_t *)startAddress = memoryData[i];
}
} else if (memoryID == MemoryManagementService::MemoryID::FLASH) {
}
}
}
*/
void
MemoryManagementService
::
RawDataMemoryManagement
::
dumpRawData
(
Message
&
request
)
{
// Create the report message object of telemetry message subtype 6
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment