Successful first compilation after merge

2018-11-27 14:50:12 +08:00
parent b346f7fec9
commit 7a9f9139fd
12 changed files with 75 additions and 32 deletions
--- a/tools/writer/device_writer.h
+++ b/tools/writer/device_writer.h
@@ -31,8 +31,8 @@ namespace tools {
 class DeviceWriter {
 public:
  using dev_info_t = DeviceInfo;
-  using img_params_t = Channels::img_params_t;
-  using imu_params_t = Channels::imu_params_t;
+  using img_params_t = device::img_params_t;
+  using imu_params_t = device::imu_params_t;

  explicit DeviceWriter(std::shared_ptr<Device> device);
  ~DeviceWriter();