From 737f5d4e3d57110aef258f351e220497022acac0 Mon Sep 17 00:00:00 2001 From: Daniel Agar Date: Mon, 19 Aug 2019 15:11:39 -0400 Subject: [PATCH] px4io fix code style --- src/drivers/px4io/px4io.cpp | 8 ++++---- src/modules/px4iofirmware/mixer.cpp | 7 ++++--- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/src/drivers/px4io/px4io.cpp b/src/drivers/px4io/px4io.cpp index 82312d10a9..b66c4a68c7 100644 --- a/src/drivers/px4io/px4io.cpp +++ b/src/drivers/px4io/px4io.cpp @@ -1304,11 +1304,11 @@ PX4IO::io_set_control_state(unsigned group) for (unsigned i = 0; i < _max_controls; i++) { /* ensure FLOAT_TO_REG does not produce an integer overflow */ const float ctrl = math::constrain(controls.control[i], -1.0f, 1.0f); - if(!isfinite(ctrl)){ + + if (!isfinite(ctrl)) { regs[i] = INT16_MAX; - } - else - { + + } else { regs[i] = FLOAT_TO_REG(ctrl); } diff --git a/src/modules/px4iofirmware/mixer.cpp b/src/modules/px4iofirmware/mixer.cpp index bde4c35e3d..1177635860 100644 --- a/src/modules/px4iofirmware/mixer.cpp +++ b/src/modules/px4iofirmware/mixer.cpp @@ -412,13 +412,14 @@ mixer_callback(uintptr_t handle, switch (source) { case MIX_FMU: if (control_index < PX4IO_CONTROL_CHANNELS && control_group < PX4IO_CONTROL_GROUPS) { - if(r_page_controls[CONTROL_PAGE_INDEX(control_group, control_index)] == INT16_MAX){ + if (r_page_controls[CONTROL_PAGE_INDEX(control_group, control_index)] == INT16_MAX) { //catch NAN values encoded as INT16 max for disarmed outputs control = NAN; - } - else{ + + } else { control = REG_TO_FLOAT(r_page_controls[CONTROL_PAGE_INDEX(control_group, control_index)]); } + break; }