solar array depl moved to bsp folder
hosted build working again
This commit is contained in:
parent
6518a7f244
commit
30c9d2dc0f
35
bsp_hosted/fsfwconfig/devices/gpioIds.h
Normal file
35
bsp_hosted/fsfwconfig/devices/gpioIds.h
Normal file
@ -0,0 +1,35 @@
|
|||||||
|
#ifndef FSFWCONFIG_DEVICES_GPIOIDS_H_
|
||||||
|
#define FSFWCONFIG_DEVICES_GPIOIDS_H_
|
||||||
|
|
||||||
|
#include <linux/gpio/GpioIF.h>
|
||||||
|
|
||||||
|
namespace gpioIds {
|
||||||
|
enum gpioId_t {
|
||||||
|
HEATER_0,
|
||||||
|
HEATER_1,
|
||||||
|
HEATER_2,
|
||||||
|
HEATER_3,
|
||||||
|
HEATER_4,
|
||||||
|
HEATER_5,
|
||||||
|
HEATER_6,
|
||||||
|
HEATER_7,
|
||||||
|
DEPLSA1,
|
||||||
|
DEPLSA2,
|
||||||
|
|
||||||
|
MGM_0_LIS3_CS,
|
||||||
|
MGM_1_RM3100_CS,
|
||||||
|
GYRO_0_ADIS_CS,
|
||||||
|
GYRO_1_L3G_CS,
|
||||||
|
GYRO_2_L3G_CS,
|
||||||
|
MGM_2_LIS3_CS,
|
||||||
|
MGM_3_RM3100_CS,
|
||||||
|
|
||||||
|
TEST_ID_0,
|
||||||
|
TEST_ID_1
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
#endif /* FSFWCONFIG_DEVICES_GPIOIDS_H_ */
|
58
bsp_hosted/fsfwconfig/devices/powerSwitcherList.h
Normal file
58
bsp_hosted/fsfwconfig/devices/powerSwitcherList.h
Normal file
@ -0,0 +1,58 @@
|
|||||||
|
#ifndef FSFWCONFIG_DEVICES_POWERSWITCHERLIST_H_
|
||||||
|
#define FSFWCONFIG_DEVICES_POWERSWITCHERLIST_H_
|
||||||
|
|
||||||
|
#include <OBSWConfig.h>
|
||||||
|
|
||||||
|
namespace pcduSwitches {
|
||||||
|
/* Switches are uint8_t datatype and go from 0 to 255 */
|
||||||
|
enum switcherList {
|
||||||
|
Q7S,
|
||||||
|
PAYLOAD_PCDU_CH1,
|
||||||
|
RW,
|
||||||
|
TCS_BOARD_8V_HEATER_IN,
|
||||||
|
SUS_REDUNDANT,
|
||||||
|
DEPLOYMENT_MECHANISM,
|
||||||
|
PAYLOAD_PCDU_CH6,
|
||||||
|
ACS_BOARD_SIDE_B,
|
||||||
|
PAYLOAD_CAMERA,
|
||||||
|
TCS_BOARD_3V3,
|
||||||
|
SYRLINKS,
|
||||||
|
STAR_TRACKER,
|
||||||
|
MGT,
|
||||||
|
SUS_NOMINAL,
|
||||||
|
SOLAR_CELL_EXP,
|
||||||
|
PLOC,
|
||||||
|
ACS_BORAD_SIDE_A,
|
||||||
|
NUMBER_OF_SWITCHES
|
||||||
|
};
|
||||||
|
|
||||||
|
static const uint8_t ON = 1;
|
||||||
|
static const uint8_t OFF = 0;
|
||||||
|
|
||||||
|
/* Output states after reboot of the PDUs */
|
||||||
|
static const uint8_t INIT_STATE_Q7S = ON;
|
||||||
|
static const uint8_t INIT_STATE_PAYLOAD_PCDU_CH1 = OFF;
|
||||||
|
static const uint8_t INIT_STATE_RW = OFF;
|
||||||
|
#if TE0720 == 1
|
||||||
|
/* Because the TE0720 is not connected to the PCDU, this switch is always on */
|
||||||
|
static const uint8_t INIT_STATE_TCS_BOARD_8V_HEATER_IN = ON;
|
||||||
|
#else
|
||||||
|
static const uint8_t INIT_STATE_TCS_BOARD_8V_HEATER_IN = OFF;
|
||||||
|
#endif
|
||||||
|
static const uint8_t INIT_STATE_SUS_REDUNDANT = OFF;
|
||||||
|
static const uint8_t INIT_STATE_DEPLOYMENT_MECHANISM = OFF;
|
||||||
|
static const uint8_t INIT_STATE_PAYLOAD_PCDU_CH6 = OFF;
|
||||||
|
static const uint8_t INIT_STATE_ACS_BOARD_SIDE_B = OFF;
|
||||||
|
static const uint8_t INIT_STATE_PAYLOAD_CAMERA = OFF;
|
||||||
|
static const uint8_t INIT_STATE_TCS_BOARD_3V3 = OFF;
|
||||||
|
static const uint8_t INIT_STATE_SYRLINKS = OFF;
|
||||||
|
static const uint8_t INIT_STATE_STAR_TRACKER = OFF;
|
||||||
|
static const uint8_t INIT_STATE_MGT = OFF;
|
||||||
|
static const uint8_t INIT_STATE_SUS_NOMINAL = OFF;
|
||||||
|
static const uint8_t INIT_STATE_SOLAR_CELL_EXP = OFF;
|
||||||
|
static const uint8_t INIT_STATE_PLOC = OFF;
|
||||||
|
static const uint8_t INIT_STATE_ACS_BOARD_SIDE_A = OFF;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
#endif /* FSFWCONFIG_DEVICES_POWERSWITCHERLIST_H_ */
|
@ -27,6 +27,21 @@ namespace objects {
|
|||||||
DUMMY_INTERFACE = 0xCAFECAFE,
|
DUMMY_INTERFACE = 0xCAFECAFE,
|
||||||
DUMMY_HANDLER = 0x4400AFFE,
|
DUMMY_HANDLER = 0x4400AFFE,
|
||||||
|
|
||||||
|
/* 0x44 ('D') for device handlers */
|
||||||
|
P60DOCK_HANDLER = 0x44000001,
|
||||||
|
PDU1_HANDLER = 0x44000002,
|
||||||
|
PDU2_HANDLER = 0x44000003,
|
||||||
|
ACU_HANDLER = 0x44000004,
|
||||||
|
TMP1075_HANDLER_1 = 0x44000005,
|
||||||
|
TMP1075_HANDLER_2 = 0x44000006,
|
||||||
|
MGM_0_LIS3_HANDLER = 0x4400007,
|
||||||
|
MGM_1_RM3100_HANDLER = 0x44000008,
|
||||||
|
MGM_2_LIS3_HANDLER = 0x44000009,
|
||||||
|
MGM_3_RM3100_HANDLER = 0x44000010,
|
||||||
|
GYRO_0_ADIS_HANDLER = 0x44000011,
|
||||||
|
GYRO_1_L3G_HANDLER = 0x44000012,
|
||||||
|
GYRO_2_L3G_HANDLER = 0x44000013,
|
||||||
|
|
||||||
/* 0x49 ('I') for Communication Interfaces **/
|
/* 0x49 ('I') for Communication Interfaces **/
|
||||||
ARDUINO_COM_IF = 0x49000001
|
ARDUINO_COM_IF = 0x49000001
|
||||||
};
|
};
|
||||||
|
@ -7,6 +7,7 @@
|
|||||||
#include <devices/powerSwitcherList.h>
|
#include <devices/powerSwitcherList.h>
|
||||||
|
|
||||||
#include <bsp_q7s/devices/HeaterHandler.h>
|
#include <bsp_q7s/devices/HeaterHandler.h>
|
||||||
|
#include <bsp_q7s/devices/SolarArrayDeploymentHandler.h>
|
||||||
|
|
||||||
#include <mission/core/GenericFactory.h>
|
#include <mission/core/GenericFactory.h>
|
||||||
#include <mission/devices/PDU1Handler.h>
|
#include <mission/devices/PDU1Handler.h>
|
||||||
@ -15,7 +16,6 @@
|
|||||||
#include <mission/devices/PCDUHandler.h>
|
#include <mission/devices/PCDUHandler.h>
|
||||||
#include <mission/devices/P60DockHandler.h>
|
#include <mission/devices/P60DockHandler.h>
|
||||||
#include <mission/devices/Tmp1075Handler.h>
|
#include <mission/devices/Tmp1075Handler.h>
|
||||||
#include <mission/devices/SolarArrayDeploymentHandler.h>
|
|
||||||
#include <mission/devices/devicedefinitions/GomSpacePackets.h>
|
#include <mission/devices/devicedefinitions/GomSpacePackets.h>
|
||||||
#include <mission/devices/devicedefinitions/GomspaceDefinitions.h>
|
#include <mission/devices/devicedefinitions/GomspaceDefinitions.h>
|
||||||
#include <mission/utility/TmFunnel.h>
|
#include <mission/utility/TmFunnel.h>
|
||||||
|
@ -1,3 +1,4 @@
|
|||||||
target_sources(${TARGET_NAME} PRIVATE
|
target_sources(${TARGET_NAME} PRIVATE
|
||||||
HeaterHandler.cpp
|
HeaterHandler.cpp
|
||||||
|
SolarArrayDeploymentHandler.cpp
|
||||||
)
|
)
|
||||||
|
@ -1,7 +1,8 @@
|
|||||||
|
#include "SolarArrayDeploymentHandler.h"
|
||||||
|
|
||||||
#include <devices/powerSwitcherList.h>
|
#include <devices/powerSwitcherList.h>
|
||||||
#include <devices/gpioIds.h>
|
#include <devices/gpioIds.h>
|
||||||
|
|
||||||
#include <mission/devices/SolarArrayDeploymentHandler.h>
|
|
||||||
#include <linux/gpio/GpioCookie.h>
|
#include <linux/gpio/GpioCookie.h>
|
||||||
#include <fsfw/ipc/QueueFactory.h>
|
#include <fsfw/ipc/QueueFactory.h>
|
||||||
|
|
@ -15,6 +15,7 @@ if [ "${counter}" -ge 5 ];then
|
|||||||
fi
|
fi
|
||||||
|
|
||||||
build_generator=""
|
build_generator=""
|
||||||
|
build_dir="Debug-Host"
|
||||||
os_fsfw="host"
|
os_fsfw="host"
|
||||||
if [ "${OS}" = "Windows_NT" ]; then
|
if [ "${OS}" = "Windows_NT" ]; then
|
||||||
build_generator="MinGW Makefiles"
|
build_generator="MinGW Makefiles"
|
||||||
@ -23,4 +24,4 @@ else
|
|||||||
build_generator="Unix Makefiles"
|
build_generator="Unix Makefiles"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
python3 cmake_build_config.py -o "${os_fsfw}" -g "${build_generator}" -b "debug"
|
python3 cmake_build_config.py -o "${os_fsfw}" -g "${build_generator}" -b "debug" -l"${build_dir}"
|
||||||
|
@ -16,6 +16,7 @@ fi
|
|||||||
|
|
||||||
build_generator=""
|
build_generator=""
|
||||||
os_fsfw="host"
|
os_fsfw="host"
|
||||||
|
build_dir="Debug-Release"
|
||||||
if [ "${OS}" = "Windows_NT" ]; then
|
if [ "${OS}" = "Windows_NT" ]; then
|
||||||
build_generator="MinGW Makefiles"
|
build_generator="MinGW Makefiles"
|
||||||
# Could be other OS but this works for now.
|
# Could be other OS but this works for now.
|
||||||
@ -23,4 +24,4 @@ else
|
|||||||
build_generator="Unix Makefiles"
|
build_generator="Unix Makefiles"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
python3 cmake_build_config.py -o "${os_fsfw}" -g "${build_generator}" -b "release"
|
python3 cmake_build_config.py -o "${os_fsfw}" -g "${build_generator}" -b "release" -l"${build_dir}"
|
||||||
|
@ -10,7 +10,6 @@ target_sources(${TARGET_NAME} PUBLIC
|
|||||||
PDU1Handler.cpp
|
PDU1Handler.cpp
|
||||||
PDU2Handler.cpp
|
PDU2Handler.cpp
|
||||||
ACUHandler.cpp
|
ACUHandler.cpp
|
||||||
SolarArrayDeploymentHandler.cpp
|
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
||||||
|
@ -1,9 +1,12 @@
|
|||||||
#include "PCDUHandler.h"
|
#include "PCDUHandler.h"
|
||||||
#include <fsfwconfig/objects/systemObjectList.h>
|
#include <OBSWConfig.h>
|
||||||
|
#include <objects/systemObjectList.h>
|
||||||
|
|
||||||
#include <mission/devices/devicedefinitions/GomSpacePackets.h>
|
#include <mission/devices/devicedefinitions/GomSpacePackets.h>
|
||||||
|
|
||||||
#include <fsfw/ipc/QueueFactory.h>
|
#include <fsfw/ipc/QueueFactory.h>
|
||||||
#include <fsfw/housekeeping/HousekeepingSnapshot.h>
|
#include <fsfw/housekeeping/HousekeepingSnapshot.h>
|
||||||
#include <fsfwconfig/OBSWConfig.h>
|
|
||||||
|
|
||||||
PCDUHandler::PCDUHandler(object_id_t setObjectId, size_t cmdQueueSize) :
|
PCDUHandler::PCDUHandler(object_id_t setObjectId, size_t cmdQueueSize) :
|
||||||
SystemObject(setObjectId), poolManager(this, nullptr), pdu2HkTableDataset(this), pdu1HkTableDataset(
|
SystemObject(setObjectId), poolManager(this, nullptr), pdu2HkTableDataset(this), pdu1HkTableDataset(
|
||||||
|
@ -1,6 +1,7 @@
|
|||||||
#ifndef MISSION_DEVICES_PCDUHANDLER_H_
|
#ifndef MISSION_DEVICES_PCDUHANDLER_H_
|
||||||
#define MISSION_DEVICES_PCDUHANDLER_H_
|
#define MISSION_DEVICES_PCDUHANDLER_H_
|
||||||
|
|
||||||
|
#include <devices/powerSwitcherList.h>
|
||||||
#include <mission/devices/devicedefinitions/GomspaceDefinitions.h>
|
#include <mission/devices/devicedefinitions/GomspaceDefinitions.h>
|
||||||
#include <mission/devices/GomspaceDeviceHandler.h>
|
#include <mission/devices/GomspaceDeviceHandler.h>
|
||||||
#include <fsfw/timemanager/CCSDSTime.h>
|
#include <fsfw/timemanager/CCSDSTime.h>
|
||||||
@ -9,7 +10,7 @@
|
|||||||
#include <fsfw/objectmanager/SystemObject.h>
|
#include <fsfw/objectmanager/SystemObject.h>
|
||||||
#include <fsfw/tasks/ExecutableObjectIF.h>
|
#include <fsfw/tasks/ExecutableObjectIF.h>
|
||||||
#include <fsfw/objectmanager/SystemObject.h>
|
#include <fsfw/objectmanager/SystemObject.h>
|
||||||
#include <fsfwconfig/devices/powerSwitcherList.h>
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @brief The PCDUHandler provides a compact interface to handle all devices related to the
|
* @brief The PCDUHandler provides a compact interface to handle all devices related to the
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
#include "PDU1Handler.h"
|
#include "PDU1Handler.h"
|
||||||
#include <mission/devices/devicedefinitions/GomSpacePackets.h>
|
#include <mission/devices/devicedefinitions/GomSpacePackets.h>
|
||||||
#include <fsfwconfig/OBSWConfig.h>
|
#include <OBSWConfig.h>
|
||||||
|
|
||||||
PDU1Handler::PDU1Handler(object_id_t objectId, object_id_t comIF, CookieIF * comCookie) :
|
PDU1Handler::PDU1Handler(object_id_t objectId, object_id_t comIF, CookieIF * comCookie) :
|
||||||
GomspaceDeviceHandler(objectId, comIF, comCookie, PDU::MAX_CONFIGTABLE_ADDRESS,
|
GomspaceDeviceHandler(objectId, comIF, comCookie, PDU::MAX_CONFIGTABLE_ADDRESS,
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
#include "PDU2Handler.h"
|
#include "PDU2Handler.h"
|
||||||
#include <mission/devices/devicedefinitions/GomSpacePackets.h>
|
#include <mission/devices/devicedefinitions/GomSpacePackets.h>
|
||||||
#include <fsfwconfig/OBSWConfig.h>
|
#include <OBSWConfig.h>
|
||||||
|
|
||||||
PDU2Handler::PDU2Handler(object_id_t objectId, object_id_t comIF, CookieIF * comCookie) :
|
PDU2Handler::PDU2Handler(object_id_t objectId, object_id_t comIF, CookieIF * comCookie) :
|
||||||
GomspaceDeviceHandler(objectId, comIF, comCookie, PDU::MAX_CONFIGTABLE_ADDRESS,
|
GomspaceDeviceHandler(objectId, comIF, comCookie, PDU::MAX_CONFIGTABLE_ADDRESS,
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
#include <mission/devices/Tmp1075Handler.h>
|
#include <mission/devices/Tmp1075Handler.h>
|
||||||
#include <mission/devices/devicedefinitions/Tmp1075Definitions.h>
|
#include <mission/devices/devicedefinitions/Tmp1075Definitions.h>
|
||||||
#include <fsfwconfig/OBSWConfig.h>
|
#include <OBSWConfig.h>
|
||||||
|
|
||||||
Tmp1075Handler::Tmp1075Handler(object_id_t objectId, object_id_t comIF,
|
Tmp1075Handler::Tmp1075Handler(object_id_t objectId, object_id_t comIF,
|
||||||
CookieIF * comCookie) :
|
CookieIF * comCookie) :
|
||||||
|
Loading…
Reference in New Issue
Block a user