|
|
@@ -123,7 +123,8 @@ void Dispatch_plc::clear_request_msg()
|
|
|
m_request_passageway_id = 0; //出入口id 6个入口和6个出口
|
|
|
m_request_passageway_direction = Common_data::Passageway_direction::PASSAGEWAY_DIRECTION_UNKNOWN; //出入口方向 0=未知，1=入口，2=出口
|
|
|
m_request_parkingspace_index_id = 0; //楼上车位索引id 1~180(3*6*13)
|
|
|
- m_request_parkingspace_unit_id = 0; //楼上车位单元号 1~3
|
|
|
+ m_request_parkingspace_unit_id = 0; //楼上车位单元号 1~3
|
|
|
+ m_request_parkingspace_label_id = 0; //楼上车位标签号 1~78
|
|
|
m_request_parkingspace_floor_id = 0; //楼上车位楼层号 2~11
|
|
|
m_request_parkingspace_room_id = 0; //楼上车位房间号 1~6
|
|
|
m_request_parkingspace_direction = Common_data::Parkingspace_direction::PARKINGSPACE_DIRECTION_UNKNOWN; //楼上车位方向 0=未知，1=朝南，2=朝北
|
|
|
@@ -429,6 +430,7 @@ Error_manager Dispatch_plc::encapsulate_dispatch_request_to_plc()
|
|
|
{
|
|
|
m_request_parkingspace_index_id = m_dispatch_request_msg.parkspace_info_ex(0).parkingspace_index_id();
|
|
|
m_request_parkingspace_unit_id = m_dispatch_request_msg.parkspace_info_ex(0).parkingspace_unit_id()+1;//0~2单元号改为1~3
|
|
|
+ m_request_parkingspace_label_id = m_dispatch_request_msg.parkspace_info_ex(0).parkingspace_label_id();
|
|
|
m_request_parkingspace_floor_id = m_dispatch_request_msg.parkspace_info_ex(0).parkingspace_floor_id();
|
|
|
m_request_parkingspace_room_id = m_dispatch_request_msg.parkspace_info_ex(0).parkingspace_room_id();
|
|
|
//车位朝向, 小号朝前朝南, 大号朝后朝北
|
|
|
@@ -515,6 +517,7 @@ Error_manager Dispatch_plc::update_dispatch_plc_communication()
|
|
|
tp_dispatch_request_from_manager_to_plc_for_data->m_request_passageway_direction = m_request_passageway_direction;
|
|
|
tp_dispatch_request_from_manager_to_plc_for_data->m_request_parkingspace_index_id = m_request_parkingspace_index_id;
|
|
|
tp_dispatch_request_from_manager_to_plc_for_data->m_request_parkingspace_unit_id = m_request_parkingspace_unit_id;
|
|
|
+ tp_dispatch_request_from_manager_to_plc_for_data->m_request_parkingspace_label_id = m_request_parkingspace_label_id;
|
|
|
tp_dispatch_request_from_manager_to_plc_for_data->m_request_parkingspace_floor_id = m_request_parkingspace_floor_id;
|
|
|
tp_dispatch_request_from_manager_to_plc_for_data->m_request_parkingspace_room_id = m_request_parkingspace_room_id;
|
|
|
tp_dispatch_request_from_manager_to_plc_for_data->m_request_parkingspace_direction = m_request_parkingspace_direction;
|
|
|
@@ -556,6 +559,7 @@ Error_manager Dispatch_plc::update_dispatch_plc_communication()
|
|
|
m_response_passageway_direction = (Common_data::Passageway_direction)tp_dispatch_response_from_plc_to_manager->m_response_passageway_direction;
|
|
|
m_response_parkingspace_index_id = tp_dispatch_response_from_plc_to_manager->m_response_parkingspace_index_id;
|
|
|
m_response_parkingspace_unit_id = tp_dispatch_response_from_plc_to_manager->m_response_parkingspace_unit_id;
|
|
|
+ m_response_parkingspace_label_id = tp_dispatch_response_from_plc_to_manager->m_response_parkingspace_label_id;
|
|
|
m_response_parkingspace_floor_id = tp_dispatch_response_from_plc_to_manager->m_response_parkingspace_floor_id;
|
|
|
m_response_parkingspace_room_id = tp_dispatch_response_from_plc_to_manager->m_response_parkingspace_room_id;
|
|
|
m_response_parkingspace_direction = (Common_data::Parkingspace_direction)tp_dispatch_response_from_plc_to_manager->m_response_parkingspace_direction;
|
