mirror of
https://github.com/PX4/PX4-Autopilot.git
synced 2026-05-31 18:47:21 +08:00
Checkpoint; messages from FMU now make it to IO intact; fix HRT init timing, process more bytes from the serial port, add some simple packet counting.
This commit is contained in:
@@ -80,11 +80,6 @@
|
|||||||
|
|
||||||
__EXPORT void stm32_boardinitialize(void)
|
__EXPORT void stm32_boardinitialize(void)
|
||||||
{
|
{
|
||||||
/* configure the high-resolution time/callout interface */
|
|
||||||
#ifdef CONFIG_HRT_TIMER
|
|
||||||
hrt_init();
|
|
||||||
#endif
|
|
||||||
|
|
||||||
/* configure GPIOs */
|
/* configure GPIOs */
|
||||||
stm32_configgpio(GPIO_ACC1_PWR_EN);
|
stm32_configgpio(GPIO_ACC1_PWR_EN);
|
||||||
stm32_configgpio(GPIO_ACC2_PWR_EN);
|
stm32_configgpio(GPIO_ACC2_PWR_EN);
|
||||||
|
|||||||
+14
-9
@@ -106,27 +106,29 @@ comms_check(void)
|
|||||||
* Check for bytes and feed them to the RX engine.
|
* Check for bytes and feed them to the RX engine.
|
||||||
* Limit the number of bytes we actually process on any one iteration.
|
* Limit the number of bytes we actually process on any one iteration.
|
||||||
*/
|
*/
|
||||||
struct pollfd fds[1];
|
char buf[32];
|
||||||
fds[0].fd = fmu_fd;
|
|
||||||
fds[0].revents = POLLIN;
|
|
||||||
if (poll(fds, 1, 0) > 0) {
|
|
||||||
char buf[8];
|
|
||||||
ssize_t count = read(fmu_fd, buf, sizeof(buf));
|
ssize_t count = read(fmu_fd, buf, sizeof(buf));
|
||||||
for (int i = 0; i < count; i++)
|
for (int i = 0; i < count; i++)
|
||||||
hx_stream_rx(stream, buf[i]);
|
hx_stream_rx(stream, buf[i]);
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
int frame_rx;
|
||||||
|
int frame_bad;
|
||||||
|
|
||||||
static void
|
static void
|
||||||
comms_handle_frame(void *arg, const void *buffer, size_t length)
|
comms_handle_frame(void *arg, const void *buffer, size_t length)
|
||||||
{
|
{
|
||||||
struct px4io_command *cmd;
|
struct px4io_command *cmd = (struct px4io_command *)buffer;
|
||||||
|
|
||||||
/* make sure it's what we are expecting */
|
/* make sure it's what we are expecting */
|
||||||
if (length != sizeof(struct px4io_command))
|
if ((length != sizeof(struct px4io_command)) ||
|
||||||
|
(cmd->f2i_magic != F2I_MAGIC)) {
|
||||||
|
frame_bad++;
|
||||||
return;
|
return;
|
||||||
|
}
|
||||||
|
frame_rx++;
|
||||||
|
|
||||||
cmd = (struct px4io_command *)buffer;
|
irqstate_t flags = irqsave();
|
||||||
|
|
||||||
/* fetch new PWM output values */
|
/* fetch new PWM output values */
|
||||||
for (unsigned i = 0; i < PX4IO_OUTPUT_CHANNELS; i++)
|
for (unsigned i = 0; i < PX4IO_OUTPUT_CHANNELS; i++)
|
||||||
@@ -143,4 +145,7 @@ comms_handle_frame(void *arg, const void *buffer, size_t length)
|
|||||||
/* XXX do relay changes here */
|
/* XXX do relay changes here */
|
||||||
for (unsigned i = 0; i < PX4IO_RELAY_CHANNELS; i++)
|
for (unsigned i = 0; i < PX4IO_RELAY_CHANNELS; i++)
|
||||||
system_state.relays[i] = cmd->relay_state[i];
|
system_state.relays[i] = cmd->relay_state[i];
|
||||||
|
|
||||||
|
out:
|
||||||
|
irqrestore(flags);
|
||||||
}
|
}
|
||||||
|
|||||||
+1
-1
@@ -62,7 +62,7 @@ static unsigned mixer_input_drops;
|
|||||||
* Count of periodic calls in which we have no FMU input.
|
* Count of periodic calls in which we have no FMU input.
|
||||||
*/
|
*/
|
||||||
static unsigned fmu_input_drops;
|
static unsigned fmu_input_drops;
|
||||||
#define FMU_INPUT_DROP_LIMIT 10
|
#define FMU_INPUT_DROP_LIMIT 20
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* HRT periodic call used to check for control input data.
|
* HRT periodic call used to check for control input data.
|
||||||
|
|||||||
+6
-2
@@ -71,6 +71,9 @@ int user_start(int argc, char *argv[])
|
|||||||
bool heartbeat = false;
|
bool heartbeat = false;
|
||||||
bool failsafe = false;
|
bool failsafe = false;
|
||||||
|
|
||||||
|
/* configure the high-resolution time/callout interface */
|
||||||
|
hrt_init();
|
||||||
|
|
||||||
/* configure the PWM outputs */
|
/* configure the PWM outputs */
|
||||||
up_pwm_servo_init(0xff);
|
up_pwm_servo_init(0xff);
|
||||||
|
|
||||||
@@ -131,12 +134,13 @@ int user_start(int argc, char *argv[])
|
|||||||
/* print some simple status */
|
/* print some simple status */
|
||||||
if (timers[TIMER_STATUS_PRINT] == 0) {
|
if (timers[TIMER_STATUS_PRINT] == 0) {
|
||||||
timers[TIMER_STATUS_PRINT] = 1000;
|
timers[TIMER_STATUS_PRINT] = 1000;
|
||||||
lib_lowprintf("%c %s | %s | %s | C=%d \r",
|
lib_lowprintf("%c %s | %s | %s | C=%d F=%d B=%d \r",
|
||||||
cursor[cycle++ & 3],
|
cursor[cycle++ & 3],
|
||||||
(system_state.armed ? "ARMED" : "SAFE"),
|
(system_state.armed ? "ARMED" : "SAFE"),
|
||||||
(system_state.rc_channels ? "RC OK" : "NO RC"),
|
(system_state.rc_channels ? "RC OK" : "NO RC"),
|
||||||
(system_state.mixer_use_fmu ? "FMU OK" : "NO FMU"),
|
(system_state.mixer_use_fmu ? "FMU OK" : "NO FMU"),
|
||||||
system_state.rc_channels
|
system_state.rc_channels,
|
||||||
|
frame_rx, frame_bad
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -95,6 +95,9 @@ struct sys_state_s
|
|||||||
|
|
||||||
extern struct sys_state_s system_state;
|
extern struct sys_state_s system_state;
|
||||||
|
|
||||||
|
extern int frame_rx;
|
||||||
|
extern int frame_bad;
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Software countdown timers.
|
* Software countdown timers.
|
||||||
*
|
*
|
||||||
|
|||||||
@@ -164,7 +164,7 @@ CONFIG_USART2_TXBUFSIZE=32
|
|||||||
CONFIG_USART3_TXBUFSIZE=32
|
CONFIG_USART3_TXBUFSIZE=32
|
||||||
|
|
||||||
CONFIG_USART1_RXBUFSIZE=32
|
CONFIG_USART1_RXBUFSIZE=32
|
||||||
CONFIG_USART2_RXBUFSIZE=32
|
CONFIG_USART2_RXBUFSIZE=128
|
||||||
CONFIG_USART3_RXBUFSIZE=32
|
CONFIG_USART3_RXBUFSIZE=32
|
||||||
|
|
||||||
CONFIG_USART1_BAUD=57600
|
CONFIG_USART1_BAUD=57600
|
||||||
|
|||||||
Reference in New Issue
Block a user