From fecf7ab20629cc676e8d413b99a99f75543d4868 Mon Sep 17 00:00:00 2001
From: zhaohe <h_zhaohe@163.com>
Date: Fri, 17 May 2024 21:50:51 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E9=94=99=E8=AF=AF=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/iflytop/components/zcanreceiver/zcanhost.cpp |  8 +++--
 src/iflytop/core/error/error_code.cpp            | 44 +++++++++++++++++-------
 src/iflytop/core/error/error_code.hpp            |  7 ++++
 3 files changed, 44 insertions(+), 15 deletions(-)

diff --git a/src/iflytop/components/zcanreceiver/zcanhost.cpp b/src/iflytop/components/zcanreceiver/zcanhost.cpp
index 2310319..c09d952 100644
--- a/src/iflytop/components/zcanreceiver/zcanhost.cpp
+++ b/src/iflytop/components/zcanreceiver/zcanhost.cpp
@@ -273,7 +273,7 @@ int32_t ZCanHost::readio(int id, bool& value) {
   return 0;
 }
 int32_t ZCanHost::writeio(int id, bool value) {
-  logger->info("writeio {} {}", id, value); 
+  logger->info("writeio {} {}", id, value);
   shared_ptr<ZCanReceiverCMD> cmd = make_shared<ZCanReceiverCMD>();
   cmd->cmdid                      = 2;
   cmd->subcmdid                   = 0;
@@ -488,8 +488,10 @@ int32_t ZCanHost::call(int32_t cmdid, int32_t* val0, int32_t nval, int32_t* ack,
   }
 
   if (rx->packetType == kpt_error_ack) {
-    logger->error("call error ack,{}", *zuint16p(&rx->data[0]));
-    return err::zecode(err::kfail);
+    int32_t ecode = *zuint16p(&rx->data[0]);
+    ecode         = 500 + ecode;
+    logger->error("call error ack,{}", err::zecode2str((err::error_t)ecode));
+    return ecode;
   }
   return 0;
 }
diff --git a/src/iflytop/core/error/error_code.cpp b/src/iflytop/core/error/error_code.cpp
index 5b6b396..f5cd528 100644
--- a/src/iflytop/core/error/error_code.cpp
+++ b/src/iflytop/core/error/error_code.cpp
@@ -11,18 +11,38 @@ typedef struct {
 
 static map<error_t, error_desc_t> errormap = {
     // {kovertime, {.errordesc = "overtime"}},
-    {kfail, {.errordesc = "fail"}},
-    {kce_overtime, {.errordesc = "overtime"}},
-    {kce_noack, {.errordesc = "noack"}},
-    {kce_errorack, {.errordesc = "errorack"}},
-    {kce_device_offline, {.errordesc = "device_offline"}},
-    {kce_parse_json_err, {.errordesc = "parse_json_err"}},
-    {kdbe_user_not_exist, {.errordesc = "user_not_exist"}},
-    {kdbe_catch_exception, {.errordesc = "catch_exception"}},
-    {kharde_unfound, {.errordesc = "hardware_unfound"}},
-    {kre_catch_exception, {.errordesc = "catch_exception"}},
-    {kinteraction_error_passwd_error, {.errordesc = "passwd_error"}},
-    {kinteraction_error_user_not_exist, {.errordesc = "user_not_exist"}}
+
+    {ksucc, {.errordesc = "ksucc"}},
+    {kfail, {.errordesc = "kfail"}},
+    {kce_subboard_error_overtime, {.errordesc = "kce_subboard_error_overtime"}},
+    {kce_subboard_error_invalid_param, {.errordesc = "kce_subboard_error_invalid_param"}},
+    {kce_subboard_error_invalid_param_num, {.errordesc = "kce_subboard_error_invalid_param_num"}},
+    {kce_subboard_error_subdevice_offline, {.errordesc = "kce_subboard_error_subdevice_offline"}},
+    {kce_subboard_error_function_not_support, {.errordesc = "kce_subboard_error_function_not_support"}},
+    {kce_overtime, {.errordesc = "kce_overtime"}},
+    {kce_noack, {.errordesc = "kce_noack"}},
+    {kce_errorack, {.errordesc = "kce_errorack"}},
+    {kce_device_offline, {.errordesc = "kce_device_offline"}},
+    {kce_parse_json_err, {.errordesc = "kce_parse_json_err"}},
+    {kdbe_user_not_exist, {.errordesc = "kdbe_user_not_exist"}},
+    {kdbe_catch_exception, {.errordesc = "kdbe_catch_exception"}},
+    {kharde_unfound, {.errordesc = "kharde_unfound"}},
+    {kre_catch_exception, {.errordesc = "kre_catch_exception"}},
+    {kinteraction_error_passwd_error, {.errordesc = "kinteraction_error_passwd_error"}},
+    {kinteraction_error_user_not_exist, {.errordesc = "kinteraction_error_user_not_exist"}},
+    {ksys_error, {.errordesc = "ksys_error"}},
+    {ksys_create_file_error, {.errordesc = "ksys_create_file_error"}},
+    {ksys_create_dir_error, {.errordesc = "ksys_create_dir_error"}},
+    {ksys_open_file_error, {.errordesc = "ksys_open_file_error"}},
+    {ksys_open_dir_error, {.errordesc = "ksys_open_dir_error"}},
+    {ksys_read_file_error, {.errordesc = "ksys_read_file_error"}},
+    {ksys_write_file_error, {.errordesc = "ksys_write_file_error"}},
+    {ksys_close_file_error, {.errordesc = "ksys_close_file_error"}},
+    {ksys_close_dir_error, {.errordesc = "ksys_close_dir_error"}},
+    {ksys_delete_file_error, {.errordesc = "ksys_delete_file_error"}},
+    {ksys_delete_dir_error, {.errordesc = "ksys_delete_dir_error"}},
+    {ksys_copy_file_error, {.errordesc = "ksys_copy_file_error"}},
+
 
 };
 
diff --git a/src/iflytop/core/error/error_code.hpp b/src/iflytop/core/error/error_code.hpp
index 6539edb..5d7029a 100644
--- a/src/iflytop/core/error/error_code.hpp
+++ b/src/iflytop/core/error/error_code.hpp
@@ -12,6 +12,7 @@
 
 #include "iflytop/core/basic/nod/nod.hpp"
 #include "iflytop/core/spdlogfactory/logger.hpp"
+#include "transmit_disinfection_protocol_v1/transmit_disinfection_protocol_v1.hpp"
 namespace iflytop {
 namespace err {
 using namespace std;
@@ -20,6 +21,12 @@ typedef enum {
   ksucc = 0,
   kfail = 1,
 
+  kce_subboard_error_overtime             = 500 + kerr_overtime,
+  kce_subboard_error_invalid_param        = 500 + kerr_invalid_param,
+  kce_subboard_error_invalid_param_num    = 500 + kerr_invalid_param_num,
+  kce_subboard_error_subdevice_offline    = 500 + kerr_subdevice_offline,
+  kce_subboard_error_function_not_support = 500 + kerr_function_not_support,
+
   /**
    * @brief 通信错误
    */