Mirrors_Framework/paparazzi
1
0
Fork 0
mirror of https://github.com/paparazzi/paparazzi.git synced 2026-06-07 00:53:41 +08:00
Code Issues Actions 26 Packages Projects Releases Wiki Activity

removed the butcher SPI reset

Browse Source
This commit is contained in:
Antoine Drouin
2010-08-12 19:37:26 +00:00
parent 2a4d7b2345
commit 2f353f30bf
2 changed files with 2 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sw/airborne/lisa/arch/stm32/lisa_overo_link_arch.c
+2
View File
@@ -63,6 +63,8 @@ void overo_link_arch_prepare_next_transfert(void) {
uint8_t foo __attribute__ ((unused)) = SPI1->DR;
/* Read status register to clear OVR, UDR, MODF flags */
foo = SPI1->SR;
/* clear possible CRC_ERR flag */
SPI1->SR = (uint16_t)~SPI_FLAG_CRCERR;
/* SPI_SLAVE_Rx_DMA_Channel configuration ------------------------------------*/
DMA_DeInit(DMA1_Channel2);
sw/airborne/lisa/arch/stm32/lisa_overo_link_arch.h
-22
View File
@@ -9,7 +9,6 @@
while(SPI_I2S_GetFlagStatus(SPI1, SPI_I2S_FLAG_RXNE)==RESET); \
while(SPI_I2S_GetFlagStatus(SPI1, SPI_I2S_FLAG_TXE) ==RESET); \
while(SPI_I2S_GetFlagStatus(SPI1, SPI_I2S_FLAG_BSY) ==SET); \
uint8_t foo1 __attribute__ ((unused)) = SPI_I2S_ReceiveData(SPI1); \
overo_link.timeout = 0; \
if((SPI_I2S_GetFlagStatus(SPI1, SPI_FLAG_CRCERR)) == RESET) { \
LED_ON(OVERO_LINK_LED_OK); \
@@ -30,9 +29,6 @@
} \
if (overo_link.crc_error && /* if we've had a bad crc */ \
!GPIO_ReadInputDataBit(GPIOA, GPIO_Pin_4)) { /* and we're not selected anymore */ \
uint8_t foo2 __attribute__ ((unused)) = SPI_I2S_ReceiveData(SPI1); \
foo2 = SPI_I2S_ReceiveData(SPI1); \
violently_reset_spi(); \
overo_link_arch_prepare_next_transfert(); \
overo_link.crc_error = FALSE; \
} \
@@ -40,23 +36,5 @@
#define violently_reset_spi() { \
SPI_Cmd(SPI1, DISABLE); \
SPI_I2S_DeInit(SPI1); \
SPI_InitTypeDef SPI_InitStructure; \
SPI_InitStructure.SPI_Direction = SPI_Direction_2Lines_FullDuplex; \
SPI_InitStructure.SPI_Mode = SPI_Mode_Slave; \
SPI_InitStructure.SPI_DataSize = SPI_DataSize_8b; \
SPI_InitStructure.SPI_CPOL = SPI_CPOL_Low; \
SPI_InitStructure.SPI_CPHA = SPI_CPHA_2Edge; \
SPI_InitStructure.SPI_NSS = SPI_NSS_Hard; \
SPI_InitStructure.SPI_BaudRatePrescaler = SPI_BaudRatePrescaler_2; \
SPI_InitStructure.SPI_FirstBit = SPI_FirstBit_MSB; \
SPI_InitStructure.SPI_CRCPolynomial = 0x31; \
SPI_Init(SPI1, &SPI_InitStructure); \
SPI_CalculateCRC(SPI1, ENABLE); \
SPI_Cmd(SPI1, ENABLE); \
}
#endif /* LISA_OVERO_LINK_ARCH_H */