diff --git a/bsp_q7s/boardconfig/busConf.h b/bsp_q7s/boardconfig/busConf.h index 74c91708..ba4eda03 100644 --- a/bsp_q7s/boardconfig/busConf.h +++ b/bsp_q7s/boardconfig/busConf.h @@ -33,17 +33,21 @@ static const char* const GPIO_RW_DEFAULT_CHIP = GPIO_FLEX_OBC1F_B0; static const char* const GPIO_RAD_SENSOR_CHIP = GPIO_FLEX_OBC1F_B0; static constexpr uint32_t GPIO_RW_0_CS = 7; // B20 -static constexpr uint32_t GPIO_RW_1_CS = 3; -static constexpr uint32_t GPIO_RW_2_CS = 11; -static constexpr uint32_t GPIO_RW_3_CS = 6; +static constexpr uint32_t GPIO_RW_1_CS = 3; // G22 +static constexpr uint32_t GPIO_RW_2_CS = 11; // E18 +static constexpr uint32_t GPIO_RW_3_CS = 6; // B19 -static constexpr uint32_t GPIO_GYRO_1_L3G_CS = 18; -static constexpr uint32_t GPIO_GYRO_3_L3G_CS = 1; -static constexpr uint32_t GPIO_MGM_0_LIS3_CS = 5; -static constexpr uint32_t GPIO_MGM_1_RM3100_CS = 16; +static constexpr uint32_t GPIO_GYRO_1_L3G_CS = 18; // N22 +static constexpr uint32_t GPIO_GYRO_3_L3G_CS = 1; // M21 +static constexpr uint32_t GPIO_MGM_0_LIS3_CS = 5; // C18 +// MGM_2 is part of gpiochip6 +static constexpr uint32_t GPIO_MGM_1_RM3100_CS = 16; // A16 +static constexpr uint32_t GPIO_MGM_3_RM3100_CS = 10; // C17 -static constexpr uint32_t GPIO_MGM_3_RM3100_CS = 10; -// Active low reset pin +// Active low enable pin (needs to be driven low for regular operations) +static constexpr uint32_t GPIO_GYRO_0_ENABLE = 2; // H22 + +// Active low reset pin (needs to be driven high for regular operations) static constexpr uint32_t GPIO_RESET_GNSS_0 = 9; // C22 static constexpr uint32_t GPIO_RESET_GNSS_1 = 12; // B21 diff --git a/fsfw b/fsfw index 40adca5f..97494a84 160000 --- a/fsfw +++ b/fsfw @@ -1 +1 @@ -Subproject commit 40adca5f1d13ef8d6c712842ebc37e37fe449446 +Subproject commit 97494a84dfd0acb9dc32770ae9d142f80d4bbcfa diff --git a/linux/fsfwconfig/pollingsequence/pollingSequenceFactory.cpp b/linux/fsfwconfig/pollingsequence/pollingSequenceFactory.cpp index 9eb1bd12..5f7bfd35 100644 --- a/linux/fsfwconfig/pollingsequence/pollingSequenceFactory.cpp +++ b/linux/fsfwconfig/pollingsequence/pollingSequenceFactory.cpp @@ -436,16 +436,16 @@ ReturnValue_t pst::pstSpi(FixedTimeslotTaskIF *thisSequence) { // thisSequence->addSlot(objects::MGM_0_LIS3_HANDLER, length * 0.8, // DeviceHandlerIF::GET_READ); // -// thisSequence->addSlot(objects::MGM_1_RM3100_HANDLER, length * 0, -// DeviceHandlerIF::PERFORM_OPERATION); -// thisSequence->addSlot(objects::MGM_1_RM3100_HANDLER, length * 0.2, -// DeviceHandlerIF::SEND_WRITE); -// thisSequence->addSlot(objects::MGM_1_RM3100_HANDLER, length * 0.4, -// DeviceHandlerIF::GET_WRITE); -// thisSequence->addSlot(objects::MGM_1_RM3100_HANDLER, length * 0.6, -// DeviceHandlerIF::SEND_READ); -// thisSequence->addSlot(objects::MGM_1_RM3100_HANDLER, length * 0.8, -// DeviceHandlerIF::GET_READ); + thisSequence->addSlot(objects::MGM_1_RM3100_HANDLER, length * 0, + DeviceHandlerIF::PERFORM_OPERATION); + thisSequence->addSlot(objects::MGM_1_RM3100_HANDLER, length * 0.2, + DeviceHandlerIF::SEND_WRITE); + thisSequence->addSlot(objects::MGM_1_RM3100_HANDLER, length * 0.4, + DeviceHandlerIF::GET_WRITE); + thisSequence->addSlot(objects::MGM_1_RM3100_HANDLER, length * 0.6, + DeviceHandlerIF::SEND_READ); + thisSequence->addSlot(objects::MGM_1_RM3100_HANDLER, length * 0.8, + DeviceHandlerIF::GET_READ); // // thisSequence->addSlot(objects::MGM_2_LIS3_HANDLER, length * 0, // DeviceHandlerIF::PERFORM_OPERATION); diff --git a/mission/devices/GPSHyperionHandler.cpp b/mission/devices/GPSHyperionHandler.cpp index 3149a051..5e44f89c 100644 --- a/mission/devices/GPSHyperionHandler.cpp +++ b/mission/devices/GPSHyperionHandler.cpp @@ -23,7 +23,7 @@ GPSHyperionHandler::~GPSHyperionHandler() {} void GPSHyperionHandler::doStartUp() { if(internalState == InternalStates::NONE) { commandExecuted = false; - enablePeriodicReply(GpsHyperion::GPS_REPLY); + updatePeriodicReply(true, GpsHyperion::GPS_REPLY); internalState = InternalStates::WAIT_FIRST_MESSAGE; }