[paparazzi-commits] [4771] more test programs

[antoine drouin]

Revision: 4771
          http://svn.sv.gnu.org/viewvc/?view=rev&root=paparazzi&revision=4771
Author:   poine
Date:     2010-03-30 17:48:40 +0000 (Tue, 30 Mar 2010)
Log Message:
-----------
more test programs

Modified Paths:
--------------
    paparazzi3/trunk/sw/airborne/lisa/test_mc.c
    paparazzi3/trunk/sw/airborne/lisa/test_spi_slave.c

Added Paths:
-----------
    paparazzi3/trunk/sw/airborne/lisa/test_mc2.c
    paparazzi3/trunk/sw/airborne/lisa/test_spi_slave2.c

Modified: paparazzi3/trunk/sw/airborne/lisa/test_mc.c
===================================================================
--- paparazzi3/trunk/sw/airborne/lisa/test_mc.c 2010-03-30 17:46:57 UTC (rev 
4770)
+++ paparazzi3/trunk/sw/airborne/lisa/test_mc.c 2010-03-30 17:48:40 UTC (rev 
4771)
@@ -122,7 +122,7 @@
   //  return;
   
   /* Snd data */
-  I2C_SendData(I2C1, 0x5);
+  I2C_SendData(I2C1, 0x05);
 
   /* Test on EV8 and clear it */
   while(!I2C_CheckEvent(I2C1, I2C_EVENT_MASTER_BYTE_TRANSMITTED));

Added: paparazzi3/trunk/sw/airborne/lisa/test_mc2.c
===================================================================
--- paparazzi3/trunk/sw/airborne/lisa/test_mc2.c                                
(rev 0)
+++ paparazzi3/trunk/sw/airborne/lisa/test_mc2.c        2010-03-30 17:48:40 UTC 
(rev 4771)
@@ -0,0 +1,64 @@
+/*
+ * $Id$
+ *  
+ * Copyright (C) 2009 Antoine Drouin <address@hidden>
+ *
+ * This file is part of paparazzi.
+ *
+ * paparazzi is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2, or (at your option)
+ * any later version.
+ *
+ * paparazzi is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with paparazzi; see the file COPYING.  If not, write to
+ * the Free Software Foundation, 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA. 
+ */
+
+
+#include "init_hw.h"
+#include "sys_time.h"
+
+static inline void main_init( void );
+static inline void main_periodic_task( void );
+static inline void main_event_task( void );
+
+static uint8_t i2c_done;
+
+int main(void) {
+  main_init();
+
+  while(1) {
+    if (sys_time_periodic())
+      main_periodic_task();
+    main_event_task();
+  }
+
+  return 0;
+}
+
+static inline void main_init( void ) {
+  hw_init();
+  sys_time_init();
+}
+
+
+
+static inline void main_periodic_task( void ) {
+
+  i2c1_buf[0] = 0x05;
+  i2c1_transmit(0x52, 1, &i2c_done);
+
+}
+
+
+
+static inline void main_event_task( void ) {
+
+}

Modified: paparazzi3/trunk/sw/airborne/lisa/test_spi_slave.c
===================================================================
--- paparazzi3/trunk/sw/airborne/lisa/test_spi_slave.c  2010-03-30 17:46:57 UTC 
(rev 4770)
+++ paparazzi3/trunk/sw/airborne/lisa/test_spi_slave.c  2010-03-30 17:48:40 UTC 
(rev 4771)
@@ -56,8 +56,14 @@
 }
 
 static inline void main_periodic_task( void ) {
-
-
+#if 0
+  static uint8_t foo = FALSE;
+  if (foo)
+    GPIOC->BRR = GPIO_Pin_4;
+  else
+    GPIOC->BSRR = GPIO_Pin_4;
+  foo = !foo;
+#endif
 }
 
 static inline void main_event_task( void ) {
@@ -88,7 +94,8 @@
 
   /* SPI_SLAVE configuration 
--------------------------------------------------*/
   SPI_InitTypeDef SPI_InitStructure;
-  SPI_InitStructure.SPI_Direction = SPI_Direction_1Line_Rx;
+  //  SPI_InitStructure.SPI_Direction = SPI_Direction_1Line_Rx;
+  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;
@@ -103,10 +110,21 @@
   SPI_I2S_ITConfig(SPI1, SPI_I2S_IT_RXNE, ENABLE);
   /* Enable SPI_SLAVE */
   SPI_Cmd(SPI1, ENABLE);
+
+#if 0
+  /* configure DATA_READY on PC4 */
+  GPIO_InitStructure.GPIO_Pin = GPIO_Pin_4;
+  GPIO_InitStructure.GPIO_Speed = GPIO_Speed_50MHz;
+  GPIO_InitStructure.GPIO_Mode = GPIO_Mode_Out_PP;
+  GPIO_Init(GPIOC, &GPIO_InitStructure);
+#endif
 }
 
 void spi1_irq_handler(void) {
   uint8_t foo = SPI_I2S_ReceiveData(SPI1);
+  static uint8_t cnt = 0;
+  SPI_I2S_SendData(SPI1, cnt);
+  cnt++;
   LED_TOGGLE(1);
 }
 

Added: paparazzi3/trunk/sw/airborne/lisa/test_spi_slave2.c
===================================================================
--- paparazzi3/trunk/sw/airborne/lisa/test_spi_slave2.c                         
(rev 0)
+++ paparazzi3/trunk/sw/airborne/lisa/test_spi_slave2.c 2010-03-30 17:48:40 UTC 
(rev 4771)
@@ -0,0 +1,196 @@
+/*
+ * $Id$
+ *  
+ * Copyright (C) 2009 Antoine Drouin <address@hidden>
+ *
+ * This file is part of paparazzi.
+ *
+ * paparazzi is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2, or (at your option)
+ * any later version.
+ *
+ * paparazzi is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with paparazzi; see the file COPYING.  If not, write to
+ * the Free Software Foundation, 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA. 
+ */
+
+#include <stm32/flash.h>
+#include <stm32/misc.h>
+#include <stm32/spi.h>
+#include <stm32/dma.h>
+
+#include BOARD_CONFIG
+#include "init_hw.h"
+#include "sys_time.h"
+
+static inline void main_init( void );
+static inline void main_periodic_task( void );
+static inline void main_event_task( void );
+
+#define USE_DMA 1
+//#define USE_DRDY 1
+
+#define BufferSize       32
+uint8_t SPI_SLAVE_Buffer_Rx[BufferSize];
+uint8_t SPI_SLAVE_Buffer_Tx[BufferSize];
+static inline void main_spi_slave_init( void );
+
+#define SETUP_DMA() {                                                  \
+    /* SPI_SLAVE_Rx_DMA_Channel configuration 
------------------------------------*/ \
+    DMA_InitTypeDef  DMA_InitStructure;                                        
\
+    DMA_DeInit(DMA1_Channel2);                                         \
+    DMA_InitStructure.DMA_PeripheralBaseAddr = (uint32_t)(SPI1_BASE+0x0C); \
+    DMA_InitStructure.DMA_MemoryBaseAddr = (uint32_t)SPI_SLAVE_Buffer_Rx; \
+    DMA_InitStructure.DMA_DIR = DMA_DIR_PeripheralSRC;                 \
+    DMA_InitStructure.DMA_BufferSize = BufferSize;                     \
+    DMA_InitStructure.DMA_PeripheralInc = DMA_PeripheralInc_Disable;   \
+    DMA_InitStructure.DMA_MemoryInc = DMA_MemoryInc_Enable;            \
+    DMA_InitStructure.DMA_PeripheralDataSize = DMA_PeripheralDataSize_Byte; \
+    DMA_InitStructure.DMA_MemoryDataSize = DMA_MemoryDataSize_Byte;    \
+    DMA_InitStructure.DMA_Mode = DMA_Mode_Normal;                      \
+    DMA_InitStructure.DMA_Priority = DMA_Priority_VeryHigh;            \
+    DMA_InitStructure.DMA_M2M = DMA_M2M_Disable;                       \
+    DMA_Init(DMA1_Channel2, &DMA_InitStructure);                       \
+  }
+
+
+
+int main(void) {
+  main_init();
+
+  while(1) {
+    if (sys_time_periodic())
+      main_periodic_task();
+    main_event_task();
+  }
+
+  return 0;
+}
+
+
+static inline void main_init( void ) {
+  hw_init();
+  sys_time_init();
+  main_spi_slave_init();
+}
+
+static inline void main_periodic_task( void ) {
+#ifdef USE_DRDY
+  static uint8_t foo = FALSE;
+  if (foo)
+    GPIOC->BRR = GPIO_Pin_4;
+  else
+    GPIOC->BSRR = GPIO_Pin_4;
+  foo = !foo;
+#endif
+
+}
+
+static inline void main_event_task( void ) {
+
+#ifdef USE_DMA
+  if (DMA_GetFlagStatus(DMA1_FLAG_TC2)) {
+    LED_TOGGLE(1);
+    SETUP_DMA();
+    /* Enable SPI_1 Rx request */
+    SPI_I2S_DMACmd(SPI1, SPI_I2S_DMAReq_Rx, ENABLE);
+    /* Enable DMA1 Channel4 */
+    DMA_Cmd(DMA1_Channel2, ENABLE);
+
+    // LED_ON(1);
+  }
+#endif
+
+}
+
+
+static inline void main_spi_slave_init( void ) {
+
+#ifdef USE_DMA
+  /* Enable SPI_1 DMA clock 
---------------------------------------------------*/
+  RCC_AHBPeriphClockCmd(RCC_AHBPeriph_DMA1, ENABLE);
+#endif
+
+  /* Enable SPI1 Periph clock 
-------------------------------------------------*/
+  RCC_APB2PeriphClockCmd(RCC_APB2Periph_SPI1, ENABLE);
+  
+  /* Configure GPIOs: NSS, SCK, MISO and MOSI  
--------------------------------*/
+  GPIO_InitTypeDef GPIO_InitStructure;
+  GPIO_InitStructure.GPIO_Pin = GPIO_Pin_4 | GPIO_Pin_5 | GPIO_Pin_6 | 
GPIO_Pin_7;
+  GPIO_InitStructure.GPIO_Speed = GPIO_Speed_50MHz;
+  GPIO_InitStructure.GPIO_Mode = GPIO_Mode_AF_PP;
+  GPIO_Init(GPIOA, &GPIO_InitStructure);
+
+#ifdef USE_DMA
+  /* SPI_SLAVE_Rx_DMA_Channel configuration 
------------------------------------*/
+  SETUP_DMA();
+#endif
+
+#ifndef USE_DMA
+  /* Configure the nested vectored interrupt controller. 
----------------------*/
+  NVIC_InitTypeDef NVIC_InitStructure;
+  /* 1 bit for pre-emption priority, 3 bits for subpriority */
+  NVIC_PriorityGroupConfig(NVIC_PriorityGroup_1);
+  NVIC_InitStructure.NVIC_IRQChannel = SPI1_IRQn;
+  NVIC_InitStructure.NVIC_IRQChannelPreemptionPriority = 0;
+  NVIC_InitStructure.NVIC_IRQChannelSubPriority = 1;
+  NVIC_Init(&NVIC_InitStructure);
+#endif
+
+  /* SPI_SLAVE configuration 
--------------------------------------------------*/
+  SPI_InitTypeDef SPI_InitStructure;
+  SPI_InitStructure.SPI_Direction = SPI_Direction_1Line_Rx;
+  //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_NSS = SPI_NSS_Soft;
+  SPI_InitStructure.SPI_BaudRatePrescaler = SPI_BaudRatePrescaler_4;
+  SPI_InitStructure.SPI_FirstBit = SPI_FirstBit_MSB;
+  SPI_InitStructure.SPI_CRCPolynomial = 7;
+  SPI_Init(SPI1, &SPI_InitStructure);
+  
+#ifndef USE_DMA
+  /* Enable SPI_SLAVE RXNE interrupt */
+  SPI_I2S_ITConfig(SPI1, SPI_I2S_IT_RXNE, ENABLE);
+#endif
+
+  /* Enable SPI_SLAVE */
+  SPI_Cmd(SPI1, ENABLE);
+
+  /* Enable SPI_1 Rx request */
+  SPI_I2S_DMACmd(SPI1, SPI_I2S_DMAReq_Rx, ENABLE);
+
+  /* Enable DMA1 Channel4 */
+  DMA_Cmd(DMA1_Channel2, ENABLE);
+
+#ifdef USE_DRDY
+  /* enable DRDY signaling */
+  /* configure DATA_READY on PC4 */
+  GPIO_InitStructure.GPIO_Pin = GPIO_Pin_4;
+  GPIO_InitStructure.GPIO_Speed = GPIO_Speed_50MHz;
+  GPIO_InitStructure.GPIO_Mode = GPIO_Mode_Out_PP;
+  GPIO_Init(GPIOC, &GPIO_InitStructure);
+#endif
+}
+
+void spi1_irq_handler(void) {
+  uint8_t foo = SPI_I2S_ReceiveData(SPI1);
+  static uint8_t cnt = 0;
+  SPI_I2S_SendData(SPI1, cnt);
+  cnt++;
+  LED_TOGGLE(1);
+}
+
+void spi1_dma_irq_handler(void) {
+  
+}