Diff: main.cpp

Revision:

23:c3f25b511448

Parent:

22:7edae38d0758

Parent:

21:04fae6a95131

Child:

24:29ec42daa82e

--- a/main.cpp	Mon Oct 02 16:02:27 2017 +0000
+++ b/main.cpp	Mon Oct 02 16:59:26 2017 +0000
@@ -73,17 +73,15 @@
         if (finished_packet)
         {
             
-            process_frame(&current_frame);
-            
-            
+            process_frame(&current_frame);            
             //remote_at_command_query('N', 'D', 0x02);
         }
         
-        set_remote_xbee_dio4(toggle_led);
+        //set_remote_xbee_dio4(toggle_led);
         toggle_led = !toggle_led;
 
         loop_led = !loop_led;
-        wait(1);
+        wait_ms(10);
     }
 }
 #else
@@ -96,14 +94,27 @@
     DECLARE_ADDR64_COORD
     DECLARE_ADDR16_UNKNOWN_OR_BCAST
 
+    DigitalOut led_3(LED3);
+    led_3 = 1;
     while(1)
     {
-        SENSOR accel = (*p[0])();
-        
-        sprintf(sensor_buffer, "%3.2f%3.2f%3.2f", accel.Accelerometre.x, accel.Accelerometre.y, accel.Accelerometre.z);
-
-        transmit_request(sensor_buffer, 15, 0, USE_ADDR64_COORD, USE_ADDR16_UNKNOWN_OR_BCAST);
-        
+        for (int i = 0; i < 2; i++)
+        {
+            sensor_t sensor = (*p[i])();
+            
+            if (sensor.sensor_type == 1)
+            {
+                sprintf(sensor_buffer, "button::%u\n\r", sensor.sensor_result.Bouton.etat != 0 ? 1 : 0);
+                transmit_request(sensor_buffer, 8 + 1 + 2, 0, USE_ADDR64_COORD, USE_ADDR16_UNKNOWN_OR_BCAST);  
+                led_3 = !led_3;
+            }
+            else if (sensor.sensor_type == 2)
+            {
+                sprintf(sensor_buffer, "accel::%3.2f%3.2f%3.2f\n\r", sensor.sensor_result.Accelerometre.x, 
+                                        sensor.sensor_result.Accelerometre.y, sensor.sensor_result.Accelerometre.z);
+                transmit_request(sensor_buffer, 7 + 15 + 2, 0, USE_ADDR64_COORD, USE_ADDR16_UNKNOWN_OR_BCAST);
+            }
+        }        
         loop_led = !loop_led;
         wait(config.refresh_freq);
     }