Skip to content

Commit db61a6d

Browse files
committed
survive mode
1 parent 5637979 commit db61a6d

File tree

3 files changed

+10
-2
lines changed

3 files changed

+10
-2
lines changed

src/eez/modules/dib-dcp405/ioexp.cpp

+4
Original file line numberDiff line numberDiff line change
@@ -223,6 +223,10 @@ bool IOExpander::test() {
223223
DebugTrace("Ch%d power fault\n", channel.channelIndex + 1);
224224
generateChannelError(SCPI_ERROR_CH1_FAULT_DETECTED, channel.channelIndex);
225225
}
226+
#else
227+
testBit(IO_BIT_IN_PWRGOOD);
228+
channel.flags.powerOk = 1;
229+
testResult = TEST_OK;
226230
#endif
227231
}
228232
#endif

src/eez/modules/psu/temp_sensor.cpp

+5-1
Original file line numberDiff line numberDiff line change
@@ -95,12 +95,13 @@ float TempSensor::doRead() {
9595
return NAN;
9696
}
9797

98-
void TempSensor::testTemperatureValidity(float value) {
98+
void TempSensor::testTemperatureValidity(float& value) {
9999
Channel *channel = getChannel();
100100
if (!channel || channel->isOk()) {
101101
bool isTemperatureValueInvalid = isNaN(value) || value < TEMP_SENSOR_MIN_VALID_TEMPERATURE || value > TEMP_SENSOR_MAX_VALID_TEMPERATURE;
102102
if (isTemperatureValueInvalid) {
103103
if (g_testResult == TEST_OK) {
104+
#if !CONF_SURVIVE_MODE
104105
g_testResult = TEST_FAILED;
105106

106107
if (channel) {
@@ -109,6 +110,9 @@ void TempSensor::testTemperatureValidity(float value) {
109110
}
110111

111112
generateError(scpi_error);
113+
#else
114+
value = 60.0f;
115+
#endif
112116
}
113117
} else {
114118
g_testResult = TEST_OK;

src/eez/modules/psu/temp_sensor.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ class TempSensor {
6969
private:
7070
float doRead();
7171

72-
void testTemperatureValidity(float value);
72+
void testTemperatureValidity(float &value);
7373
};
7474

7575
////////////////////////////////////////////////////////////////////////////////

0 commit comments

Comments
 (0)