eive/eive-obsw
eive/eive-obsw
13
4
Fork 0
Code Issues 4 Pull Requests 1 Releases 120 Wiki Activity

v1.15.0 #311

Merged
muellerr merged 107 commits from develop into main 2022-10-27 11:28:49 +02:00
Conversation 0 Commits 107 Files Changed 81 +4 -4
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 451581e1aa - Show all commits

6
CMakeLists.txt
View File

@ -99,13 +99,13 @@ set(OBSW_ADD_GPS_CTRL
${INIT_VAL} ${INIT_VAL}
CACHE STRING "Add GPS controllers") CACHE STRING "Add GPS controllers")
set(OBSW_ADD_CCSDS_IP_CORES set(OBSW_ADD_CCSDS_IP_CORES
${INIT_VAL} 1
CACHE STRING "Add CCSDS IP cores") CACHE STRING "Add CCSDS IP cores")
set(OBSW_TM_TO_PTME set(OBSW_TM_TO_PTME
${INIT_VAL} 1
CACHE STRING "Send telemetry to PTME IP core") CACHE STRING "Send telemetry to PTME IP core")
set(OBSW_TC_FROM_PDEC set(OBSW_TC_FROM_PDEC
${INIT_VAL} 1
CACHE STRING "Poll telecommand from PDEC IP core") CACHE STRING "Poll telecommand from PDEC IP core")
set(OBSW_ADD_TCS_CTRL set(OBSW_ADD_TCS_CTRL
${INIT_VAL} ${INIT_VAL}

2
bsp_q7s/em/emObjectFactory.cpp
View File

@ -51,7 +51,7 @@ void ObjectFactory::produce(void* args) {
// createPayloadComponents(gpioComIF); // createPayloadComponents(gpioComIF);
// createHeaterComponents(gpioComIF, pwrSwitcher, healthTable); // createHeaterComponents(gpioComIF, pwrSwitcher, healthTable);
// TODO: Careful! Swichting this on somehow messes with the communication with the ProASIC // TODO: Careful! Switching this on somehow messes with the communication with the ProASIC
// and will cause xsc_boot_copy commands to always boot to 0 0 // and will cause xsc_boot_copy commands to always boot to 0 0
// createRadSensorComponent(gpioComIF); // createRadSensorComponent(gpioComIF);