Skip to content

Commit bad3aba

Browse files
committed
FW do not check airspeed exists
1 parent c8162a6 commit bad3aba

File tree

3 files changed

+15
-14
lines changed

3 files changed

+15
-14
lines changed

target/amov/icf5/board/board.c

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -151,12 +151,12 @@ static void bsp_show_information(void)
151151

152152
static fmt_err_t bsp_parse_toml_sysconfig(toml_table_t* root_tab)
153153
{
154-
fmt_err_t err = FMT_EOK;
154+
fmt_err_t err = FMT_EOK;
155155
toml_table_t* sub_tab;
156-
const char* key;
157-
const char* raw;
158-
char* target;
159-
int i;
156+
const char* key;
157+
const char* raw;
158+
char* target;
159+
int i;
160160

161161
if (root_tab == NULL) {
162162
return FMT_ERROR;
@@ -337,10 +337,9 @@ void bsp_initialize(void)
337337
FMT_CHECK(advertise_sensor_rangefinder(0));
338338

339339
if (strcmp(STR(VEHICLE_TYPE), "Fixwing") == 0) {
340-
// FMT_CHECK(advertise_sensor_airspeed(0));
341-
// RT_CHECK(drv_ms4525_init("i2c0_dev1", NULL));
342-
RT_CHECK(drv_ms4525_init("i2c0_dev1", "airspeed"));
343-
FMT_CHECK(register_sensor_airspeed("airspeed"));
340+
if (drv_ms4525_init("i2c0_dev1", "airspeed") == RT_EOK) {
341+
FMT_CHECK(register_sensor_airspeed("airspeed"));
342+
}
344343
}
345344
#endif
346345

target/cuav/v5_plus/board/board.c

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -449,8 +449,9 @@ void bsp_initialize(void)
449449
FMT_CHECK(advertise_sensor_rangefinder(0));
450450

451451
if (strcmp(STR(VEHICLE_TYPE), "Fixwing") == 0) {
452-
RT_CHECK(drv_ms4525_init("i2c2_dev1", "airspeed"));
453-
FMT_CHECK(register_sensor_airspeed("airspeed"));
452+
if (drv_ms4525_init("i2c2_dev1", "airspeed") == RT_EOK) {
453+
FMT_CHECK(register_sensor_airspeed("airspeed"));
454+
}
454455
}
455456
#endif
456457

target/pixhawk/fmu-v2/board/board.c

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,7 @@ static void bsp_show_information(void)
150150

151151
/**
152152
* @brief Enable on-board device power supply
153-
*
153+
*
154154
*/
155155
static void EnablePower(void)
156156
{
@@ -349,8 +349,9 @@ void bsp_initialize(void)
349349
FMT_CHECK(advertise_sensor_optflow(0));
350350
FMT_CHECK(advertise_sensor_rangefinder(0));
351351
if (strcmp(STR(VEHICLE_TYPE), "Fixwing") == 0) {
352-
RT_CHECK(drv_ms4525_init("i2c1_dev1", "airspeed"));
353-
FMT_CHECK(register_sensor_airspeed("airspeed"));
352+
if (drv_ms4525_init("i2c1_dev1", "airspeed") == RT_EOK) {
353+
FMT_CHECK(register_sensor_airspeed("airspeed"));
354+
}
354355
}
355356
#endif
356357

0 commit comments

Comments
 (0)