Mirrors_Framework/paparazzi
1
0
Fork 0
mirror of https://github.com/paparazzi/paparazzi.git synced 2026-06-01 12:57:27 +08:00
Code Issues Actions 28 Packages Projects Releases Wiki Activity

couple of small bugs

Browse Source
This commit is contained in:
Gerard Toonstra
2012-10-09 15:36:06 -03:00
parent c39c68439d
commit 2ea03ee3a0
2 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sw/airborne/arch/stm32/mcu_periph/spi_arch.c
+8 -6
View File
@@ -229,7 +229,7 @@ void spi0_arch_init(void) {
spi0.dma = &spi0_dma; spi0.dma = &spi0_dma;
spi0_dma.spi = SPI3; spi0_dma.spi = SPI3;
spi0_dma.spidr = SPI3_DR; spi0_dma.spidr = (u32)&SPI3_DR;
spi0_dma.dma = DMA2; spi0_dma.dma = DMA2;
spi0_dma.rx_chan = DMA_CHANNEL1; spi0_dma.rx_chan = DMA_CHANNEL1;
spi0_dma.tx_chan = DMA_CHANNEL2; spi0_dma.tx_chan = DMA_CHANNEL2;
@@ -286,7 +286,7 @@ void spi1_arch_init(void) {
spi1.dma = &spi1_dma; spi1.dma = &spi1_dma;
spi1_dma.spi = SPI1; spi1_dma.spi = SPI1;
spi1_dma.spidr = SPI1_DR; spi1_dma.spidr = (u32)&SPI1_DR;
spi1_dma.dma = DMA1; spi1_dma.dma = DMA1;
spi1_dma.rx_chan = DMA_CHANNEL4; spi1_dma.rx_chan = DMA_CHANNEL4;
spi1_dma.tx_chan = DMA_CHANNEL5; spi1_dma.tx_chan = DMA_CHANNEL5;
@@ -321,8 +321,10 @@ void spi2_arch_init(void) {
spi_disable(SPI2); spi_disable(SPI2);
// configure SPI // configure SPI
spi_init_master(SPI2, SPI_CR1_BAUDRATE_FPCLK_DIV_64, SPI_CR1_CPOL_CLK_TO_0_WHEN_IDLE, spi_init_master(SPI2, SPI_CR1_BAUDRATE_FPCLK_DIV_64, SPI_CR1_CPOL_CLK_TO_1_WHEN_IDLE,
SPI_CR1_CPHA_CLK_TRANSITION_1, SPI_CR1_DFF_8BIT, SPI_CR1_MSBFIRST); SPI_CR1_CPHA_CLK_TRANSITION_1, SPI_CR1_DFF_8BIT, SPI_CR1_MSBFIRST);
//spi_enable_crc( SPI2 );
//spi_set_full_duplex_mode( SPI2 );
/* /*
* Set NSS management to software. * Set NSS management to software.
@@ -343,7 +345,7 @@ void spi2_arch_init(void) {
spi2.dma = &spi2_dma; spi2.dma = &spi2_dma;
spi2_dma.spi = SPI2; spi2_dma.spi = SPI2;
spi2_dma.spidr = SPI2_DR; spi2_dma.spidr = (u32)&SPI2_DR;
spi2_dma.dma = DMA1; spi2_dma.dma = DMA1;
spi2_dma.rx_chan = DMA_CHANNEL4; spi2_dma.rx_chan = DMA_CHANNEL4;
spi2_dma.tx_chan = DMA_CHANNEL5; spi2_dma.tx_chan = DMA_CHANNEL5;
@@ -373,7 +375,7 @@ void spi_rw(struct spi_periph* p, struct spi_transaction * _trans)
// Rx_DMA_Channel configuration ------------------------------------ // Rx_DMA_Channel configuration ------------------------------------
dma_channel_reset( dma->dma, dma->rx_chan ); dma_channel_reset( dma->dma, dma->rx_chan );
dma_set_peripheral_address(dma->dma, dma->rx_chan, (u32)&dma->spidr); dma_set_peripheral_address(dma->dma, dma->rx_chan, (u32)dma->spidr);
dma_set_memory_address(dma->dma, dma->rx_chan, (uint32_t)_trans->input_buf); dma_set_memory_address(dma->dma, dma->rx_chan, (uint32_t)_trans->input_buf);
dma_set_number_of_data(dma->dma, dma->rx_chan, _trans->input_length); dma_set_number_of_data(dma->dma, dma->rx_chan, _trans->input_length);
dma_set_read_from_peripheral(dma->dma, dma->rx_chan); dma_set_read_from_peripheral(dma->dma, dma->rx_chan);
@@ -386,7 +388,7 @@ void spi_rw(struct spi_periph* p, struct spi_transaction * _trans)
// SPI Tx_DMA_Channel configuration ------------------------------------ // SPI Tx_DMA_Channel configuration ------------------------------------
dma_channel_reset(dma->dma, dma->tx_chan); dma_channel_reset(dma->dma, dma->tx_chan);
dma_set_peripheral_address(dma->dma, dma->tx_chan, (u32)&dma->spidr); dma_set_peripheral_address(dma->dma, dma->tx_chan, (u32)dma->spidr);
dma_set_memory_address(dma->dma, dma->tx_chan, (uint32_t)_trans->output_buf); dma_set_memory_address(dma->dma, dma->tx_chan, (uint32_t)_trans->output_buf);
dma_set_number_of_data(dma->dma, dma->tx_chan, _trans->output_length); dma_set_number_of_data(dma->dma, dma->tx_chan, _trans->output_length);
dma_set_read_from_memory(dma->dma, dma->tx_chan); dma_set_read_from_memory(dma->dma, dma->tx_chan);
sw/airborne/subsystems/imu/imu_aspirin2.c
+2
View File
@@ -64,6 +64,7 @@ void imu_periodic(void)
imu_aspirin2.status = Aspirin2StatusIdle; imu_aspirin2.status = Aspirin2StatusIdle;
aspirin2_mpu60x0.output_length = 22; aspirin2_mpu60x0.output_length = 22;
aspirin2_mpu60x0.input_length = 22;
aspirin2_mpu60x0.output_buf[0] = MPU60X0_REG_INT_STATUS + MPU60X0_SPI_READ; aspirin2_mpu60x0.output_buf[0] = MPU60X0_REG_INT_STATUS + MPU60X0_SPI_READ;
for (int i=1;i<aspirin2_mpu60x0.output_length;i++) { for (int i=1;i<aspirin2_mpu60x0.output_length;i++) {
aspirin2_mpu60x0.output_buf[i] = 0; aspirin2_mpu60x0.output_buf[i] = 0;
@@ -110,6 +111,7 @@ static inline void mpu_wait_slave4_ready(void)
static void mpu_configure(void) static void mpu_configure(void)
{ {
aspirin2_mpu60x0.output_length = 2; aspirin2_mpu60x0.output_length = 2;
aspirin2_mpu60x0.input_length = 2;
/////////////////// ///////////////////
// Reset the MPU // Reset the MPU