paparazzi-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[paparazzi-commits] [4973] fixed volatile status


From: antoine drouin
Subject: [paparazzi-commits] [4973] fixed volatile status
Date: Thu, 17 Jun 2010 13:44:07 +0000

Revision: 4973
          http://svn.sv.gnu.org/viewvc/?view=rev&root=paparazzi&revision=4973
Author:   poine
Date:     2010-06-17 13:44:06 +0000 (Thu, 17 Jun 2010)
Log Message:
-----------
fixed volatile status

Modified Paths:
--------------
    paparazzi3/trunk/sw/airborne/lisa/arch/stm32/lisa_overo_link_arch.c
    paparazzi3/trunk/sw/airborne/lisa/lisa_overo_link.c
    paparazzi3/trunk/sw/airborne/lisa/lisa_overo_link.h
    paparazzi3/trunk/sw/airborne/lisa/stm_test_spi_link.c

Modified: paparazzi3/trunk/sw/airborne/lisa/arch/stm32/lisa_overo_link_arch.c
===================================================================
--- paparazzi3/trunk/sw/airborne/lisa/arch/stm32/lisa_overo_link_arch.c 
2010-06-17 11:09:48 UTC (rev 4972)
+++ paparazzi3/trunk/sw/airborne/lisa/arch/stm32/lisa_overo_link_arch.c 
2010-06-17 13:44:06 UTC (rev 4973)
@@ -92,11 +92,11 @@
 
 }
 
-
 void dma1_c2_irq_handler(void) {
 
   DMA_ITConfig(DMA1_Channel2, DMA_IT_TC, DISABLE);
 
   overo_link.status = DATA_AVAILABLE;
+
 }
 

Modified: paparazzi3/trunk/sw/airborne/lisa/lisa_overo_link.c
===================================================================
--- paparazzi3/trunk/sw/airborne/lisa/lisa_overo_link.c 2010-06-17 11:09:48 UTC 
(rev 4972)
+++ paparazzi3/trunk/sw/airborne/lisa/lisa_overo_link.c 2010-06-17 13:44:06 UTC 
(rev 4973)
@@ -3,7 +3,7 @@
 struct LisaOveroLink overo_link;
 
 void overo_link_init(void) {
-  overo_link.status = LOST;
+  overo_link.status = IDLE;
   overo_link_arch_init();
 }
 

Modified: paparazzi3/trunk/sw/airborne/lisa/lisa_overo_link.h
===================================================================
--- paparazzi3/trunk/sw/airborne/lisa/lisa_overo_link.h 2010-06-17 11:09:48 UTC 
(rev 4972)
+++ paparazzi3/trunk/sw/airborne/lisa/lisa_overo_link.h 2010-06-17 13:44:06 UTC 
(rev 4973)
@@ -10,7 +10,7 @@
 #define OVERO_LINK_TIMEOUT 10
 
 struct LisaOveroLink {
-  uint8_t status;
+  volatile uint8_t status;
   uint8_t msg_in[sizeof(union OVERO_LINK_MSG_UNION)];
   uint8_t msg_out[sizeof(union OVERO_LINK_MSG_UNION)];
   uint8_t timeout;

Modified: paparazzi3/trunk/sw/airborne/lisa/stm_test_spi_link.c
===================================================================
--- paparazzi3/trunk/sw/airborne/lisa/stm_test_spi_link.c       2010-06-17 
11:09:48 UTC (rev 4972)
+++ paparazzi3/trunk/sw/airborne/lisa/stm_test_spi_link.c       2010-06-17 
13:44:06 UTC (rev 4973)
@@ -43,12 +43,11 @@
   hw_init();
   sys_time_init();
   overo_link_init();
-  
-  while (1) {
 
+  while (1) {
     if (sys_time_periodic())
       main_periodic();
-  
+    main_event();
   }
   
   return 0;
@@ -56,23 +55,17 @@
 
 
 static inline void main_periodic( void ) {
-  //  LED_TOGGLE(1);
 
-  //  uart2_transmit('a');
-  //  uart2_transmit('b');
-  //  uart2_transmit('b');
-  //  uart2_transmit('\n');
-
   OveroLinkPeriodic(on_overo_link_lost);
 
+  RunOnceEvery(10,{ LED_PERIODIC();});
+
 }
 
 static inline void main_event( void ) {
+
   OveroLinkEvent(on_overo_msg_received);
-  // send previously received msg
-  memcpy(overo_link.msg_out, &my_msg, sizeof(my_msg));
-  // store newly received message
-  memcpy(&my_msg, overo_link.msg_in, sizeof(my_msg));
+
 }
 
 
@@ -82,5 +75,6 @@
 
 static inline void on_overo_msg_received(void) {
 
+  memcpy(overo_link.msg_out, overo_link.msg_in, sizeof(struct 
AutopilotMessageFoo));
 
 }




reply via email to

[Prev in Thread] Current Thread [Next in Thread]