diff --git a/selfdrive/modeld/modeld.cc b/selfdrive/modeld/modeld.cc index e77a9cacfa..369c446141 100644 --- a/selfdrive/modeld/modeld.cc +++ b/selfdrive/modeld/modeld.cc @@ -217,8 +217,8 @@ int main(int argc, char **argv) { model_transform, NULL, vec_desire); mt2 = millis_since_boot(); - model_publish(pm, extra.frame_id, frame_id, sm.allAliveAndValid(), model_buf, extra.timestamp_eof); - posenet_publish(pm, extra.frame_id, frame_id, sm.allAliveAndValid(), model_buf, extra.timestamp_eof); + model_publish(pm, extra.frame_id, frame_id, model_buf, extra.timestamp_eof); + posenet_publish(pm, extra.frame_id, frame_id, model_buf, extra.timestamp_eof); LOGD("model process: %.2fms, from last %.2fms, vipc_frame_id %zu, frame_id, %zu", mt2-mt1, mt1-last, extra.frame_id, frame_id); last = mt1; diff --git a/selfdrive/modeld/models/driving.cc b/selfdrive/modeld/models/driving.cc index 8b17dd74f7..9e0d1d3feb 100644 --- a/selfdrive/modeld/models/driving.cc +++ b/selfdrive/modeld/models/driving.cc @@ -245,7 +245,7 @@ void fill_longi(cereal::ModelData::LongitudinalData::Builder longi, const float longi.setAccelerations(accel); } -void model_publish(PubMaster &pm, uint32_t vipc_frame_id, uint32_t frame_id, bool sm_alive_valid, +void model_publish(PubMaster &pm, uint32_t vipc_frame_id, uint32_t frame_id, const ModelDataRaw &net_outputs, uint64_t timestamp_eof) { // make msg capnp::MallocMessageBuilder msg; @@ -293,12 +293,12 @@ void model_publish(PubMaster &pm, uint32_t vipc_frame_id, uint32_t frame_id, boo auto meta = framed.initMeta(); fill_meta(meta, net_outputs.meta); - event.setValid((frame_age < MAX_FRAME_AGE) && sm_alive_valid); + event.setValid(frame_age < MAX_FRAME_AGE); pm.send("model", msg); } -void posenet_publish(PubMaster &pm, uint32_t vipc_frame_id, uint32_t frame_id, bool sm_alive_valid, +void posenet_publish(PubMaster &pm, uint32_t vipc_frame_id, uint32_t frame_id, const ModelDataRaw &net_outputs, uint64_t timestamp_eof) { capnp::MallocMessageBuilder msg; cereal::Event::Builder event = msg.initRoot(); diff --git a/selfdrive/modeld/models/driving.h b/selfdrive/modeld/models/driving.h index dab8fc0faa..97941db198 100644 --- a/selfdrive/modeld/models/driving.h +++ b/selfdrive/modeld/models/driving.h @@ -73,8 +73,8 @@ ModelDataRaw model_eval_frame(ModelState* s, cl_command_queue q, void model_free(ModelState* s); void poly_fit(float *in_pts, float *in_stds, float *out); -void model_publish(PubMaster &pm, uint32_t vipc_frame_id, uint32_t frame_id, bool sm_alive_valid, +void model_publish(PubMaster &pm, uint32_t vipc_frame_id, uint32_t frame_id, const ModelDataRaw &data, uint64_t timestamp_eof); -void posenet_publish(PubMaster &pm, uint32_t vipc_frame_id, uint32_t frame_id, bool sm_alive_valid, +void posenet_publish(PubMaster &pm, uint32_t vipc_frame_id, uint32_t frame_id, const ModelDataRaw &data, uint64_t timestamp_eof); #endif