From a0b818096b465f5e7d2f1be8cadff608069f1287 Mon Sep 17 00:00:00 2001 From: Daniel Agar Date: Wed, 13 Apr 2016 17:30:08 -0400 Subject: [PATCH] fix hc_sr04 and srf02_i2c subsystem_info init --- src/drivers/hc_sr04/hc_sr04.cpp | 12 ++++++------ src/drivers/srf02_i2c/srf02_i2c.cpp | 13 ++++++------- 2 files changed, 12 insertions(+), 13 deletions(-) diff --git a/src/drivers/hc_sr04/hc_sr04.cpp b/src/drivers/hc_sr04/hc_sr04.cpp index e6869933d6..efe239e53f 100644 --- a/src/drivers/hc_sr04/hc_sr04.cpp +++ b/src/drivers/hc_sr04/hc_sr04.cpp @@ -659,12 +659,12 @@ HC_SR04::start() /* notify about state change */ - struct subsystem_info_s info = { - true, - true, - true, - SUBSYSTEM_TYPE_RANGEFINDER - }; + struct subsystem_info_s info = {}; + info.present = true; + info.enabled = true; + info.ok = true; + info.subsystem_type = SUBSYSTEM_TYPE_RANGEFINDER; + static orb_advert_t pub = nullptr; if (pub != nullptr) { diff --git a/src/drivers/srf02_i2c/srf02_i2c.cpp b/src/drivers/srf02_i2c/srf02_i2c.cpp index 65c22629ed..3ea72f7e15 100644 --- a/src/drivers/srf02_i2c/srf02_i2c.cpp +++ b/src/drivers/srf02_i2c/srf02_i2c.cpp @@ -620,18 +620,17 @@ SRF02_I2C::start() work_queue(HPWORK, &_work, (worker_t)&SRF02_I2C::cycle_trampoline, this, 5); /* notify about state change */ - struct subsystem_info_s info = { - true, - true, - true, - subsystem_info_s::SUBSYSTEM_TYPE_RANGEFINDER - }; + struct subsystem_info_s info = {}; + info.present = true; + info.enabled = true; + info.ok = true; + info.subsystem_type = subsystem_info_s::SUBSYSTEM_TYPE_RANGEFINDER; + static orb_advert_t pub = nullptr; if (pub != nullptr) { orb_publish(ORB_ID(subsystem_info), pub, &info); - } else { pub = orb_advertise(ORB_ID(subsystem_info), &info);