From 0237a22ae99cbceae838c6b6b30b360c3b285b0f Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Wed, 13 Oct 2021 15:42:55 +0200 Subject: [PATCH] using old names again --- bsp_hosted/fsfwconfig/devices/gpioIds.h | 8 +-- bsp_q7s/core/ObjectFactory.cpp | 96 ++++++++++++------------- bsp_q7s/gpio/gpioCallbacks.cpp | 60 ++++++++-------- common/config/commonObjects.h | 32 ++++----- linux/fsfwconfig/devices/addresses.h | 6 +- linux/fsfwconfig/devices/gpioIds.h | 6 +- 6 files changed, 104 insertions(+), 104 deletions(-) diff --git a/bsp_hosted/fsfwconfig/devices/gpioIds.h b/bsp_hosted/fsfwconfig/devices/gpioIds.h index 53a53677..1ab55d08 100644 --- a/bsp_hosted/fsfwconfig/devices/gpioIds.h +++ b/bsp_hosted/fsfwconfig/devices/gpioIds.h @@ -27,10 +27,7 @@ namespace gpioIds { TEST_ID_0, TEST_ID_1, - RTD_IC_0, - RTD_IC_1, - RTD_IC_2, - RTD_IC_3, + RTD_IC_3, RTD_IC_4, RTD_IC_5, RTD_IC_6, @@ -43,6 +40,9 @@ namespace gpioIds { RTD_IC_13, RTD_IC_14, RTD_IC_15, + RTD_IC_16, + RTD_IC_17, + RTD_IC_18, SPI_MUX_BIT_1, SPI_MUX_BIT_2, diff --git a/bsp_q7s/core/ObjectFactory.cpp b/bsp_q7s/core/ObjectFactory.cpp index c6062926..66357373 100644 --- a/bsp_q7s/core/ObjectFactory.cpp +++ b/bsp_q7s/core/ObjectFactory.cpp @@ -643,128 +643,128 @@ void ObjectFactory::createRtdComponents(LinuxLibgpioIF *gpioComIF) { GpioCallback* gpioRtdIc0 = new GpioCallback("Chip select RTD IC0", gpio::OUT, gpio::HIGH, &gpioCallbacks::spiCsDecoderCallback, gpioComIF); - rtdGpioCookie->addGpio(gpioIds::RTD_IC_0, gpioRtdIc0); + rtdGpioCookie->addGpio(gpioIds::RTD_IC_3, gpioRtdIc0); GpioCallback* gpioRtdIc1 = new GpioCallback("Chip select RTD IC1", gpio::OUT, gpio::HIGH, &gpioCallbacks::spiCsDecoderCallback, gpioComIF); - rtdGpioCookie->addGpio(gpioIds::RTD_IC_1, gpioRtdIc1); + rtdGpioCookie->addGpio(gpioIds::RTD_IC_4, gpioRtdIc1); GpioCallback* gpioRtdIc2 = new GpioCallback("Chip select RTD IC2", gpio::OUT, gpio::HIGH, &gpioCallbacks::spiCsDecoderCallback, gpioComIF); - rtdGpioCookie->addGpio(gpioIds::RTD_IC_2, gpioRtdIc2); + rtdGpioCookie->addGpio(gpioIds::RTD_IC_5, gpioRtdIc2); GpioCallback* gpioRtdIc3 = new GpioCallback("Chip select RTD IC3", gpio::OUT, gpio::HIGH, &gpioCallbacks::spiCsDecoderCallback, gpioComIF); - rtdGpioCookie->addGpio(gpioIds::RTD_IC_3, gpioRtdIc3); + rtdGpioCookie->addGpio(gpioIds::RTD_IC_6, gpioRtdIc3); GpioCallback* gpioRtdIc4 = new GpioCallback("Chip select RTD IC4", gpio::OUT, gpio::HIGH, &gpioCallbacks::spiCsDecoderCallback, gpioComIF); - rtdGpioCookie->addGpio(gpioIds::RTD_IC_4, gpioRtdIc4); + rtdGpioCookie->addGpio(gpioIds::RTD_IC_7, gpioRtdIc4); GpioCallback* gpioRtdIc5 = new GpioCallback("Chip select RTD IC5", gpio::OUT, gpio::HIGH, &gpioCallbacks::spiCsDecoderCallback, gpioComIF); - rtdGpioCookie->addGpio(gpioIds::RTD_IC_5, gpioRtdIc5); + rtdGpioCookie->addGpio(gpioIds::RTD_IC_8, gpioRtdIc5); GpioCallback* gpioRtdIc6 = new GpioCallback("Chip select RTD IC6", gpio::OUT, gpio::HIGH, &gpioCallbacks::spiCsDecoderCallback, gpioComIF); - rtdGpioCookie->addGpio(gpioIds::RTD_IC_6, gpioRtdIc6); + rtdGpioCookie->addGpio(gpioIds::RTD_IC_9, gpioRtdIc6); GpioCallback* gpioRtdIc7 = new GpioCallback("Chip select RTD IC7", gpio::OUT, gpio::HIGH, &gpioCallbacks::spiCsDecoderCallback, gpioComIF); - rtdGpioCookie->addGpio(gpioIds::RTD_IC_7, gpioRtdIc7); + rtdGpioCookie->addGpio(gpioIds::RTD_IC_10, gpioRtdIc7); GpioCallback* gpioRtdIc8 = new GpioCallback("Chip select RTD IC8", gpio::OUT, gpio::HIGH, &gpioCallbacks::spiCsDecoderCallback, gpioComIF); - rtdGpioCookie->addGpio(gpioIds::RTD_IC_8, gpioRtdIc8); + rtdGpioCookie->addGpio(gpioIds::RTD_IC_11, gpioRtdIc8); GpioCallback* gpioRtdIc9 = new GpioCallback("Chip select RTD IC9", gpio::OUT, gpio::HIGH, &gpioCallbacks::spiCsDecoderCallback, gpioComIF); - rtdGpioCookie->addGpio(gpioIds::RTD_IC_9, gpioRtdIc9); + rtdGpioCookie->addGpio(gpioIds::RTD_IC_12, gpioRtdIc9); GpioCallback* gpioRtdIc10 = new GpioCallback("Chip select RTD IC10", gpio::OUT, gpio::HIGH, &gpioCallbacks::spiCsDecoderCallback, gpioComIF); - rtdGpioCookie->addGpio(gpioIds::RTD_IC_10, gpioRtdIc10); + rtdGpioCookie->addGpio(gpioIds::RTD_IC_13, gpioRtdIc10); GpioCallback* gpioRtdIc11 = new GpioCallback("Chip select RTD IC11", gpio::OUT, gpio::HIGH, &gpioCallbacks::spiCsDecoderCallback, gpioComIF); - rtdGpioCookie->addGpio(gpioIds::RTD_IC_11, gpioRtdIc11); + rtdGpioCookie->addGpio(gpioIds::RTD_IC_14, gpioRtdIc11); GpioCallback* gpioRtdIc12 = new GpioCallback("Chip select RTD IC12", gpio::OUT, gpio::HIGH, &gpioCallbacks::spiCsDecoderCallback, gpioComIF); - rtdGpioCookie->addGpio(gpioIds::RTD_IC_12, gpioRtdIc12); + rtdGpioCookie->addGpio(gpioIds::RTD_IC_15, gpioRtdIc12); GpioCallback* gpioRtdIc13 = new GpioCallback("Chip select RTD IC13", gpio::OUT, gpio::HIGH, &gpioCallbacks::spiCsDecoderCallback, gpioComIF); - rtdGpioCookie->addGpio(gpioIds::RTD_IC_13, gpioRtdIc13); + rtdGpioCookie->addGpio(gpioIds::RTD_IC_16, gpioRtdIc13); GpioCallback* gpioRtdIc14 = new GpioCallback("Chip select RTD IC14", gpio::OUT, gpio::HIGH, &gpioCallbacks::spiCsDecoderCallback, gpioComIF); - rtdGpioCookie->addGpio(gpioIds::RTD_IC_14, gpioRtdIc14); + rtdGpioCookie->addGpio(gpioIds::RTD_IC_17, gpioRtdIc14); GpioCallback* gpioRtdIc15 = new GpioCallback("Chip select RTD IC15", gpio::OUT, gpio::HIGH, &gpioCallbacks::spiCsDecoderCallback, gpioComIF); - rtdGpioCookie->addGpio(gpioIds::RTD_IC_15, gpioRtdIc15); + rtdGpioCookie->addGpio(gpioIds::RTD_IC_18, gpioRtdIc15); gpioComIF->addGpios(rtdGpioCookie); - SpiCookie* spiRtdIc0 = new SpiCookie(addresses::RTD_IC_0, gpioIds::RTD_IC_0, q7s::SPI_DEFAULT_DEV, + SpiCookie* spiRtdIc0 = new SpiCookie(addresses::RTD_IC_3, gpioIds::RTD_IC_3, q7s::SPI_DEFAULT_DEV, Max31865Definitions::MAX_REPLY_SIZE, spi::SpiModes::MODE_1, spi::RTD_SPEED); - SpiCookie* spiRtdIc1 = new SpiCookie(addresses::RTD_IC_1, gpioIds::RTD_IC_1, q7s::SPI_DEFAULT_DEV, + SpiCookie* spiRtdIc1 = new SpiCookie(addresses::RTD_IC_4, gpioIds::RTD_IC_4, q7s::SPI_DEFAULT_DEV, Max31865Definitions::MAX_REPLY_SIZE, spi::SpiModes::MODE_1, spi::RTD_SPEED); - SpiCookie* spiRtdIc2 = new SpiCookie(addresses::RTD_IC_2, gpioIds::RTD_IC_2, q7s::SPI_DEFAULT_DEV, + SpiCookie* spiRtdIc2 = new SpiCookie(addresses::RTD_IC_5, gpioIds::RTD_IC_5, q7s::SPI_DEFAULT_DEV, Max31865Definitions::MAX_REPLY_SIZE, spi::SpiModes::MODE_1, spi::RTD_SPEED); - SpiCookie* spiRtdIc3 = new SpiCookie(addresses::RTD_IC_3, gpioIds::RTD_IC_3, q7s::SPI_DEFAULT_DEV, + SpiCookie* spiRtdIc3 = new SpiCookie(addresses::RTD_IC_6, gpioIds::RTD_IC_6, q7s::SPI_DEFAULT_DEV, Max31865Definitions::MAX_REPLY_SIZE, spi::SpiModes::MODE_1, spi::RTD_SPEED); - SpiCookie* spiRtdIc4 = new SpiCookie(addresses::RTD_IC_4, gpioIds::RTD_IC_4, q7s::SPI_DEFAULT_DEV, + SpiCookie* spiRtdIc4 = new SpiCookie(addresses::RTD_IC_7, gpioIds::RTD_IC_7, q7s::SPI_DEFAULT_DEV, Max31865Definitions::MAX_REPLY_SIZE, spi::SpiModes::MODE_1, spi::RTD_SPEED); - SpiCookie* spiRtdIc5 = new SpiCookie(addresses::RTD_IC_5, gpioIds::RTD_IC_5, q7s::SPI_DEFAULT_DEV, + SpiCookie* spiRtdIc5 = new SpiCookie(addresses::RTD_IC_8, gpioIds::RTD_IC_8, q7s::SPI_DEFAULT_DEV, Max31865Definitions::MAX_REPLY_SIZE, spi::SpiModes::MODE_1, spi::RTD_SPEED); - SpiCookie* spiRtdIc6 = new SpiCookie(addresses::RTD_IC_6, gpioIds::RTD_IC_6, q7s::SPI_DEFAULT_DEV, + SpiCookie* spiRtdIc6 = new SpiCookie(addresses::RTD_IC_9, gpioIds::RTD_IC_9, q7s::SPI_DEFAULT_DEV, Max31865Definitions::MAX_REPLY_SIZE, spi::SpiModes::MODE_1, spi::RTD_SPEED); - SpiCookie* spiRtdIc7 = new SpiCookie(addresses::RTD_IC_7, gpioIds::RTD_IC_7, + SpiCookie* spiRtdIc7 = new SpiCookie(addresses::RTD_IC_10, gpioIds::RTD_IC_10, q7s::SPI_DEFAULT_DEV, Max31865Definitions::MAX_REPLY_SIZE, spi::SpiModes::MODE_1, spi::RTD_SPEED); - SpiCookie* spiRtdIc8 = new SpiCookie(addresses::RTD_IC_8, gpioIds::RTD_IC_8, + SpiCookie* spiRtdIc8 = new SpiCookie(addresses::RTD_IC_11, gpioIds::RTD_IC_11, q7s::SPI_DEFAULT_DEV, Max31865Definitions::MAX_REPLY_SIZE, spi::SpiModes::MODE_1, spi::RTD_SPEED); - SpiCookie* spiRtdIc9 = new SpiCookie(addresses::RTD_IC_9, gpioIds::RTD_IC_9, + SpiCookie* spiRtdIc9 = new SpiCookie(addresses::RTD_IC_12, gpioIds::RTD_IC_12, q7s::SPI_DEFAULT_DEV, Max31865Definitions::MAX_REPLY_SIZE, spi::SpiModes::MODE_1, spi::RTD_SPEED); - SpiCookie* spiRtdIc10 = new SpiCookie(addresses::RTD_IC_10, gpioIds::RTD_IC_10, + SpiCookie* spiRtdIc10 = new SpiCookie(addresses::RTD_IC_13, gpioIds::RTD_IC_13, q7s::SPI_DEFAULT_DEV, Max31865Definitions::MAX_REPLY_SIZE, spi::SpiModes::MODE_1, spi::RTD_SPEED); - SpiCookie* spiRtdIc11 = new SpiCookie(addresses::RTD_IC_11, gpioIds::RTD_IC_11, + SpiCookie* spiRtdIc11 = new SpiCookie(addresses::RTD_IC_14, gpioIds::RTD_IC_14, q7s::SPI_DEFAULT_DEV, Max31865Definitions::MAX_REPLY_SIZE, spi::SpiModes::MODE_1, spi::RTD_SPEED); - SpiCookie* spiRtdIc12 = new SpiCookie(addresses::RTD_IC_12, gpioIds::RTD_IC_12, + SpiCookie* spiRtdIc12 = new SpiCookie(addresses::RTD_IC_15, gpioIds::RTD_IC_15, q7s::SPI_DEFAULT_DEV, Max31865Definitions::MAX_REPLY_SIZE, spi::SpiModes::MODE_1, spi::RTD_SPEED); - SpiCookie* spiRtdIc13 = new SpiCookie(addresses::RTD_IC_13, gpioIds::RTD_IC_13, + SpiCookie* spiRtdIc13 = new SpiCookie(addresses::RTD_IC_16, gpioIds::RTD_IC_16, std::string(q7s::SPI_DEFAULT_DEV), Max31865Definitions::MAX_REPLY_SIZE, spi::SpiModes::MODE_1, spi::RTD_SPEED); - SpiCookie* spiRtdIc14 = new SpiCookie(addresses::RTD_IC_14, gpioIds::RTD_IC_14, + SpiCookie* spiRtdIc14 = new SpiCookie(addresses::RTD_IC_17, gpioIds::RTD_IC_17, q7s::SPI_DEFAULT_DEV, Max31865Definitions::MAX_REPLY_SIZE, spi::SpiModes::MODE_1, spi::RTD_SPEED); - SpiCookie* spiRtdIc15 = new SpiCookie(addresses::RTD_IC_15, gpioIds::RTD_IC_15, + SpiCookie* spiRtdIc15 = new SpiCookie(addresses::RTD_IC_18, gpioIds::RTD_IC_18, q7s::SPI_DEFAULT_DEV, Max31865Definitions::MAX_REPLY_SIZE, spi::SpiModes::MODE_1, spi::RTD_SPEED); - Max31865PT1000Handler* rtdIc0 = new Max31865PT1000Handler(objects::RTD_IC_0, objects::SPI_COM_IF, + Max31865PT1000Handler* rtdIc0 = new Max31865PT1000Handler(objects::RTD_IC_6, objects::SPI_COM_IF, spiRtdIc0); - Max31865PT1000Handler* rtdIc1 = new Max31865PT1000Handler(objects::RTD_IC_1, objects::SPI_COM_IF, + Max31865PT1000Handler* rtdIc1 = new Max31865PT1000Handler(objects::RTD_IC_4, objects::SPI_COM_IF, spiRtdIc1); - Max31865PT1000Handler* rtdIc2 = new Max31865PT1000Handler(objects::RTD_IC_2, objects::SPI_COM_IF, + Max31865PT1000Handler* rtdIc2 = new Max31865PT1000Handler(objects::RTD_IC_5, objects::SPI_COM_IF, spiRtdIc2); - Max31865PT1000Handler* rtdIc3 = new Max31865PT1000Handler(objects::RTD_IC_3, objects::SPI_COM_IF, + Max31865PT1000Handler* rtdIc3 = new Max31865PT1000Handler(objects::RTD_IC_6, objects::SPI_COM_IF, spiRtdIc3); - Max31865PT1000Handler* rtdIc4 = new Max31865PT1000Handler(objects::RTD_IC_4, objects::SPI_COM_IF, + Max31865PT1000Handler* rtdIc4 = new Max31865PT1000Handler(objects::RTD_IC_7, objects::SPI_COM_IF, spiRtdIc4); - Max31865PT1000Handler* rtdIc5 = new Max31865PT1000Handler(objects::RTD_IC_5, objects::SPI_COM_IF, + Max31865PT1000Handler* rtdIc5 = new Max31865PT1000Handler(objects::RTD_IC_8, objects::SPI_COM_IF, spiRtdIc5); - Max31865PT1000Handler* rtdIc6 = new Max31865PT1000Handler(objects::RTD_IC_6, objects::SPI_COM_IF, + Max31865PT1000Handler* rtdIc6 = new Max31865PT1000Handler(objects::RTD_IC_9, objects::SPI_COM_IF, spiRtdIc6); - Max31865PT1000Handler* rtdIc7 = new Max31865PT1000Handler(objects::RTD_IC_7, + Max31865PT1000Handler* rtdIc7 = new Max31865PT1000Handler(objects::RTD_IC_10, objects::SPI_COM_IF, spiRtdIc7); - Max31865PT1000Handler* rtdIc8 = new Max31865PT1000Handler(objects::RTD_IC_8, + Max31865PT1000Handler* rtdIc8 = new Max31865PT1000Handler(objects::RTD_IC_11, objects::SPI_COM_IF, spiRtdIc8); - Max31865PT1000Handler* rtdIc9 = new Max31865PT1000Handler(objects::RTD_IC_9, + Max31865PT1000Handler* rtdIc9 = new Max31865PT1000Handler(objects::RTD_IC_12, objects::SPI_COM_IF, spiRtdIc9); - Max31865PT1000Handler* rtdIc10 = new Max31865PT1000Handler(objects::RTD_IC_10, + Max31865PT1000Handler* rtdIc10 = new Max31865PT1000Handler(objects::RTD_IC_13, objects::SPI_COM_IF, spiRtdIc10); - Max31865PT1000Handler* rtdIc11 = new Max31865PT1000Handler(objects::RTD_IC_11, + Max31865PT1000Handler* rtdIc11 = new Max31865PT1000Handler(objects::RTD_IC_14, objects::SPI_COM_IF, spiRtdIc11); - Max31865PT1000Handler* rtdIc12 = new Max31865PT1000Handler(objects::RTD_IC_12, + Max31865PT1000Handler* rtdIc12 = new Max31865PT1000Handler(objects::RTD_IC_15, objects::SPI_COM_IF, spiRtdIc12); - Max31865PT1000Handler* rtdIc13 = new Max31865PT1000Handler(objects::RTD_IC_13, + Max31865PT1000Handler* rtdIc13 = new Max31865PT1000Handler(objects::RTD_IC_16, objects::SPI_COM_IF, spiRtdIc13); - Max31865PT1000Handler* rtdIc14 = new Max31865PT1000Handler(objects::RTD_IC_14, + Max31865PT1000Handler* rtdIc14 = new Max31865PT1000Handler(objects::RTD_IC_17, objects::SPI_COM_IF, spiRtdIc14); - Max31865PT1000Handler* rtdIc15 = new Max31865PT1000Handler(objects::RTD_IC_15, + Max31865PT1000Handler* rtdIc15 = new Max31865PT1000Handler(objects::RTD_IC_18, objects::SPI_COM_IF, spiRtdIc15); rtdIc0->setStartUpImmediately(); diff --git a/bsp_q7s/gpio/gpioCallbacks.cpp b/bsp_q7s/gpio/gpioCallbacks.cpp index 27ae18d0..b1eefac7 100644 --- a/bsp_q7s/gpio/gpioCallbacks.cpp +++ b/bsp_q7s/gpio/gpioCallbacks.cpp @@ -72,82 +72,82 @@ void spiCsDecoderCallback(gpioId_t gpioId, gpio::GpioOperation gpioOp, gpio::Lev } else if (value == gpio::LOW) { switch (gpioId) { - case(gpioIds::RTD_IC_0): { - enableDecoderTcsIc1(); - selectY7(); - break; - } - case(gpioIds::RTD_IC_1): { - enableDecoderTcsIc1(); - selectY6(); - break; - } - case(gpioIds::RTD_IC_2): { - enableDecoderTcsIc1(); - selectY5(); - break; - } case(gpioIds::RTD_IC_3): { enableDecoderTcsIc1(); - selectY4(); + selectY7(); break; } case(gpioIds::RTD_IC_4): { enableDecoderTcsIc1(); - selectY3(); + selectY6(); break; } case(gpioIds::RTD_IC_5): { enableDecoderTcsIc1(); - selectY2(); + selectY5(); break; } case(gpioIds::RTD_IC_6): { enableDecoderTcsIc1(); - selectY1(); + selectY4(); break; } case(gpioIds::RTD_IC_7): { enableDecoderTcsIc1(); - selectY0(); + selectY3(); break; } case(gpioIds::RTD_IC_8): { - enableDecoderTcsIc2(); - selectY7(); + enableDecoderTcsIc1(); + selectY2(); break; } case(gpioIds::RTD_IC_9): { - enableDecoderTcsIc2(); - selectY6(); + enableDecoderTcsIc1(); + selectY1(); break; } case(gpioIds::RTD_IC_10): { - enableDecoderTcsIc2(); - selectY5(); + enableDecoderTcsIc1(); + selectY0(); break; } case(gpioIds::RTD_IC_11): { enableDecoderTcsIc2(); - selectY4(); + selectY7(); break; } case(gpioIds::RTD_IC_12): { enableDecoderTcsIc2(); - selectY3(); + selectY6(); break; } case(gpioIds::RTD_IC_13): { enableDecoderTcsIc2(); - selectY2(); + selectY5(); break; } case(gpioIds::RTD_IC_14): { enableDecoderTcsIc2(); - selectY1(); + selectY4(); break; } case(gpioIds::RTD_IC_15): { + enableDecoderTcsIc2(); + selectY3(); + break; + } + case(gpioIds::RTD_IC_16): { + enableDecoderTcsIc2(); + selectY2(); + break; + } + case(gpioIds::RTD_IC_17): { + enableDecoderTcsIc2(); + selectY1(); + break; + } + case(gpioIds::RTD_IC_18): { enableDecoderTcsIc2(); selectY0(); break; diff --git a/common/config/commonObjects.h b/common/config/commonObjects.h index 9e4418d2..dc18995e 100644 --- a/common/config/commonObjects.h +++ b/common/config/commonObjects.h @@ -47,22 +47,22 @@ enum commonObjects: uint32_t { * Not yet specified which pt1000 will measure which device/location in the satellite. * Therefore object ids are named according to the IC naming of the RTDs in the schematic. */ - RTD_IC_0 = 0x44420016, - RTD_IC_1 = 0x44420017, - RTD_IC_2 = 0x44420018, - RTD_IC_3 = 0x44420019, - RTD_IC_4 = 0x44420020, - RTD_IC_5 = 0x44420021, - RTD_IC_6 = 0x44420022, - RTD_IC_7 = 0x44420023, - RTD_IC_8 = 0x44420024, - RTD_IC_9 = 0x44420025, - RTD_IC_10 = 0x44420026, - RTD_IC_11 = 0x44420027, - RTD_IC_12 = 0x44420028, - RTD_IC_13 = 0x44420029, - RTD_IC_14 = 0x44420030, - RTD_IC_15 = 0x44420031, + RTD_IC_3 = 0x44420016, + RTD_IC_4 = 0x44420017, + RTD_IC_5 = 0x44420018, + RTD_IC_6 = 0x44420019, + RTD_IC_7 = 0x44420020, + RTD_IC_8 = 0x44420021, + RTD_IC_9 = 0x44420022, + RTD_IC_10 = 0x44420023, + RTD_IC_11 = 0x44420024, + RTD_IC_12 = 0x44420025, + RTD_IC_13 = 0x44420026, + RTD_IC_14 = 0x44420027, + RTD_IC_15 = 0x44420028, + RTD_IC_16 = 0x44420029, + RTD_IC_17 = 0x44420030, + RTD_IC_18 = 0x44420031, SUS_1 = 0x44120032, SUS_2 = 0x44120033, diff --git a/linux/fsfwconfig/devices/addresses.h b/linux/fsfwconfig/devices/addresses.h index 945c2eb7..94f22c54 100644 --- a/linux/fsfwconfig/devices/addresses.h +++ b/linux/fsfwconfig/devices/addresses.h @@ -49,9 +49,6 @@ namespace addresses { }; enum spiAddresses: address_t { - RTD_IC_0, - RTD_IC_1, - RTD_IC_2, RTD_IC_3, RTD_IC_4, RTD_IC_5, @@ -65,6 +62,9 @@ namespace addresses { RTD_IC_13, RTD_IC_14, RTD_IC_15, + RTD_IC_16, + RTD_IC_17, + RTD_IC_18, RW1, RW2, RW3, diff --git a/linux/fsfwconfig/devices/gpioIds.h b/linux/fsfwconfig/devices/gpioIds.h index 62913d5a..ebe8a3eb 100644 --- a/linux/fsfwconfig/devices/gpioIds.h +++ b/linux/fsfwconfig/devices/gpioIds.h @@ -34,9 +34,6 @@ enum gpioId_t { TEST_ID_0, TEST_ID_1, - RTD_IC_0, - RTD_IC_1, - RTD_IC_2, RTD_IC_3, RTD_IC_4, RTD_IC_5, @@ -50,6 +47,9 @@ enum gpioId_t { RTD_IC_13, RTD_IC_14, RTD_IC_15, + RTD_IC_16, + RTD_IC_17, + RTD_IC_18, CS_SUS_1, CS_SUS_2,