Diff: adf.h

Revision:

354:0da912441c7b

Parent:

342:77b0d59897f7

--- a/adf.h	Tue Feb 21 06:30:56 2017 +0000
+++ b/adf.h	Sat Mar 11 04:46:31 2017 +0000
@@ -29,7 +29,7 @@
 bool power_reset_flag=false;
 unsigned int power_reset_count=0;
 bool Configuration_done=false;
-#define HW_THRS 2
+#define HW_THRS 5    //-mah
 bool hw_reset_flag = false;
 uint8_t firstbyte;
 uint8_t secondbyte;
@@ -64,8 +64,8 @@
 #define BUSY 0x00
 //===================================================
 
-#define POWER_RESET_THRS 2
-#define HW_RESET_THRS 2
+#define POWER_RESET_THRS 5
+#define HW_RESET_THRS 5
 
 unsigned int Adf_data_counter=0;
 unsigned char status =0;
@@ -90,7 +90,7 @@
 buffer_state = true;\
 loop_on = true;\
 ADF_off = false;\
-/*sent_tmfrom_SDcard = false;*/\
+sent_tmfrom_SDcard = false;\
 Adf_data_counter=0;\
 status =0;\
 cmd_err_cnt=0;\
@@ -503,7 +503,9 @@
             T.stop();\
             T.reset();\
             loop_on=false;\
-            if(restart_adf_flag)\
+            break;\
+            /*if(restart_adf_flag)*/\
+            if(0)\
             {\
                 restart_adf_flag=false;\
                 ADF_off=false;\
@@ -521,7 +523,7 @@
                 gPC.printf("Data_error_detected");\
                 T.stop();\
                 T.reset();\
-                }\        
+                }\
         }\
 }
 
@@ -661,9 +663,16 @@
     initial_adf_check;\
     gPC.puts("Config_part done\r\n");\
 }
- 
+//obsrs_flag must be put high in obsrs 
+bool retransmit = true;
+bool configure = true;
 void transmit_adf(){
-while(power_reset_count<POWER_RESET_THRS){ 
+    configure =true;
+    
+while(retransmit||configure){
+    configure =0;
+    retransmit=0;
+while(power_reset_count<POWER_RESET_THRS){     
     restart_adf_flag=false;
     bool tx_err=false;
     configure_adf;
@@ -672,7 +681,8 @@
         gCS_ADF=0;
         spi.write(0x1B);
         spi.write(0x07);
-        spi.write(0x35);
+   //     spi.write(0x35);
+    spi.write(0x36);
         gCS_ADF=1;
     CMD(CMD_PHY_TX);
     wait_us(2000);
@@ -693,7 +703,13 @@
         break;
     }
     gPC.puts("after while looprn");
+    
 }
+if(restart_adf_flag){
+        retransmit=true;
+        restart_adf_flag=false;
+        }
 }
 
+}
 #endif
\ No newline at end of file