Diff: xbee/xbee_lib.cpp

Revision:

1:3a46d2725374

Parent:

0:84a3b029656e

--- a/xbee/xbee_lib.cpp	Sat Apr 14 03:53:45 2012 +0000
+++ b/xbee/xbee_lib.cpp	Sun Apr 15 10:49:08 2012 +0000
@@ -11,19 +11,36 @@
 ZBRxResponse zbRx = ZBRxResponse();
 
 extern PrefServer pref;
+extern PrefSender spref;
+extern PrefReciever rpref;
 
 void xbeeInit(void)
 {
+
+    pref.xbeeAdress = kMyXBeeAddress;
+    spref.xbeeAdress = kLedSender;
+    rpref.xbeeAdress = kLedReciever;
+
+#ifdef _SERVER_TEST_MODE_
+return;
+#else
+
     LPC_UART1->MCR |= (1<<7); // CTSEN
     LPC_PINCON->PINSEL1 &= ~(3 << 2);
     LPC_PINCON->PINSEL1 |= (1 << 2); // UART CTS
     xbee.begin(kXBeeBoudRate);
-    pref.xbeeAdress = kMyXBeeAddress;
+    
+
+    
     pc.printf("XBee setup OK!  XBee serial boudrate:%d address:%04X\r\n",kXBeeBoudRate,pref.xbeeAdress);
+#endif
 }
 
 void xbeeSend(uint32_t addr , Payload *_payload)
 {
+#ifdef _SERVER_TEST_MODE_
+return;
+#else
     ledXBeeTx();
     
     XBeeAddress64 deviceAdr = XBeeAddress64(0x0013a200, addr);
@@ -38,16 +55,22 @@
     ZBTxRequest zbTx = ZBTxRequest(deviceAdr , tmp , length );
     
     xbee.send(zbTx);
-    DBGF("+++++ xbee send!!\r\n");
-    
- 
+    DBGF("+++++ xbee send!!\r\n");  
+#endif 
 }
 
 void xbeeReadPacket(void)
 {
+#ifndef _SERVER_TEST_MODE_
     xbee.readPacket();
+#endif
+    
 }
 bool isXbeeAvaiable(void)
 {
+#ifdef _SERVER_TEST_MODE_
+return false;
+#else
    return xbee.getResponse().isAvailable();
+#endif
 }
\ No newline at end of file