Browse Source

modify hapo door control

zhangjia 4 years ago
parent
commit
522782969d

+ 2 - 2
src/decition/decition_brain/decition/adc_adapter/hapo_adapter.cpp

@@ -272,11 +272,11 @@ iv::decition::Decition iv::decition::HapoAdapter::getAdapterDeciton(GPS_INS now_
 
 
      if(ServiceCarStatus.station_control_door==0)
      if(ServiceCarStatus.station_control_door==0)
      {
      {
-         (*decition)->door=3;       //关门
+         (*decition)->door=false;       //关门
      }
      }
      else if((ServiceCarStatus.station_control_door==1)&&(ServiceCarStatus.station_control_door_option==false))
      else if((ServiceCarStatus.station_control_door==1)&&(ServiceCarStatus.station_control_door_option==false))
      {
      {
-         (*decition)->door=2;       //到达站点开门
+         (*decition)->door=true;       //到达站点开门
          ServiceCarStatus.station_control_door_option=true;
          ServiceCarStatus.station_control_door_option=true;
      }
      }
 
 

+ 2 - 0
src/decition/decition_brain/decition/brain.cpp

@@ -1056,6 +1056,7 @@ void iv::decition::BrainDecition::ShareDecition(iv::decition::Decition decition)
     xdecition.set_air_worktime(decition->air_worktime);
     xdecition.set_air_worktime(decition->air_worktime);
     xdecition.set_air_offtime(decition->air_offtime);
     xdecition.set_air_offtime(decition->air_offtime);
     xdecition.set_air_on(decition->air_on);
     xdecition.set_air_on(decition->air_on);
+    xdecition.set_door(decition->door);
 
 
 
 
 
 
@@ -1352,6 +1353,7 @@ void iv::decition::BrainDecition::Updatev2x(const char *pdata, const int ndatasi
                            v2x_message.stationid(i),ServiceCarStatus.stationCmd.stationGps[i].gps_lat,
                            v2x_message.stationid(i),ServiceCarStatus.stationCmd.stationGps[i].gps_lat,
                           ServiceCarStatus.stationCmd.stationGps[i].gps_lng);
                           ServiceCarStatus.stationCmd.stationGps[i].gps_lng);
         }
         }
+        ServiceCarStatus.mbRunPause=false;
     }
     }
 
 
 }
 }