From 241267145a050f8fc0f2ef0e65a0d53b09f2de46 Mon Sep 17 00:00:00 2001 From: zhaohe Date: Thu, 9 Nov 2023 21:51:14 +0800 Subject: [PATCH] update --- README.md | 7 ++++++- iflytoplinuxsdk | 2 +- src/main_control_service.cpp | 10 +++++++++- src/service/device_io_control_service.cpp | 14 ++++++++++---- 4 files changed, 26 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index eb60c72..3b342a7 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,12 @@ ``` 1. 输入rootiflytop9973可以进入超级用户 -2. ws测试地址: ws://192.168.1.148:19000 +2. ws测试地址: ws://192.168.8.10:19001 + +{ + "command":"exceCanCmd", + "cancmd":"call 1007 1" +} ``` # 编译 diff --git a/iflytoplinuxsdk b/iflytoplinuxsdk index 45bd079..a838d01 160000 --- a/iflytoplinuxsdk +++ b/iflytoplinuxsdk @@ -1 +1 @@ -Subproject commit 45bd079bb5f10f36ecfd610a0de0148cafc97bb5 +Subproject commit a838d01d60b3b76ba3a38b6e3d0c1b90c5c9bd2a diff --git a/src/main_control_service.cpp b/src/main_control_service.cpp index 4379705..073c67d 100644 --- a/src/main_control_service.cpp +++ b/src/main_control_service.cpp @@ -145,7 +145,6 @@ void MainControlService::initialize() { })); }; - // {"command":"startReplenishingFluids","messageId":"startReplenishingFluids","stopAt":123} void MainControlService::processFrontEndMessage_userOperate(weak_ptr webSocket, json& cmd, json& receipt) { string cmdstr = cmd["command"]; @@ -756,6 +755,15 @@ void MainControlService::processFrontEndMessage_DeviceIOControlService(weak_ptr< m_deviceIoControlService->AirInletProportionalValve_setState(cmd["params"][0]); return; } + if (cmdstr == "DeviceIOControlService.AirInletProportionalValve_getState") { + receipt["ack"][0] = m_deviceIoControlService->AirInletProportionalValve_getState(); + return; + } + if (cmdstr == "DeviceIOControlService.AirOutletProportionalValve_getState") { + receipt["ack"][0] = m_deviceIoControlService->AirOutletProportionalValve_getState(); + return; + } + if (cmdstr == "DeviceIOControlService.AirOutletProportionalValve_setState") { m_deviceIoControlService->AirOutletProportionalValve_setState(cmd["params"][0]); return; diff --git a/src/service/device_io_control_service.cpp b/src/service/device_io_control_service.cpp index 161b1b3..66f56f9 100644 --- a/src/service/device_io_control_service.cpp +++ b/src/service/device_io_control_service.cpp @@ -119,16 +119,22 @@ int DeviceIoControlService::airCompressor_getcurrentValue() { return m_adc_0 * 0 int DeviceIoControlService::airCompressor_channelCtrl(bool chOpen) { m_airCompressor_channelState = chOpen; if (chOpen) { - m_zcanHost->writeio(20, 1); + m_zcanHost->call(kcmd_air_compressor_ch_ctrl, 1); } else { - m_zcanHost->writeio(20, 0); + m_zcanHost->call(kcmd_air_compressor_ch_ctrl, 0); } return 0; } bool DeviceIoControlService::airCompressor_getChannelState() { return m_airCompressor_channelState; } -void DeviceIoControlService::AirInletProportionalValve_setState(int32_t val) { m_AirInletProportionalValve_state = val; } -void DeviceIoControlService::AirOutletProportionalValve_setState(int32_t val) { m_AirOutletProportionalValve_state = val; } +void DeviceIoControlService::AirInletProportionalValve_setState(int32_t val) { + m_AirInletProportionalValve_state = val; + m_zcanHost->call(kcmd_set_proportional_valve, 1, val); +} +void DeviceIoControlService::AirOutletProportionalValve_setState(int32_t val) { + m_AirOutletProportionalValve_state = val; + m_zcanHost->call(kcmd_set_proportional_valve, 2, val); +} int32_t DeviceIoControlService::AirInletProportionalValve_getState() { return m_AirInletProportionalValve_state; } int32_t DeviceIoControlService::AirOutletProportionalValve_getState() { return m_AirOutletProportionalValve_state; }