diff --git a/sdk b/sdk index 9f3dea0..c97a4f6 160000 --- a/sdk +++ b/sdk @@ -1 +1 @@ -Subproject commit 9f3dea013e73863b132e2e12fb90ab9b25e2a532 +Subproject commit c97a4f6f0136f194761ddc7c14efea0a8a172cb2 diff --git a/usrc/driver.cpp b/usrc/driver.cpp index 7f031cc..0c58823 100644 --- a/usrc/driver.cpp +++ b/usrc/driver.cpp @@ -33,7 +33,7 @@ PWMSpeedCtrlModule::config_t fan0cfg = { }, }, .enablefbcheck = false, - .enableTrace = true, + .enableTrace = ENABL_TRACE, }; PWMSpeedCtrlModule::config_t fan1cfg = { @@ -61,7 +61,7 @@ PWMSpeedCtrlModule::config_t fan1cfg = { }, }, .enablefbcheck = false, - .enableTrace = true, + .enableTrace = ENABL_TRACE, }; /******************************************************************************* @@ -145,7 +145,6 @@ PWMSpeedCtrlModule::config_t pumpcfg = { .htim = &htim2, .freq = TIMER2_FREQ, .polarity = false, - .calltrace = true, }, .nfan = 1, .fan0Channel = {2, 0, 0, 0}, @@ -159,12 +158,10 @@ PWMSpeedCtrlModule::config_t pumpcfg = { .pin = PC2, .mode = ZGPIO::kMode_nopull, .mirror = false, - .log_when_setstate = true, - }, }, .enablefbcheck = false, - .enableTrace = true, + .enableTrace = ENABL_TRACE, }; /******************************************************************************* @@ -196,7 +193,7 @@ DRV8710::config_t peltier_config0 = { .nfault = PB14, .sensePin = PB15, .shaft = PELTIER_POLARITY, - .enableTrace = false, + .enableTrace = ENABL_TRACE, }; DRV8710::config_t peltier_config1 = { @@ -213,7 +210,7 @@ DRV8710::config_t peltier_config1 = { .nfault = PB3, .sensePin = PB4, .shaft = !PELTIER_POLARITY, - .enableTrace = false, + .enableTrace = ENABL_TRACE, }; void PeltierCtrlModule::initialize(peltier_index_t index) { @@ -274,16 +271,25 @@ bool PeltierCtrlModule::isError() { bool PeltierCtrlModule::dumpErrorInfo() { // if (m_index == kpeltier0) { - ZLOGI(TAG, "motor0 fault:%d,sense:%d", !peltier0.isFault(), peltier0.getSensePinState()); + ZLOGI(TAG, "motor0 fault:%d,sense:%d", peltier0.isFault(), peltier0.getSensePinState()); } else if (m_index == kpeltier1) { - ZLOGI(TAG, "motor1 fault:%d,sense:%d", !peltier1.isFault(), peltier1.getSensePinState()); + ZLOGI(TAG, "motor1 fault:%d,sense:%d", peltier1.isFault(), peltier1.getSensePinState()); } else if (m_index == kpeltier0and1) { - ZLOGI(TAG, "motor0 fault:%d,sense:%d", !peltier0.isFault(), peltier0.getSensePinState()); - ZLOGI(TAG, "motor1 fault:%d,sense:%d", !peltier1.isFault(), peltier1.getSensePinState()); + ZLOGI(TAG, "motor0 fault:%d,sense:%d", peltier0.isFault(), peltier0.getSensePinState()); + ZLOGI(TAG, "motor1 fault:%d,sense:%d", peltier1.isFault(), peltier1.getSensePinState()); } return true; }; bool PeltierCtrlModule::isWorking() { return m_workflag; } -void PeltierCtrlModule::clearError() { return; } \ No newline at end of file +void PeltierCtrlModule::clearError() { + if (m_index == kpeltier0) { + peltier0.clearFault(); + } else if (m_index == kpeltier1) { + peltier1.clearFault(); + } else if (m_index == kpeltier0and1) { + peltier0.clearFault(); + peltier1.clearFault(); + } +} \ No newline at end of file