Merge remote-tracking branch 'origin/develop' into irini
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good

This commit is contained in:
2022-08-16 18:52:16 +02:00
17 changed files with 235 additions and 30 deletions

View File

@ -18,7 +18,7 @@ enum commonObjects : uint32_t {
/* 0x43 ('C') for Controllers */
THERMAL_CONTROLLER = 0x43400001,
ACS_CONTROLLER = 0x43100002,
ACS_CONTROLLER = 0x43000002,
CORE_CONTROLLER = 0x43000003,
/* 0x44 ('D') for device handlers */