aboutsummaryrefslogtreecommitdiff
path: root/src/modules/px4iofirmware/px4io.c
diff options
context:
space:
mode:
authorpx4dev <px4@purgatory.org>2013-04-28 13:51:33 -0700
committerpx4dev <px4@purgatory.org>2013-04-28 13:51:33 -0700
commit8f7200e0114d6bd9fcac7ec088b125e54761c2e0 (patch)
treed81b7cbe6f3e15ef3771e8def5e6197ba01d8b48 /src/modules/px4iofirmware/px4io.c
parent2423c54e0e5500a8a9e2ef482b95b351a4a6071e (diff)
downloadpx4-firmware-8f7200e0114d6bd9fcac7ec088b125e54761c2e0.tar.gz
px4-firmware-8f7200e0114d6bd9fcac7ec088b125e54761c2e0.tar.bz2
px4-firmware-8f7200e0114d6bd9fcac7ec088b125e54761c2e0.zip
Frame up the configuration for the serial interface on IOv2
Diffstat (limited to 'src/modules/px4iofirmware/px4io.c')
-rw-r--r--src/modules/px4iofirmware/px4io.c13
1 files changed, 5 insertions, 8 deletions
diff --git a/src/modules/px4iofirmware/px4io.c b/src/modules/px4iofirmware/px4io.c
index bc8dfc116..39f05c112 100644
--- a/src/modules/px4iofirmware/px4io.c
+++ b/src/modules/px4iofirmware/px4io.c
@@ -64,11 +64,6 @@ struct sys_state_s system_state;
static struct hrt_call serial_dma_call;
-#ifdef CONFIG_STM32_I2C1
-/* store i2c reset count XXX this should be a register, together with other error counters */
-volatile uint32_t i2c_loop_resets = 0;
-#endif
-
/*
* a set of debug buffers to allow us to send debug information from ISRs
*/
@@ -159,10 +154,13 @@ user_start(int argc, char *argv[])
/* initialise the control inputs */
controls_init();
-#ifdef CONFIG_STM32_I2C1
+#ifdef INTERFACE_I2C
/* start the i2c handler */
i2c_init();
#endif
+#ifdef INTERFACE_SERIAL
+ /* start the serial interface */
+#endif
/* add a performance counter for mixing */
perf_counter_t mixer_perf = perf_alloc(PC_ELAPSED, "mix");
@@ -223,12 +221,11 @@ user_start(int argc, char *argv[])
struct mallinfo minfo = mallinfo();
- isr_debug(1, "d:%u s=0x%x a=0x%x f=0x%x r=%u m=%u",
+ isr_debug(1, "d:%u s=0x%x a=0x%x f=0x%x m=%u",
(unsigned)r_page_setup[PX4IO_P_SETUP_SET_DEBUG],
(unsigned)r_status_flags,
(unsigned)r_setup_arming,
(unsigned)r_setup_features,
- (unsigned)i2c_loop_resets,
(unsigned)minfo.mxordblk);
last_debug_time = hrt_absolute_time();
}