fsfw/fsfw
fsfw/fsfw
10
3
Fork 6
Code Issues 32 Pull Requests 4 Releases 10 Wiki Activity

PUS11 TC sched update and bugfixes #632

Merged
gaisser merged 8 commits from mueller/tc-11-tweaks into development 2022-05-24 17:48:08 +02:00
Conversation 0 Commits 8 Files Changed 11 +143 -93
muellerr commented 2022-05-20 15:34:56 +02:00
Owner
Copy Link
  • Also contains clang-tidy improvements
  • Bugfix/Hotfix for TC insertion: Skip the first four bytes which contain
    the timefield
  • Add three subservices which are important:
    ENABLE and DISABLE to enable and disable TC scheduling
    and RESET to clear the telecommand map
- Also contains `clang-tidy` improvements - Bugfix/Hotfix for TC insertion: Skip the first four bytes which contain the timefield - Add three subservices which are important: `ENABLE` and `DISABLE` to enable and disable TC scheduling and `RESET` to clear the telecommand map
muellerr added 4 commits 2022-05-20 15:35:02 +02:00
apply afmt
All checks were successful
fsfw/fsfw/pipeline/head This commit looks good
Details
d0fc360697
static STORE renamed
All checks were successful
fsfw/fsfw/pipeline/head This commit looks good
Details
dac700b80a
clang-format
All checks were successful
fsfw/fsfw/pipeline/head This commit looks good
Details
8e2597f609
bugfix for srv11
All checks were successful
fsfw/fsfw/pipeline/head This commit looks good
Details
fsfw/fsfw/pipeline/pr-development This commit looks good
Details
0b53b4873f
muellerr requested review from gaisser 2022-05-20 15:35:24 +02:00
muellerr added this to the v5.0.0 milestone 2022-05-20 15:35:27 +02:00
muellerr added the
hotfix
bug
 labels 2022-05-20 15:35:40 +02:00
gaisser requested changes 2022-05-23 15:03:20 +02:00
gaisser left a comment
Owner
Copy Link

More questions than real requests.

More questions than real requests.
src/fsfw/pus/Service11TelecommandScheduling.h Outdated
@ -58,3 +48,1 @@
TIMEBASE_SCHEDULE_DETAIL_REPORT = 10,
TIMESHIFT_ALL_SCHEDULE_ACTIVITIES = 15
};
enum [[maybe_unused]] Subservice : uint8_t{ENABLE_SCHEDULING = 1,
gaisser commented 2022-05-23 14:55:55 +02:00
Owner
Copy Link

Why do we need "maybe_unused" here?

Why do we need "maybe_unused" here?
muellerr commented 2022-05-23 15:35:22 +02:00
Author
Owner
Copy Link

I think I wondered this myself. Maybe because some enum values are unused? This warning should not appear if the enum is public though..

I think I wondered this myself. Maybe because some enum values are unused? This warning should not appear if the enum is public though..
muellerr commented 2022-05-24 10:40:07 +02:00
Author
Owner
Copy Link

Some enum values are just not used, because those services are unimplemented

Some enum values are just not used, because those services are unimplemented
muellerr marked this conversation as resolved
src/fsfw/pus/Service11TelecommandScheduling.h Outdated
@ -84,3 +82,2 @@
struct TelecommandStruct {
uint64_t requestId;
uint32_t seconds;
uint64_t requestId{};
gaisser commented 2022-05-23 14:56:10 +02:00
Owner
Copy Link

Is this better than = 0?

Is this better than = 0?
muellerr commented 2022-05-23 15:33:42 +02:00
Author
Owner
Copy Link

No, was automatically done by clang-tidy and I don't really care how the zero-initialization is done. Can change it to 0

No, was automatically done by clang-tidy and I don't really care how the zero-initialization is done. Can change it to 0
gaisser marked this conversation as resolved
src/fsfw/tcdistribution/PUSDistributor.cpp
@ -24,3 +24,3 @@
<< storeId.packetIndex << std::endl;
#endif
TcMqMapIter queueMapIt = this->queueMap.end();
auto queueMapIt = this->queueMap.end();
gaisser commented 2022-05-23 15:01:31 +02:00
Owner
Copy Link

Hm, I don't get why auto is recommended in such places. The old variant is much easier to understand.

Hm, I don't get why auto is recommended in such places. The old variant is much easier to understand.
muellerr commented 2022-05-23 15:31:57 +02:00
Author
Owner
Copy Link

clang-tidy recommends using auto for iterator declarations: https://clang.llvm.org/extra/clang-tidy/checks/modernize-use-auto.html

clang-tidy recommends using auto for iterator declarations: https://clang.llvm.org/extra/clang-tidy/checks/modernize-use-auto.html
gaisser marked this conversation as resolved
muellerr added 1 commit 2022-05-23 15:34:04 +02:00
Merge branch 'development' into mueller/tc-11-tweaks
All checks were successful
fsfw/fsfw/pipeline/pr-development This commit looks good
Details
f288d5120d
muellerr added 1 commit 2022-05-24 10:40:55 +02:00
afmt
All checks were successful
fsfw/fsfw/pipeline/pr-development This commit looks good
Details
34658ef7db
muellerr added 1 commit 2022-05-24 11:52:38 +02:00
added 3 new subservices
All checks were successful
fsfw/fsfw/pipeline/pr-development This commit looks good
Details
e60a665de4
muellerr changed title from PUS11 TC sched bugfix and some tweaks to PUS11 TC sched update and bugfixes 2022-05-24 11:52:55 +02:00
muellerr added 1 commit 2022-05-24 14:32:49 +02:00
added missing delete
All checks were successful
fsfw/fsfw/pipeline/pr-development This commit looks good
Details
f7cde80088
gaisser approved these changes 2022-05-24 17:47:52 +02:00
gaisser left a comment
Owner
Copy Link

LGTM

LGTM
gaisser merged commit 261eea381e into development 2022-05-24 17:48:08 +02:00
gaisser deleted branch mueller/tc-11-tweaks 2022-05-24 17:48:11 +02:00
Sign in to join this conversation.
Reviewers
No reviewers
gaisser
Labels
Clear labels   
API Change

Changes the API, so Users need to adapted

  
Breaking API Change

Changes the API in a non backwards compatible way

  
bug

Something is not working

  
build

Issues related to the buildsystem, including CI

  
cosmetics

Small change most users won't notice

  
Documentation

Improvement of code documentation

  
duplicate

This issue or pull request already exists

  
feature

New feature

  
help wanted

Need some help

  
hotfix

Quick or important fix that is merged directly into master, causing a new revision

  
invalid

#worksforme

  
question

More information is needed

  
Refactor

Contains a refactoring of some code

  
Tests

Issues related to testing code

  
wontfix

This won't be fixed

No Label
API Change
Breaking API Change
bug
build
cosmetics
Documentation
duplicate
feature
help wanted
hotfix
invalid
question
Refactor
Tests
wontfix
Milestone
Clear milestone
No items
No Milestone
v5.0.0
Assignees
Clear assignees
No Assignees
2 Participants
Notifications
Due Date
The due date is invalid or out of range. Please use the format 'yyyy-mm-dd'.

No due date set.

Dependencies

No dependencies set.

Reference: fsfw/fsfw#632
No description provided.
Delete Branch "mueller/tc-11-tweaks"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?