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
5e323989
Unverified
Commit
5e323989
authored
5 years ago
by
Grigoris Pavlakis
Browse files
Options
Downloads
Patches
Plain Diff
Fix an off-by-one in the safeguard's bit index
Other changes: Add a couple more tests
parent
9bc44384
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
src/Services/Parameter.cpp
+1
-1
1 addition, 1 deletion
src/Services/Parameter.cpp
test/Services/ParameterService.cpp
+51
-5
51 additions, 5 deletions
test/Services/ParameterService.cpp
with
52 additions
and
6 deletions
src/Services/Parameter.cpp
+
1
−
1
View file @
5e323989
...
...
@@ -17,7 +17,7 @@ Parameter::Parameter(uint8_t newPtc, uint8_t newPfc, ValueType initialValue, Upd
void
Parameter
::
setCurrentValue
(
ValueType
newVal
)
{
// set the value only if the parameter can be updated manually
if
(
flags
[
2
])
{
if
(
flags
[
1
])
{
currentValue
=
newVal
;
}
}
...
...
This diff is collapsed.
Click to expand it.
test/Services/ParameterService.cpp
+
51
−
5
View file @
5e323989
...
...
@@ -10,8 +10,7 @@ void foo(ValueType* bar) { // sample function
}
/* test ideas:
* parameter setting while flag is active
* requesting only invalid parameter IDs
*
*
*/
...
...
@@ -49,9 +48,29 @@ TEST_CASE("Parameter Service - General") {
}
TEST_CASE
(
"Parameter Report Subservice"
)
{
// SECTION("All requested parameters invalid") {
//
// }
SECTION
(
"All requested parameters invalid"
)
{
Message
request
=
Message
(
20
,
1
,
Message
::
TC
,
1
);
request
.
appendUint16
(
3
);
request
.
appendUint16
(
54432
);
request
.
appendUint16
(
60000
);
request
.
appendUint16
(
65535
);
MessageParser
::
execute
(
request
);
CHECK
(
ServiceTests
::
get
(
0
).
serviceType
==
1
);
CHECK
(
ServiceTests
::
get
(
0
).
messageType
==
4
);
CHECK
(
ServiceTests
::
get
(
1
).
serviceType
==
1
);
CHECK
(
ServiceTests
::
get
(
1
).
messageType
==
4
);
CHECK
(
ServiceTests
::
get
(
2
).
serviceType
==
1
);
CHECK
(
ServiceTests
::
get
(
2
).
messageType
==
4
);
Message
report
=
ServiceTests
::
get
(
3
);
CHECK
(
report
.
serviceType
==
20
);
CHECK
(
report
.
messageType
==
2
);
CHECK
(
report
.
readUint16
()
==
0
);
// the message shall be empty
ServiceTests
::
reset
();
Services
.
reset
();
}
SECTION
(
"Faulty instruction handling"
)
{
Parameter
param0
=
Parameter
(
3
,
14
);
...
...
@@ -137,4 +156,31 @@ TEST_CASE("Parameter Setting Subservice") {
ServiceTests
::
reset
();
Services
.
reset
();
}
SECTION
(
"Attempt to set parameter with no manual update availability"
)
{
Parameter
param1
=
Parameter
(
1
,
7
,
12
);
pserv
.
addNewParameter
(
1
,
param1
,
"100"
);
Message
setRequest
=
Message
(
20
,
3
,
Message
::
TC
,
1
);
setRequest
.
appendUint16
(
1
);
setRequest
.
appendUint16
(
1
);
setRequest
.
appendUint32
(
0xBAAAAAAD
);
MessageParser
::
execute
(
setRequest
);
Message
infoRequest
=
Message
(
20
,
1
,
Message
::
TC
,
1
);
infoRequest
.
appendUint16
(
1
);
infoRequest
.
appendUint16
(
1
);
MessageParser
::
execute
(
infoRequest
);
Message
report
=
ServiceTests
::
get
(
0
);
CHECK
(
report
.
readUint16
()
==
1
);
CHECK
(
report
.
readUint16
()
==
1
);
CHECK_FALSE
(
report
.
readUint32
()
==
0xBAAAAAAD
);
ServiceTests
::
reset
();
Services
.
reset
();
}
}
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