X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2Fdrivers%2Fao_companion.c;h=d6fbb6b7480de528c322eac0f778a671b9d44d85;hb=refs%2Fheads%2Fmaster;hp=093356a59981ecdea92b82927f3ac919f1a1facf;hpb=341157c7415fcf879696c9d8167722a0c5ff264c;p=fw%2Faltos diff --git a/src/drivers/ao_companion.c b/src/drivers/ao_companion.c index 093356a5..bda7805f 100644 --- a/src/drivers/ao_companion.c +++ b/src/drivers/ao_companion.c @@ -28,7 +28,7 @@ #error HAS_COMPANION not set in ao_companion.c #endif -#define AO_COMPANION_SPI_SPEED ao_spi_speed(200000) +#define AO_COMPANION_SPI_SPEED ao_spi_speed(AO_COMPANION_SPI_BUS, 200000) #define COMPANION_SELECT() do { \ ao_spi_get_bit(AO_COMPANION_CS_PORT, \ @@ -55,12 +55,12 @@ ao_companion_send_command(uint8_t command) { ao_companion_command.command = command; ao_companion_command.flight_state = ao_flight_state; - ao_companion_command.tick = ao_time(); + ao_companion_command.tick = (uint16_t) ao_time(); ao_companion_command.serial = ao_serial_number; ao_companion_command.flight = ao_flight_number; - ao_companion_command.accel = ao_accel; - ao_companion_command.speed = ao_speed; - ao_companion_command.height = ao_height; + ao_companion_command.accel = (int16_t) ao_accel; + ao_companion_command.speed = (int16_t) ao_speed; + ao_companion_command.height = (int16_t) ao_height; ao_companion_command.motor_number = ao_motor_number; ao_spi_send(&ao_companion_command, sizeof (ao_companion_command), AO_COMPANION_SPI_BUS); }