测试,修改bug(日期月份错误,日志颜色显示)

locate/locater.cpp

@@ -37,7 +37,6 @@ Error_manager Locater::init(Measure::LocateParameter parameter)
         std::string	cpkt_file =  cpkt;
         LOG(INFO)<<"init  pointSift net graph:"<<graph;
         code=mp_point_sift->init(graph_file,cpkt_file);
-        LOG(ERROR)<<"------------------------------yolo-1";
         if(code!=SUCCESS)
         {
             LOG(ERROR)<<code.to_string();
@@ -54,7 +53,6 @@ Error_manager Locater::init(Measure::LocateParameter parameter)
         float freq = parameter.yolo_parameter().freq();
         std::string cfg = parameter.yolo_parameter().cfg();
         std::string weights = parameter.yolo_parameter().weights();
-        LOG(ERROR)<<"------------------------------yolo-";
         mp_yolo_detector = new YoloDetector(cfg, weights, min_x, max_x, min_y, max_y, freq);
 
     }

main.cpp

@@ -50,7 +50,7 @@ void InitGlog()
     char strDay[255]={0};
 
     sprintf(strYear,"%04d", t->tm_year+1900);
-    sprintf(strMonth,"%02d", t->tm_mon);
+    sprintf(strMonth,"%02d", t->tm_mon+1);
     sprintf(strDay,"%02d", t->tm_mday);
 
     char buf[255]={0};
@@ -87,6 +87,10 @@ int main(int argc,char* argv[])
         LOG(ERROR)<<code.to_string();
         printf("print ctrl-c to quite");
     }
+    else
+    {
+        LOG(INFO)<<"SYSTEM Init OK !!!!";
+    }
 
     getchar();
 

system_manager/System_Manager.cpp

@@ -97,8 +97,8 @@ Error_manager System_Manager::init()
     //创建雷达
     //
     //创建测量模块
-    Locater* p_locater=new Locater();
-    code=p_locater->init(locater_parameter);
+    mp_locater=new Locater();
+    code=mp_locater->init(locater_parameter);
     if(code!=SUCCESS)
     {
         return code;
@@ -115,14 +115,14 @@ Error_manager System_Manager::init()
         m_terminal_vector[i]=new Terminor_Command_Executor(terminor_parameter_all.terminor_parameters(i));
     }
     //最后创建plc,连接,设置回调
-    Plc_Communicator* plc=new Plc_Communicator(plc_parameter);
-    code=plc->get_error();
+    mp_plc=new Plc_Communicator(plc_parameter);
+    code=mp_plc->get_error();
     if(code!=SUCCESS)
     {
         code.set_error_description("plc create error");
         return code;
     }
-    code=plc->set_plc_callback(plc_command_callback,this);
+    code=mp_plc->set_plc_callback(plc_command_callback,this);
     return code;
 
 }
@@ -151,6 +151,20 @@ Error_manager System_Manager::plc_command_callback(int terminal_id,void* owner)
     //根据配置筛选雷达,当前测试使用所有雷达
     code=system_manager->m_terminal_vector[terminal_id]->execute_command(system_manager->m_laser_vector,
         system_manager->mp_plc,system_manager->mp_locater,10);
+    switch(code.get_error_code())
+    {
+        case SUCCESS:break;
+        case TERMINOR_CREATE_WORKING_THREAD_FAILED:
+        {
+            LOG(ERROR)<<code.to_string();
+            break;
+        }
+        default:
+        {
+            LOG(WARNING)<<code.to_string();
+            break;
+        }
+    }
     return code;
 
 }

terminor/terminal_command_executor.cpp

@@ -83,19 +83,22 @@ Error_manager Terminor_Command_Executor::execute_command(std::vector<Laser_base*
     {
         if(lasers[i]==0)
         {
-            LOG(ERROR)<<"terminor input laser* is null index:"<<i<<" terminor id:"<<m_terminor_parameter.id();
-            return TERMINOR_INPUT_LASER_NULL;
+            char description[255]={0};
+            sprintf(description,"terminor input laser* is null index:%d, terminor id:%d",i,m_terminor_parameter.id());
+            return Error_manager(TERMINOR_INPUT_LASER_NULL,NORMAL,description);
         }
     }
     if(plc==0)
     {
-        LOG(ERROR)<<"terminor input plc* is null terminor id:"<<m_terminor_parameter.id();
-        return TERMINOR_INPUT_PLC_NULL;
+        char description[255]={0};
+        sprintf(description,"terminor input plc* is null terminor id:%d",m_terminor_parameter.id());
+        return Error_manager(TERMINOR_INPUT_PLC_NULL,NORMAL,description);
     }
     if(locater==0)
     {
-        LOG(ERROR)<<"terminor input locater* is null  terminor id:"<<m_terminor_parameter.id();
-        return TERMINOR_INPUT_LOCATER_NULL;
+        char description[255]={0};
+        sprintf(description,"terminor input locater* is null  terminor id:%d",m_terminor_parameter.id());
+        return Error_manager(TERMINOR_INPUT_LOCATER_NULL,NORMAL,description);
     }
 
     //第二步,雷达,plc以及定位模块是否能正常接收指令;
@@ -126,8 +129,9 @@ Error_manager Terminor_Command_Executor::execute_command(std::vector<Laser_base*
     std::lock_guard<std::mutex> t_lock(m_mutex_lock);
     if(get_terminor_statu()!=TERMINOR_READY)
     {
-        LOG(ERROR)<<"terminor is not ready, terminor id:"<<m_terminor_parameter.id();
-        return TERMINOR_NOT_READY;
+        char description[255]={0};
+        sprintf(description,"terminor is not ready, terminor id:%d",m_terminor_parameter.id());
+        return Error_manager(TERMINOR_NOT_READY,NORMAL,description);
     }
     //检查上次线程是否退出,并等待线程退出
     if(mp_command_thread!=0)
@@ -148,7 +152,7 @@ Error_manager Terminor_Command_Executor::execute_command(std::vector<Laser_base*
     mp_command_thread=new std::thread(thread_command_working,this);
     if(mp_command_thread==0)
     {
-        return TERMINOR_CREATE_WORKING_THREAD_FAILED;
+        return Error_manager(TERMINOR_CREATE_WORKING_THREAD_FAILED,NORMAL,"terminor create thread failed");
     }
     return SUCCESS;
 }

test/plc.prototxt

@@ -1,3 +0,0 @@
-ip:"192.168.2.131"
-port:502
-slave_id:1