Commit de7d529c authored by Yann Garcia's avatar Yann Garcia
Browse files

Validate AtsRtcmem against TTwb 1.1.30

parent c39c9e2f
Loading
Loading
Loading
Loading
+11 −0
Original line number Original line Diff line number Diff line
@@ -97,6 +97,17 @@ namespace LibItsIvim__TestSystem {
    loggers::get_instance().set_stop_time(_time_key, duration);
    loggers::get_instance().set_stop_time(_time_key, duration);
  }
  }


  void IvimPort::outgoing_send(const IvimInd& send_par)
  {
    loggers::get_instance().log_msg(">>> IvimPort::outgoing_send: payload=", send_par);
    
    float duration;
    loggers::get_instance().set_start_time(_time_key);
    params params;
    static_cast<ivim_layer *>(_layer)->sendMsg(send_par, params);
    loggers::get_instance().set_stop_time(_time_key, duration);
  }

  void IvimPort::receiveMsg(const LibItsIvim__TestSystem::IvimInd& p_ind, const params& p_params) {
  void IvimPort::receiveMsg(const LibItsIvim__TestSystem::IvimInd& p_ind, const params& p_params) {
    loggers::get_instance().log_msg(">>> IvimPort::receive_msg: ", p_ind);
    loggers::get_instance().log_msg(">>> IvimPort::receive_msg: ", p_ind);


+1 −0
Original line number Original line Diff line number Diff line
@@ -43,6 +43,7 @@ protected:
	void user_stop();
	void user_stop();


	void outgoing_send(const IvimReq& send_par);
	void outgoing_send(const IvimReq& send_par);
	void outgoing_send(const IvimInd& send_par);
};
};


} /* end of namespace */
} /* end of namespace */
+3 −2
Original line number Original line Diff line number Diff line
@@ -1152,7 +1152,6 @@ int ConfigRsuSimulatorLayer::process_ut_rtcmem_trigger(const OCTETSTRING& data,
    trigger.rev() = DSRC::RTCM__Revision(static_cast<int>(*p++));
    trigger.rev() = DSRC::RTCM__Revision(static_cast<int>(*p++));
    // Decode msgs
    // Decode msgs
    DSRC::RTCMmessageList msgs;
    DSRC::RTCMmessageList msgs;
    p += 1; // Skip COER flag
    unsigned char num_items = *p++; // Number of items
    unsigned char num_items = *p++; // Number of items
    msgs.set_size(num_items);
    msgs.set_size(num_items);
    for (unsigned char i = 0; i < num_items; i++) {
    for (unsigned char i = 0; i < num_items; i++) {
@@ -1161,19 +1160,21 @@ int ConfigRsuSimulatorLayer::process_ut_rtcmem_trigger(const OCTETSTRING& data,
      p += len;
      p += len;
    } // End of 'for' statement
    } // End of 'for' statement
    trigger.msgs() = msgs;
    trigger.msgs() = msgs;
    // ValidityDuration
    // timeStamp
    if ((flag & 0x80) == 0x80) {
    if ((flag & 0x80) == 0x80) {
      // TODO trigger.timeStamp() = OPTIONAL<INTEGER>(oct2int(OCTETSTRING(3, p)));
      // TODO trigger.timeStamp() = OPTIONAL<INTEGER>(oct2int(OCTETSTRING(3, p)));
    } else {
    } else {
      trigger.timeStamp().set_to_omit();
      trigger.timeStamp().set_to_omit();
    }
    }
    // TODO p += 3;
    // TODO p += 3;
    // anchorPoint
    if ((flag & 0x40) == 0x40) {
    if ((flag & 0x40) == 0x40) {
      // TODO trigger.anchorPoint() = OPTIONAL<INTEGER>(oct2int(OCTETSTRING(3, p)));
      // TODO trigger.anchorPoint() = OPTIONAL<INTEGER>(oct2int(OCTETSTRING(3, p)));
    } else {
    } else {
      trigger.anchorPoint().set_to_omit();
      trigger.anchorPoint().set_to_omit();
    }
    }
    // TODO p += 3;
    // TODO p += 3;
    // rtcmHeader
    if ((flag & 0x20) == 0x20) {
    if ((flag & 0x20) == 0x20) {
      // TODO trigger.rtcmHeader() = OPTIONAL<INTEGER>(oct2int(OCTETSTRING(3, p)));
      // TODO trigger.rtcmHeader() = OPTIONAL<INTEGER>(oct2int(OCTETSTRING(3, p)));
    } else {
    } else {
+12 −0
Original line number Original line Diff line number Diff line
@@ -30,6 +30,18 @@ void ivim_layer::sendMsg(const LibItsIvim__TestSystem::IvimReq& p, params& param
  send_data(data, _params);
  send_data(data, _params);
}
}


void ivim_layer::sendMsg(const LibItsIvim__TestSystem::IvimInd& p, params& params){
  loggers::get_instance().log_msg(">>> ivim_layer::sendMsg: ", p);

  // Encode IVIM PDU
  OCTETSTRING data;
  if (_codec.encode(p.msgIn(), data) == -1) {
    loggers::get_instance().warning("ivim_layer::sendMsg: Encoding failure");
    return;
  }
  send_data(data, _params);
}

void ivim_layer::send_data(OCTETSTRING& data, params& params) {
void ivim_layer::send_data(OCTETSTRING& data, params& params) {
  loggers::get_instance().log_msg(">>> ivim_layer::send_data: ", data);
  loggers::get_instance().log_msg(">>> ivim_layer::send_data: ", data);
  //params.log();
  //params.log();
+2 −1
Original line number Original line Diff line number Diff line
@@ -28,6 +28,7 @@ public:
  virtual ~ivim_layer() {};
  virtual ~ivim_layer() {};


  void sendMsg(const LibItsIvim__TestSystem::IvimReq&, params& params);
  void sendMsg(const LibItsIvim__TestSystem::IvimReq&, params& params);
  void sendMsg(const LibItsIvim__TestSystem::IvimInd&, params& params);


  virtual void send_data(OCTETSTRING& data, params& params);
  virtual void send_data(OCTETSTRING& data, params& params);
  virtual void receive_data(OCTETSTRING& data, params& info);
  virtual void receive_data(OCTETSTRING& data, params& info);
Loading