Update FSFW from upstream #102

Merged
meierj merged 88 commits from mueller/update-from-upstream into develop 2022-07-04 13:04:01 +02:00
1 changed files with 2 additions and 2 deletions
Showing only changes of commit a0ee86ace8 - Show all commits

View File

@ -50,11 +50,11 @@ class FixedTimeslotTaskIF : public PeriodicTaskIF {
*/
virtual ReturnValue_t checkSequence() = 0;
virtual ReturnValue_t addComponent(object_id_t object, uint8_t opCode) {
ReturnValue_t addComponent(object_id_t object, uint8_t opCode) override {
return HasReturnvaluesIF::RETURN_FAILED;
}
virtual ReturnValue_t addComponent(ExecutableObjectIF* object, uint8_t opCode) {
ReturnValue_t addComponent(ExecutableObjectIF* object, uint8_t opCode) override {
return HasReturnvaluesIF::RETURN_FAILED;
}
};