object manager convergence #202

muellerr · 2020-09-18T13:36:04+02:00

muellerr commented

2020-09-18 13:36:04 +02:00

This would make the KSat fork objectmanager folder and main branch object manager folder equal. I looked through the files and made some minor tweaks
where necessary.

I also added some PUS services as framework objects. Unfortunately, this breaks things if the object ID is defined twice, but I consider this a minor API change.

Steps for developers

Delete

PUS_SERVICE_1, 
PUS_SERVICE_2, 
PUS_SERVICE_5, 
PUS_SERVICE_8, 
PUS_SERVICE_200

from systemObjectList.h in the config folder, those are framework objects now.

This would make the KSat fork objectmanager folder and main branch object manager folder equal. I looked through the files and made some minor tweaks where necessary. I also added some PUS services as framework objects. Unfortunately, this breaks things if the object ID is defined twice, but I consider this a minor API change. ### Steps for developers Delete ``` PUS_SERVICE_1, PUS_SERVICE_2, PUS_SERVICE_5, PUS_SERVICE_8, PUS_SERVICE_200 ``` from `systemObjectList.h` in the config folder, those are framework objects now.

muellerr added the

feature

API Change

labels 2020-09-18 13:36:04 +02:00

gaisser referenced this issue from a commit

2020-09-22 15:03:57 +02:00

Merge pull request 'object manager convergence' (#202) from KSat/fsfw:mueller/objectManager-convergence into master Reviewed-on: https://egit.irs.uni-stuttgart.de/fsfw/fsfw/pulls/202

gaisser merged commit 580669d49d into master

2020-09-22 15:03:57 +02:00

gaisser deleted branch mueller/objectManager-convergence

2020-09-22 15:04:01 +02:00

Sign in to join this conversation.