Merge remote-tracking branch 'origin/develop' into mueller/heater-health-if

2022-05-12 14:11:46 +02:00
parent 4864394590 658acb0554
commit 51466e68d7
59 changed files with 1063 additions and 1718 deletions
--- a/linux/fsfwconfig/objects/systemObjectList.h
+++ b/linux/fsfwconfig/objects/systemObjectList.h
@ -47,8 +47,9 @@ enum sourceObjects : uint32_t {
  CSP_COM_IF = 0x49050001,
  I2C_COM_IF = 0x49040002,
  UART_COM_IF = 0x49030003,
-  SPI_COM_IF = 0x49020004,
+  SPI_MAIN_COM_IF = 0x49020004,
  GPIO_IF = 0x49010005,
+  SPI_RW_COM_IF = 0x49020005,

  /* 0x54 ('T') for test handlers */
  TEST_TASK = 0x54694269,