wk 4 vuotta sitten
vanhempi
commit
c182e2de0f
3 muutettua tiedostoa jossa 16 lisäystä ja 7 poistoa
  1. 2 2
      dispatch/dispatch_manager.cpp
  2. 11 2
      dispatch/dispatch_process.cpp
  3. 3 3
      main.cpp

+ 2 - 2
dispatch/dispatch_manager.cpp

@@ -344,7 +344,7 @@ Error_manager Dispatch_manager::execute_for_dispatch_control_request_msg(message
 				iter->second->m_dispatch_control_node_map[t_dispatch_device_type] = t_dispatch_control_node;
 			}
 			iter->second->m_dispatch_control_node_map[t_dispatch_device_type].m_dispatch_control_request_msg = dispatch_control_request_msg;
-			iter->second->m_dispatch_control_node_map[t_dispatch_device_type].m_dispatch_control_status = Dispatch_process::Dispatch_control_status::DISPATCH_CONTROL_READY;
+//			iter->second->m_dispatch_control_node_map[t_dispatch_device_type].m_dispatch_control_status = Dispatch_process::Dispatch_control_status::DISPATCH_CONTROL_READY;
 			return Error_code::SUCCESS;
 		}
 	}
@@ -366,7 +366,7 @@ Error_manager Dispatch_manager::execute_for_dispatch_control_request_msg(message
 				iter->second->m_dispatch_control_node_map[t_dispatch_device_type] = t_dispatch_control_node;
 			}
 			iter->second->m_dispatch_control_node_map[t_dispatch_device_type].m_dispatch_control_request_msg = dispatch_control_request_msg;
-			iter->second->m_dispatch_control_node_map[t_dispatch_device_type].m_dispatch_control_status = Dispatch_process::Dispatch_control_status::DISPATCH_CONTROL_READY;
+//			iter->second->m_dispatch_control_node_map[t_dispatch_device_type].m_dispatch_control_status = Dispatch_process::Dispatch_control_status::DISPATCH_CONTROL_READY;
 			return Error_code::SUCCESS;
 		}
 	}

+ 11 - 2
dispatch/dispatch_process.cpp

@@ -407,8 +407,13 @@ Error_manager Dispatch_process::connect_dispatch_device(int dispatch_device_type
 			std::cout << " huli test :::: " << " 123123123123123123123 = " << 1233 << std::endl;
 			std::cout << " huli test :::: " << " tp_catcher->check_status() = " << tp_catcher->check_status().to_string() << std::endl;
 			std::cout << " huli test :::: " << " tp_catcher->m_actual_device_status = " << tp_catcher->m_actual_device_status << std::endl;
+
+			char buf[1000] = {0};
+			sprintf(buf, "tp_catcher->m_actual_device_status device_status error, tp_catcher->check_status() = %s, tp_catcher->m_actual_device_status = %d", tp_catcher->check_status().to_string().c_str(), tp_catcher->m_actual_device_status);
+
+
 			t_error = Error_manager(Error_code::DISPATCH_PROCESS_DEVICE_STATUS_ERROR, Error_level::MINOR_ERROR,
-														  " tp_catcher->m_actual_device_status device_status error ");
+									buf);
 			dispatch_control_node.m_error = t_error;
 			return t_error;
 		}
@@ -481,8 +486,12 @@ Error_manager Dispatch_process::connect_dispatch_device(int dispatch_device_type
 			std::cout << " huli test :::: " << " 123123123123123123123 = " << 4566 << std::endl;
 			std::cout << " huli test :::: " << " tp_carrier->check_status() = " << tp_carrier->check_status().to_string() << std::endl;
 			std::cout << " huli test :::: " << " tp_carrier->m_actual_device_status = " << tp_carrier->m_actual_device_status << std::endl;
+
+			char buf[1000] = {0};
+			sprintf(buf, "tp_carrier->m_actual_device_status device_status error, tp_carrier->check_status() = %s, tp_carrier->m_actual_device_status = %d", tp_carrier->check_status().to_string().c_str(), tp_carrier->m_actual_device_status);
+
 			t_error = Error_manager(Error_code::DISPATCH_PROCESS_DEVICE_STATUS_ERROR, Error_level::MINOR_ERROR,
-								 " tp_carrier->m_actual_device_status device_status error ");
+									buf);
 			dispatch_control_node.m_error = t_error;
 			return t_error;
 		}

+ 3 - 3
main.cpp

@@ -53,7 +53,7 @@ GOOGLE_GLOG_DLL_DECL void shut_down_logging(const char* data, int size)
 using namespace std;
 
 
-#define MAIN_TEST 1
+
 
 int main(int argc,char* argv[])
 {
@@ -73,7 +73,7 @@ int main(int argc,char* argv[])
 
 
 
-
+#define MAIN_TEST 1
 #ifdef MAIN_TEST
 	t_error = Dispatch_coordinates::get_instance_references().dispatch_coordinates_init();
 	std::cout << " huli test :::: " << " t_error.to = " << t_error.to_string() << std::endl;
@@ -422,7 +422,7 @@ int main(int argc,char* argv[])
 	Carrier_task * tp_carrier_task22 = (Carrier_task *)tp_task_Base22.get();
 	tp_carrier_task22->task_init(NULL,std::chrono::milliseconds(15000));
 	tp_carrier_task22->m_request_key = "x23456789012345678901234567890c2";
-	tp_carrier_task22->m_request_x = 24855;
+	tp_carrier_task22->m_request_x = 11055;
 //	tp_carrier_task22->m_request_x = 4700;
 	tp_carrier_task22->m_request_y = 3000;
 	tp_carrier_task22->m_request_z = 5125;