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

Remove Rad Sensor, fix image swichting #654

Merged
muellerr merged 2 commits from remove-rad-sensor-again into v2.1.0-dev 2023-05-30 09:24:18 +02:00
Conversation 0 Commits 2 Files Changed 2 +3 -3
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -98,7 +98,7 @@ set(OBSW_ADD_THERMAL_TEMP_INSERTER
${OBSW_Q7S_EM} ${OBSW_Q7S_EM}
CACHE STRING "Add thermal sensor temperature inserter") CACHE STRING "Add thermal sensor temperature inserter")
set(OBSW_ADD_ACS_BOARD set(OBSW_ADD_ACS_BOARD
1 ${INIT_VAL}
CACHE STRING "Add ACS board module") CACHE STRING "Add ACS board module")
set(OBSW_ADD_GPS_CTRL set(OBSW_ADD_GPS_CTRL
${INIT_VAL} ${INIT_VAL}

4
bsp_q7s/em/emObjectFactory.cpp
View File

@ -97,10 +97,10 @@ void ObjectFactory::produce(void* args) {
// TODO: Careful! Switching 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);
// Still initialize chip select to avoid SPI bus issues.
createRadSensorChipSelect(gpioComIF);
#if OBSW_ADD_ACS_BOARD == 1 #if OBSW_ADD_ACS_BOARD == 1
meggert commented 2023-05-30 09:06:34 +02:00
Outdated
Review
Copy Link

The ACS Board is still needed for testing. Add this to OBSW_ADD_ACS_BOARD so that it can be used.

The ACS Board is still needed for testing. Add this to OBSW_ADD_ACS_BOARD so that it can be used.
muellerr commented 2023-05-30 09:23:35 +02:00
Outdated
Review
Copy Link

done

done
muellerr commented 2023-05-30 09:23:42 +02:00
Outdated
Review
Copy Link

done

done
muellerr commented 2023-05-30 09:23:43 +02:00
Outdated
Review
Copy Link

done

done
muellerr commented 2023-05-30 09:23:44 +02:00
Outdated
Review
Copy Link

done

done
muellerr commented 2023-05-30 09:23:44 +02:00
Outdated
Review
Copy Link

done

done
muellerr commented 2023-05-30 09:23:48 +02:00
Outdated
Review
Copy Link

done

done
// Still initialize chip select to avoid SPI bus issues.
createRadSensorChipSelect(gpioComIF);
createAcsBoardComponents(*spiMainComIF, gpioComIF, uartComIF, *pwrSwitcher, true, createAcsBoardComponents(*spiMainComIF, gpioComIF, uartComIF, *pwrSwitcher, true,
adis1650x::Type::ADIS16507); adis1650x::Type::ADIS16507);
#else #else