Skip to content

Commit

Permalink
commented out debug trace
Browse files Browse the repository at this point in the history
  • Loading branch information
mvladic committed Sep 23, 2019
1 parent 65a27a6 commit 37a6347
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 8 deletions.
7 changes: 4 additions & 3 deletions src/eez/modules/aux_ps/fan.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -356,9 +356,10 @@ void checkTest() {
if (diff >= CONF_FAN_TEST_DURATION) {
g_testResult = TEST_OK;
}
} else {
DebugTrace("FAN test duration: %d", diff);
}
}
// else {
// DebugTrace("FAN test duration: %d", diff);
// }

if (g_testResult != TEST_NONE) {
// test is finished
Expand Down
10 changes: 5 additions & 5 deletions src/eez/modules/dcpX05/channel.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ struct Channel : ChannelInterface {

#if !CONF_SKIP_PWRGOOD_TEST
if (!ioexp.testBit(IOExpander::IO_BIT_IN_PWRGOOD)) {
DebugTrace("Ch%d PWRGOOD bit changed to 0, gpio=%d", channel.channelIndex + 1, (int)ioexp.gpio);
// DebugTrace("Ch%d PWRGOOD bit changed to 0, gpio=%d", channel.channelIndex + 1, (int)ioexp.gpio);
channel.flags.powerOk = 0;
generateError(SCPI_ERROR_CH1_FAULT_DETECTED - channel.channelIndex);
powerDownBySensor();
Expand Down Expand Up @@ -142,12 +142,12 @@ struct Channel : ChannelInterface {
} else {
if (tickCount - dpNegMonitoringTime > DP_NEG_DELAY * 1000000UL) {
if (dpOn) {
DebugTrace("CH%d, neg. P, DP off: %f", channel.channelIndex + 1, channel.u.mon_last * channel.i.mon_last);
// DebugTrace("CH%d, neg. P, DP off: %f", channel.channelIndex + 1, channel.u.mon_last * channel.i.mon_last);
dpNegMonitoringTime = tickCount;
generateError(SCPI_ERROR_CH1_DOWN_PROGRAMMER_SWITCHED_OFF + channel.channelIndex);
setDpEnable(false);
} else {
DebugTrace("CH%d, neg. P, output off: %f", channel.channelIndex + 1, channel.u.mon_last * channel.i.mon_last);
// DebugTrace("CH%d, neg. P, output off: %f", channel.channelIndex + 1, channel.u.mon_last * channel.i.mon_last);
generateError(SCPI_ERROR_CH1_OUTPUT_FAULT_DETECTED - channel.channelIndex);
channel_dispatcher::outputEnable(channel, false);
}
Expand Down Expand Up @@ -344,15 +344,15 @@ struct Channel : ChannelInterface {
if (channel.isOutputEnabled()) {
if (channel.flags.currentCurrentRange == 0 || dac.isTesting()) {
// 5A
DebugTrace("CH%d: Switched to 5A range", channel.channelIndex + 1);
// DebugTrace("CH%d: Switched to 5A range", channel.channelIndex + 1);
ioexp.changeBit(IOExpander::DCP405_IO_BIT_OUT_CURRENT_RANGE_5A, true);
ioexp.changeBit(channel.boardRevision == CH_BOARD_REVISION_DCP405_R1B1 ?
IOExpander::DCP405_IO_BIT_OUT_CURRENT_RANGE_50MA :
IOExpander::DCP405_R2B5_IO_BIT_OUT_CURRENT_RANGE_50MA, false);
// calculateNegligibleAdcDiffForCurrent();
} else {
// 50mA
DebugTrace("CH%d: Switched to 50mA range", channel.channelIndex + 1);
// DebugTrace("CH%d: Switched to 50mA range", channel.channelIndex + 1);
ioexp.changeBit(channel.boardRevision == CH_BOARD_REVISION_DCP405_R1B1 ?
IOExpander::DCP405_IO_BIT_OUT_CURRENT_RANGE_50MA :
IOExpander::DCP405_R2B5_IO_BIT_OUT_CURRENT_RANGE_50MA, true);
Expand Down

0 comments on commit 37a6347

Please sign in to comment.