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
6ba14d92
Commit
6ba14d92
authored
6 years ago
by
Grigoris Pavlakis
Browse files
Options
Downloads
Patches
Plain Diff
Complete rudimentary implementation of parameter reporting function, optimizations shall follow
parent
63510064
No related branches found
No related tags found
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
inc/Services/ParameterService.hpp
+1
-0
1 addition, 0 deletions
inc/Services/ParameterService.hpp
src/Services/ParameterService.cpp
+7
-6
7 additions, 6 deletions
src/Services/ParameterService.cpp
src/main.cpp
+6
-2
6 additions, 2 deletions
src/main.cpp
with
14 additions
and
8 deletions
inc/Services/ParameterService.hpp
+
1
−
0
View file @
6ba14d92
...
@@ -3,6 +3,7 @@
...
@@ -3,6 +3,7 @@
#include
"Service.hpp"
#include
"Service.hpp"
#define CONFIGLENGTH 5
#define CONFIGLENGTH 5
/**
/**
* Implementation of the ST[20] parameter management service,
* Implementation of the ST[20] parameter management service,
* as defined in ECSS-E-ST-70-41C
* as defined in ECSS-E-ST-70-41C
...
...
This diff is collapsed.
Click to expand it.
src/Services/ParameterService.cpp
+
7
−
6
View file @
6ba14d92
...
@@ -12,7 +12,7 @@ ParameterService::ParameterService() {
...
@@ -12,7 +12,7 @@ ParameterService::ParameterService() {
* This normally will be initialized with actual values on boot.
* This normally will be initialized with actual values on boot.
*/
*/
for
(
int
i
=
0
;
i
<
5
;
i
++
)
{
// hack just to shut CLion up (warning about range-based for loops)
for
(
int
i
=
0
;
i
<
CONFIGLENGTH
;
i
++
)
{
paramsList
[
i
].
paramId
=
0
;
paramsList
[
i
].
paramId
=
0
;
paramsList
[
i
].
settingData
=
0
;
paramsList
[
i
].
settingData
=
0
;
...
@@ -45,16 +45,16 @@ Message ParameterService::reportParameter(Message paramId) {
...
@@ -45,16 +45,16 @@ Message ParameterService::reportParameter(Message paramId) {
*/
*/
Message
reqParam
(
20
,
2
,
Message
::
TM
,
1
);
// empty TM[20, 2] parameter report message
Message
reqParam
(
20
,
2
,
Message
::
TM
,
1
);
// empty TM[20, 2] parameter report message
uint16_t
reqParamId
=
paramId
.
read
Halfword
();
// parameter ID must be accessed only once
uint16_t
reqParamId
=
paramId
.
read
Uint16
();
// parameter ID must be accessed only once
if
(
paramId
.
packetType
==
Message
::
TC
&&
paramId
.
serviceType
==
20
&&
paramId
.
messageType
==
1
)
{
if
(
paramId
.
packetType
==
Message
::
TC
&&
paramId
.
serviceType
==
20
&&
paramId
.
messageType
==
1
)
{
for
(
int
i
=
0
;
i
<
5
;
i
++
)
{
for
(
int
i
=
0
;
i
<
CONFIGLENGTH
;
i
++
)
{
if
(
paramsList
[
i
].
paramId
==
reqParamId
)
{
if
(
paramsList
[
i
].
paramId
==
reqParamId
)
{
reqParam
.
append
Halfword
(
paramsList
[
i
].
paramId
);
reqParam
.
append
Uint16
(
paramsList
[
i
].
paramId
);
reqParam
.
append
Word
(
paramsList
[
i
].
settingData
);
reqParam
.
append
Uint32
(
paramsList
[
i
].
settingData
);
break
;
break
;
}
}
}
}
...
@@ -65,4 +65,5 @@ Message ParameterService::reportParameter(Message paramId) {
...
@@ -65,4 +65,5 @@ Message ParameterService::reportParameter(Message paramId) {
/*void ParameterService::setParamData(Message paramId) {
/*void ParameterService::setParamData(Message paramId) {
}*/
}*/
\ No newline at end of file
This diff is collapsed.
Click to expand it.
src/main.cpp
+
6
−
2
View file @
6ba14d92
...
@@ -31,9 +31,13 @@ int main() {
...
@@ -31,9 +31,13 @@ int main() {
//ST[20] test
//ST[20] test
ParameterService
paramService
;
ParameterService
paramService
;
Message
sentPacket
=
Message
(
20
,
1
,
Message
::
TC
,
1
);
//application id is a dummy number (1)
Message
sentPacket
=
Message
(
20
,
1
,
Message
::
TC
,
1
);
//application id is a dummy number (1)
sentPacket
.
append
Halfword
(
341
);
//the packet sent contains the ID of the desired parameter
sentPacket
.
append
Uint16
(
341
);
//the packet sent contains the ID of the desired parameter
Message
returnedPacket
=
paramService
.
reportParameter
(
sentPacket
);
Message
returnedPacket
=
paramService
.
reportParameter
(
sentPacket
);
std
::
cout
<<
"Parameter ID: "
<<
returnedPacket
.
readHalfword
()
<<
"Parameter value: "
<<
returnedPacket
.
readHalfword
()
<<
std
::
endl
;
uint16_t
id
=
returnedPacket
.
readUint16
();
uint32_t
val
=
returnedPacket
.
readUint32
();
std
::
cout
<<
"Parameter ID: "
<<
std
::
dec
<<
id
<<
std
::
endl
<<
"Parameter value: "
<<
std
::
dec
<<
val
<<
std
::
endl
;
return
0
;
return
0
;
}
}
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