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

enabled gpio switching in heater again

Browse Source
This commit is contained in:
Martin Zietz 2021-02-12 12:52:40 +01:00
parent 1fb042875e
commit a05fe0c4ff
5 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
bsp_q7s/ObjectFactory.cpp
View File

@ -104,7 +104,8 @@ void ObjectFactory::produce(){
std::string("Heater0"), Gpio::OUT); std::string("Heater0"), Gpio::OUT);
gpioCookie->addGpio(gpioIds::HEATER_0, gpioConfigForDummyHeater); gpioCookie->addGpio(gpioIds::HEATER_0, gpioConfigForDummyHeater);
#else #else
GpioConfig_t gpioConfigHeater0(std::string("gpiochip5"), 6, /* Pin H2-11 on stack connector */
GpioConfig_t gpioConfigHeater0(std::string("gpiochip5"), 20,
std::string("Heater0"), Gpio::OUT); std::string("Heater0"), Gpio::OUT);
gpioCookie->addGpio(gpioIds::HEATER_0, gpioConfigHeater0); gpioCookie->addGpio(gpioIds::HEATER_0, gpioConfigHeater0);
#endif #endif

1
cmake/scripts/Q7S/win_path_helper_xilinx_tools.sh
View File

@ -1,3 +1,4 @@
#!/bin/sh
export PATH=$PATH:"/c/Xilinx/SDK/2018.2/gnu/aarch32/nt/gcc-arm-linux-gnueabi/bin" export PATH=$PATH:"/c/Xilinx/SDK/2018.2/gnu/aarch32/nt/gcc-arm-linux-gnueabi/bin"
export CROSS_COMPILE="arm-linux-gnueabihf" export CROSS_COMPILE="arm-linux-gnueabihf"

2
fsfwconfig/OBSWConfig.h
View File

@ -14,7 +14,7 @@
#define TE0720 0 #define TE0720 0
#define PDU2_DEBUG 1 #define PDU2_DEBUG 0
#define PDU1_DEBUG 0 #define PDU1_DEBUG 0
#include "OBSWVersion.h" #include "OBSWVersion.h"

4
mission/devices/HeaterHandler.cpp
View File

@ -212,7 +212,7 @@ void HeaterHandler::handleSwitchOnCommand(HeaterMapIter heaterMapIter) {
if (mainSwitchState == PowerSwitchIF::SWITCH_ON) { if (mainSwitchState == PowerSwitchIF::SWITCH_ON) {
if (!checkSwitchState(switchNr)) { if (!checkSwitchState(switchNr)) {
gpioId_t gpioId = getGpioIdFromSwitchNr(switchNr); gpioId_t gpioId = getGpioIdFromSwitchNr(switchNr);
// result = gpioInterface->pullHigh(gpioId); result = gpioInterface->pullHigh(gpioId);
result = RETURN_OK; result = RETURN_OK;
if (result != RETURN_OK) { if (result != RETURN_OK) {
sif::error << "HeaterHandler::handleSwitchOffCommand: Failed to pull gpio with id" sif::error << "HeaterHandler::handleSwitchOffCommand: Failed to pull gpio with id"
@ -263,7 +263,7 @@ void HeaterHandler::handleSwitchOffCommand(HeaterMapIter heaterMapIter) {
/* Check whether switch is already off */ /* Check whether switch is already off */
if (checkSwitchState(switchNr)) { if (checkSwitchState(switchNr)) {
gpioId_t gpioId = getGpioIdFromSwitchNr(switchNr); gpioId_t gpioId = getGpioIdFromSwitchNr(switchNr);
// result = gpioInterface->pullLow(gpioId); result = gpioInterface->pullLow(gpioId);
result = RETURN_OK; result = RETURN_OK;
if (result != RETURN_OK) { if (result != RETURN_OK) {
sif::error << "HeaterHandler::handleSwitchOffCommand: Failed to pull gpio with id" sif::error << "HeaterHandler::handleSwitchOffCommand: Failed to pull gpio with id"

2
mission/devices/PCDUHandler.cpp
View File

@ -267,7 +267,7 @@ ReturnValue_t PCDUHandler::getFuseState( uint8_t fuseNr ) const {
} }
uint32_t PCDUHandler::getSwitchDelayMs(void) const { uint32_t PCDUHandler::getSwitchDelayMs(void) const {
return 15000; return 20000;
} }
object_id_t PCDUHandler::getObjectId() const { object_id_t PCDUHandler::getObjectId() const {