diff --git a/bsp_q7s/core/ObjectFactory.h b/bsp_q7s/core/ObjectFactory.h index cae4d1a0..69b491f8 100644 --- a/bsp_q7s/core/ObjectFactory.h +++ b/bsp_q7s/core/ObjectFactory.h @@ -30,7 +30,7 @@ void createHeaterComponents(); void createSolarArrayDeploymentComponents(); void createSyrlinksComponents(PowerSwitchIF* pwrSwitcher); void createPayloadComponents(LinuxLibgpioIF* gpioComIF); -void createReactionWheelComponents(LinuxLibgpioIF* gpioComIF); +void createReactionWheelComponents(LinuxLibgpioIF* gpioComIF, PowerSwitchIF* pwrSwitcher); void createCcsdsComponents(LinuxLibgpioIF* gpioComIF); void createTestComponents(LinuxLibgpioIF* gpioComIF); diff --git a/bsp_q7s/fm/fmObjectFactory.cpp b/bsp_q7s/fm/fmObjectFactory.cpp index a0eb090c..0ebbcb28 100644 --- a/bsp_q7s/fm/fmObjectFactory.cpp +++ b/bsp_q7s/fm/fmObjectFactory.cpp @@ -165,7 +165,7 @@ void ObjectFactory::produce(void* args) { imtqHandler->setDebugMode(true); #endif #endif - createReactionWheelComponents(gpioComIF); + createReactionWheelComponents(gpioComIF, pwrSwitcher); #if OBSW_ADD_BPX_BATTERY_HANDLER == 1 I2cCookie* bpxI2cCookie = new I2cCookie(addresses::BPX_BATTERY, 100, q7s::I2C_DEFAULT_DEV); @@ -679,7 +679,8 @@ void ObjectFactory::createPayloadComponents(LinuxLibgpioIF* gpioComIF) { static_cast(consumer); } -void ObjectFactory::createReactionWheelComponents(LinuxLibgpioIF* gpioComIF) { +void ObjectFactory::createReactionWheelComponents(LinuxLibgpioIF* gpioComIF, + PowerSwitchIF* pwrSwitcher) { using namespace gpio; GpioCookie* gpioCookieRw = new GpioCookie; GpioCallback* csRw1 = @@ -750,7 +751,9 @@ void ObjectFactory::createReactionWheelComponents(LinuxLibgpioIF* gpioComIF) { } RwHelper rwHelper(rwIds); - // auto* rwAss = new RwAssembly(); + auto* rwAss = new RwAssembly(objects::RW_ASS, objects::NO_OBJECT, pwrSwitcher, + pcdu::Switches::PDU2_CH2_RW_5V, rwHelper); + rwAss-> #endif /* OBSW_ADD_RW == 1 */ } diff --git a/misc/eclipse/.cproject b/misc/eclipse/.cproject index 7f1481ed..2eadab53 100644 --- a/misc/eclipse/.cproject +++ b/misc/eclipse/.cproject @@ -57,7 +57,7 @@ - + @@ -119,7 +119,7 @@ - + @@ -187,7 +187,7 @@ - + @@ -255,7 +255,7 @@ - + @@ -418,7 +418,7 @@ - + @@ -580,7 +580,7 @@ - + @@ -750,7 +750,7 @@ - + @@ -917,7 +917,7 @@ - + @@ -1084,7 +1084,7 @@ - + @@ -1249,7 +1249,7 @@ - + @@ -1415,7 +1415,7 @@ - + @@ -1481,7 +1481,7 @@ - + @@ -1649,7 +1649,7 @@ - + @@ -1718,7 +1718,7 @@ - +