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
2 changed files with 3 additions and 3 deletions

View File

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

View File

@ -97,10 +97,10 @@ void ObjectFactory::produce(void* args) {
// 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
// createRadSensorComponent(gpioComIF);
// Still initialize chip select to avoid SPI bus issues.
createRadSensorChipSelect(gpioComIF);
#if OBSW_ADD_ACS_BOARD == 1

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.

done

done

done

done

done

done

done

done

done

done

done

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