From 532d19427c535e08f0c813c7aa9c8fe282ff3e39 Mon Sep 17 00:00:00 2001 From: Adeeb Shihadeh Date: Mon, 3 May 2021 20:46:54 -0700 Subject: [PATCH] bump cereal old-commit-hash: 8a280fbb8eb433fbfe0fc43254c9cbdaceedbab6 --- cereal | 2 +- release/files_common | 2 +- selfdrive/boardd/boardd.cc | 2 +- selfdrive/boardd/can_list_to_can_capnp.cc | 2 +- selfdrive/boardd/panda.cc | 2 +- selfdrive/camerad/cameras/camera_common.h | 2 +- selfdrive/camerad/cameras/camera_frame_stream.cc | 2 +- selfdrive/camerad/cameras/camera_qcom.h | 2 +- selfdrive/clocksd/clocksd.cc | 2 +- selfdrive/locationd/locationd.h | 2 +- selfdrive/locationd/ublox_msg.h | 2 +- selfdrive/locationd/ubloxd.cc | 2 +- selfdrive/logcatd/logcatd_android.cc | 2 +- selfdrive/logcatd/logcatd_systemd.cc | 2 +- selfdrive/loggerd/bootlog.cc | 2 +- selfdrive/loggerd/logger.cc | 2 +- selfdrive/loggerd/loggerd.cc | 2 +- selfdrive/modeld/modeld.cc | 2 +- selfdrive/modeld/models/dmonitoring.h | 2 +- selfdrive/modeld/models/driving.h | 2 +- selfdrive/proclogd/proclogd.cc | 2 +- selfdrive/sensord/sensors_qcom.cc | 2 +- selfdrive/sensord/sensors_qcom2.cc | 2 +- selfdrive/ui/replay/Unlogger.h | 2 +- selfdrive/ui/ui.h | 2 +- 25 files changed, 25 insertions(+), 25 deletions(-) diff --git a/cereal b/cereal index 90ce0e954..3be0bf50c 160000 --- a/cereal +++ b/cereal @@ -1 +1 @@ -Subproject commit 90ce0e954f2ea0681e07deb81167716ff0394f3b +Subproject commit 3be0bf50c801f4d01f92ee08cebcf960f09b180d diff --git a/release/files_common b/release/files_common index 2c265be36..f19df41d8 100644 --- a/release/files_common +++ b/release/files_common @@ -500,7 +500,7 @@ cereal/messaging/impl_msgq.hpp cereal/messaging/impl_zmq.cc cereal/messaging/impl_zmq.hpp cereal/messaging/messaging.cc -cereal/messaging/messaging.hpp +cereal/messaging/messaging.h cereal/messaging/messaging.pxd cereal/messaging/messaging_pyx.pyx cereal/messaging/msgq.cc diff --git a/selfdrive/boardd/boardd.cc b/selfdrive/boardd/boardd.cc index bf6d8f283..f43071e85 100644 --- a/selfdrive/boardd/boardd.cc +++ b/selfdrive/boardd/boardd.cc @@ -25,7 +25,7 @@ #include "common/params.h" #include "common/swaglog.h" #include "common/timing.h" -#include "messaging.hpp" +#include "messaging.h" #include "locationd/ublox_msg.h" #include "panda.h" diff --git a/selfdrive/boardd/can_list_to_can_capnp.cc b/selfdrive/boardd/can_list_to_can_capnp.cc index bbbceee6e..09f28a0c3 100644 --- a/selfdrive/boardd/can_list_to_can_capnp.cc +++ b/selfdrive/boardd/can_list_to_can_capnp.cc @@ -1,4 +1,4 @@ -#include "messaging.hpp" +#include "messaging.h" typedef struct { long address; diff --git a/selfdrive/boardd/panda.cc b/selfdrive/boardd/panda.cc index d89114241..4fa51c59c 100644 --- a/selfdrive/boardd/panda.cc +++ b/selfdrive/boardd/panda.cc @@ -7,7 +7,7 @@ #include "common/swaglog.h" #include "common/gpio.h" #include "common/util.h" -#include "messaging.hpp" +#include "messaging.h" #include "panda.h" Panda::Panda(){ diff --git a/selfdrive/camerad/cameras/camera_common.h b/selfdrive/camerad/cameras/camera_common.h index b8e079d88..fed079253 100644 --- a/selfdrive/camerad/cameras/camera_common.h +++ b/selfdrive/camerad/cameras/camera_common.h @@ -10,7 +10,7 @@ #include "common/queue.h" #include "visionbuf.h" #include "common/visionimg.h" -#include "messaging.hpp" +#include "messaging.h" #include "transforms/rgb_to_yuv.h" #include "visionipc.h" diff --git a/selfdrive/camerad/cameras/camera_frame_stream.cc b/selfdrive/camerad/cameras/camera_frame_stream.cc index 55de33874..29e0bef5e 100644 --- a/selfdrive/camerad/cameras/camera_frame_stream.cc +++ b/selfdrive/camerad/cameras/camera_frame_stream.cc @@ -5,7 +5,7 @@ #include -#include "messaging.hpp" +#include "messaging.h" #include "common/util.h" #define FRAME_WIDTH 1164 diff --git a/selfdrive/camerad/cameras/camera_qcom.h b/selfdrive/camerad/cameras/camera_qcom.h index b7bc260eb..d9df3883f 100644 --- a/selfdrive/camerad/cameras/camera_qcom.h +++ b/selfdrive/camerad/cameras/camera_qcom.h @@ -5,7 +5,7 @@ #include #include #include -#include "messaging.hpp" +#include "messaging.h" #include "msmb_isp.h" #include "msmb_ispif.h" diff --git a/selfdrive/clocksd/clocksd.cc b/selfdrive/clocksd/clocksd.cc index 32d8c508c..ce94e918a 100644 --- a/selfdrive/clocksd/clocksd.cc +++ b/selfdrive/clocksd/clocksd.cc @@ -14,7 +14,7 @@ #include #include -#include "messaging.hpp" +#include "messaging.h" #include "common/timing.h" #include "common/util.h" diff --git a/selfdrive/locationd/locationd.h b/selfdrive/locationd/locationd.h index f6d8d6f9f..ea8a0486a 100755 --- a/selfdrive/locationd/locationd.h +++ b/selfdrive/locationd/locationd.h @@ -6,7 +6,7 @@ #include -#include "messaging.hpp" +#include "messaging.h" #include "common/params.h" #include "common/util.h" #include "common/swaglog.h" diff --git a/selfdrive/locationd/ublox_msg.h b/selfdrive/locationd/ublox_msg.h index 57a713e0d..2fcf26d12 100644 --- a/selfdrive/locationd/ublox_msg.h +++ b/selfdrive/locationd/ublox_msg.h @@ -5,7 +5,7 @@ #include #include -#include "messaging.hpp" +#include "messaging.h" #include "generated/ubx.h" #include "generated/gps.h" diff --git a/selfdrive/locationd/ubloxd.cc b/selfdrive/locationd/ubloxd.cc index d62eb2142..7b3c3039b 100644 --- a/selfdrive/locationd/ubloxd.cc +++ b/selfdrive/locationd/ubloxd.cc @@ -1,4 +1,4 @@ -#include "messaging.hpp" +#include "messaging.h" #include "common/util.h" #include "common/swaglog.h" diff --git a/selfdrive/logcatd/logcatd_android.cc b/selfdrive/logcatd/logcatd_android.cc index 95a0c7b70..2aeccab3e 100644 --- a/selfdrive/logcatd/logcatd_android.cc +++ b/selfdrive/logcatd/logcatd_android.cc @@ -3,7 +3,7 @@ #include #include "common/util.h" -#include "messaging.hpp" +#include "messaging.h" int main() { ExitHandler do_exit; diff --git a/selfdrive/logcatd/logcatd_systemd.cc b/selfdrive/logcatd/logcatd_systemd.cc index da9b3bb88..1ab59cd90 100644 --- a/selfdrive/logcatd/logcatd_systemd.cc +++ b/selfdrive/logcatd/logcatd_systemd.cc @@ -9,7 +9,7 @@ #include "common/timing.h" #include "common/util.h" -#include "messaging.hpp" +#include "messaging.h" ExitHandler do_exit; int main(int argc, char *argv[]) { diff --git a/selfdrive/loggerd/bootlog.cc b/selfdrive/loggerd/bootlog.cc index 16ca95b27..e731047b1 100644 --- a/selfdrive/loggerd/bootlog.cc +++ b/selfdrive/loggerd/bootlog.cc @@ -2,7 +2,7 @@ #include #include "common/swaglog.h" #include "logger.h" -#include "messaging.hpp" +#include "messaging.h" static kj::Array build_boot_log() { MessageBuilder msg; diff --git a/selfdrive/loggerd/logger.cc b/selfdrive/loggerd/logger.cc index f49213bbe..2fa72a1db 100644 --- a/selfdrive/loggerd/logger.cc +++ b/selfdrive/loggerd/logger.cc @@ -19,7 +19,7 @@ #include "common/swaglog.h" #include "common/params.h" #include "common/version.h" -#include "messaging.hpp" +#include "messaging.h" #include "logger.h" diff --git a/selfdrive/loggerd/loggerd.cc b/selfdrive/loggerd/loggerd.cc index a31e7236f..710267ab7 100644 --- a/selfdrive/loggerd/loggerd.cc +++ b/selfdrive/loggerd/loggerd.cc @@ -24,7 +24,7 @@ #include "common/util.h" #include "camerad/cameras/camera_common.h" #include "logger.h" -#include "messaging.hpp" +#include "messaging.h" #include "services.h" #include "visionipc.h" diff --git a/selfdrive/modeld/modeld.cc b/selfdrive/modeld/modeld.cc index 788024b1f..1bf41a07f 100644 --- a/selfdrive/modeld/modeld.cc +++ b/selfdrive/modeld/modeld.cc @@ -10,7 +10,7 @@ #include "common/params.h" #include "models/driving.h" -#include "messaging.hpp" +#include "messaging.h" ExitHandler do_exit; // globals diff --git a/selfdrive/modeld/models/dmonitoring.h b/selfdrive/modeld/models/dmonitoring.h index dd015d409..9135e7f39 100644 --- a/selfdrive/modeld/models/dmonitoring.h +++ b/selfdrive/modeld/models/dmonitoring.h @@ -3,7 +3,7 @@ #include "common/util.h" #include "commonmodel.h" #include "runners/run.h" -#include "messaging.hpp" +#include "messaging.h" #define OUTPUT_SIZE 38 diff --git a/selfdrive/modeld/models/driving.h b/selfdrive/modeld/models/driving.h index 7b0c21390..82a8284b3 100644 --- a/selfdrive/modeld/models/driving.h +++ b/selfdrive/modeld/models/driving.h @@ -13,7 +13,7 @@ #include "runners/run.h" #include -#include "messaging.hpp" +#include "messaging.h" constexpr int DESIRE_LEN = 8; constexpr int TRAFFIC_CONVENTION_LEN = 2; diff --git a/selfdrive/proclogd/proclogd.cc b/selfdrive/proclogd/proclogd.cc index 66f2f5025..48f3a3f05 100644 --- a/selfdrive/proclogd/proclogd.cc +++ b/selfdrive/proclogd/proclogd.cc @@ -13,7 +13,7 @@ #include #include -#include "messaging.hpp" +#include "messaging.h" #include "common/timing.h" #include "common/util.h" diff --git a/selfdrive/sensord/sensors_qcom.cc b/selfdrive/sensord/sensors_qcom.cc index b46c232dc..6e6ad8a3a 100644 --- a/selfdrive/sensord/sensors_qcom.cc +++ b/selfdrive/sensord/sensors_qcom.cc @@ -16,7 +16,7 @@ #include #include -#include "messaging.hpp" +#include "messaging.h" #include "common/timing.h" #include "common/util.h" #include "common/swaglog.h" diff --git a/selfdrive/sensord/sensors_qcom2.cc b/selfdrive/sensord/sensors_qcom2.cc index bbc3321d9..7d90cbc6b 100644 --- a/selfdrive/sensord/sensors_qcom2.cc +++ b/selfdrive/sensord/sensors_qcom2.cc @@ -3,7 +3,7 @@ #include #include -#include "messaging.hpp" +#include "messaging.h" #include "common/i2c.h" #include "common/timing.h" #include "common/util.h" diff --git a/selfdrive/ui/replay/Unlogger.h b/selfdrive/ui/replay/Unlogger.h index b480e681a..ef207f61b 100644 --- a/selfdrive/ui/replay/Unlogger.h +++ b/selfdrive/ui/replay/Unlogger.h @@ -3,7 +3,7 @@ #include #include #include "clutil.h" -#include "messaging.hpp" +#include "messaging.h" #include "FileReader.h" #include "FrameReader.h" #include "visionipc_server.h" diff --git a/selfdrive/ui/ui.h b/selfdrive/ui/ui.h index 2de42a29d..1e9059867 100644 --- a/selfdrive/ui/ui.h +++ b/selfdrive/ui/ui.h @@ -16,7 +16,7 @@ #include "common/glutil.h" #include "common/util.h" #include "common/transformations/orientation.hpp" -#include "messaging.hpp" +#include "messaging.h" #include "visionipc.h" #include "visionipc_client.h"