diff --git a/README.md b/README.md index 2a11f85..41184bd 100644 --- a/README.md +++ b/README.md @@ -17,10 +17,10 @@ readio 2 --------------------------- -pressure_sensor_read 1 -pressure_sensor_read 2 -pressure_sensor_read 3 -pressure_sensor_read 4 +pressure_sensor_read 1 // 液位 +pressure_sensor_read 2 // 8000 +pressure_sensor_read 3 // 1000,加液 +pressure_sensor_read 4 // 1000,喷射 # 三色灯 setlight 255 255 255 255 diff --git a/usrc/main.cpp b/usrc/main.cpp index d6c49bf..126500f 100644 --- a/usrc/main.cpp +++ b/usrc/main.cpp @@ -53,8 +53,8 @@ ZGPIO m_input3; ZGPIO m_input4; ZGPIO m_input5; +ZGPIO output0; ZGPIO output1; -ZGPIO output2; ZCanReceiver m_canReceiver; ZCanBasicOrderModule m_basicOrderModule; @@ -141,13 +141,29 @@ void Main::run() { return false; }); - // output1.reg - // output2 - m_basicOrderModule.regOutCtl([this](uint8_t id, bool val) { return false; }); + output0.initAsOutput(PD14, ZGPIO::kMode_nopull, false, false); + output1.initAsOutput(PD15, ZGPIO::kMode_nopull, false, false); + + m_basicOrderModule.regOutCtl([this](uint8_t id, bool val) { + if (id == 20) { + output0.setState(val); + return true; + } + if (id == 21) { + output1.setState(val); + return true; + } + + // output0 + // output1 + + return false; + }); ZHAL_CORE_REG(3000, { // ZLOGI(TAG, "IO1:%d IO2:%d", m_input1.getState(), m_input2.getState()); // ZLOGI(TAG, "IO1:%d IO2:%d IO3:%d IO4:%d IO5:%d", m_input1.getState(), m_input2.getState(), m_input3.getState(), // m_input4.getState(), m_input5.getState()); + }); /******************************************************************************* @@ -296,9 +312,8 @@ void Main::run() { cmdScheduler.regCMD("readio", "()", 0, // [](int32_t paramN, const char **paraV, ICmdParserACK *ack) { uint8_t sensorid = atoi(paraV[0]); - ZLOGI(TAG, "IO1:%d IO2:%d IO3:%d IO4:%d IO5:%d", // - m_input1.getState(), m_input2.getState(), m_input3.getState(), m_input4.getState(), - m_input5.getState()); + ZLOGI(TAG, "IO1:%d IO2:%d IO3:%d IO4:%d IO5:%d", // + m_input1.getState(), m_input2.getState(), m_input3.getState(), m_input4.getState(), m_input5.getState()); ack->setNoneAck(0); }); cmdScheduler.regCMD("pressure_sensor_read", "(uint8_t sensorid)", 1, //