Diff: main.cpp

Revision:

1:36eb173eb52b

Parent:

0:42adca80439c

Child:

2:dec6319cf02c

diff -r 42adca80439c -r 36eb173eb52b main.cpp
--- a/main.cpp	Thu Mar 22 12:40:48 2012 +0000
+++ b/main.cpp	Sun Apr 15 13:09:53 2012 +0000
@@ -1,40 +1,54 @@
 #include "mbed.h"
 
+Serial pc(USBTX, USBRX);
+
 #include "config.h"
 #include "layer_frame.h"
-
-
-
+#include "leds.h"
 #include "serialRecieve.h"
 
 DigitalIn din(p20);
-extern bool isSend;
+
 extern Payload sendedPayload;
-extern bool isSendContinueous;
-extern bool isSendContinued;
 
 volatile uint16_t count;
+volatile PrefSender spref;
 
 int main(){
     
-    din.mode(PullUp);
-    initCarrierWave(); 
+    serialInit();
+    
+    #ifdef _SERVER_TEST_MODE_
+    pc.printf("*.*.*.*.*.*.*.   T E S T  M O D E *.*.*.*.*.*.*.*.*.*.\n");  
+    #endif
     
-    wait(3);
-    serialInit();
-
+    pc.printf("sender start\n");
+    din.mode(PullUp);
+    
+    spref.currentFrameNumber = 0;
+    spref.gainData.gain = kTxGain;
+    spref.gainData.middleLevel = kTxMidLevel;
+    spref.lightsw = 1;
+    spref.continueusMode = 0;
+    spref.isSend = 0;
+    spref.xbeeAdress = 0;
     
     Payload test;
     initTestPayloadData(&test);
-      
+    
+    initCarrierWave(); 
     
+    startLed();
+
     while(1){
     
         readProcess();
 
         
-        if(isSendContinueous) sendPayload(&sendedPayload);
-        else if(!din) sendPayload(&test); 
+        if(spref.continueusMode == 1) sendPayload(&sendedPayload);
+
+        else if(!din) sendPayload(&test);
+
         else sendByteData(0x00);