Revision 83:4ce3433ac3fa, committed 2016-01-20

Comitter:

ee12b079

Date:

Wed Jan 20 14:28:43 2016 +0000

Parent:

82:c55f29ad4240

Commit message:

modified adf...

Changed in this revision

--- a/DefinitionsAndGlobals.h	Tue Jan 19 11:06:00 2016 +0000
+++ b/DefinitionsAndGlobals.h	Wed Jan 20 14:28:43 2016 +0000
@@ -1,6 +1,6 @@
 // **************DEFINITIONS*********************
 
-#define bypass_adf 0
+#define bypass_adf 1
 
 // COM_RX
     #define RX_TIMEOUT_LIMIT 0.5

--- a/adf.h	Tue Jan 19 11:06:00 2016 +0000
+++ b/adf.h	Wed Jan 20 14:28:43 2016 +0000
@@ -109,11 +109,11 @@
         else{\
             hardware_reset(0);\
             hw_reset_err_cnt++;\
-            gPC.puts("Resetting hardware\r\n");\
+            /*gPC.puts("Resetting hardware\r\n");*/\
         }\
     }\
     if( flag == false ){\
-        gPC.puts("Seems to be SPI problem\r\n");\
+        /*gPC.puts("Seems to be SPI problem\r\n");*/\
     }\
     assrt_phy_off(tempReturn);\
     if(!bbram_flag){\
@@ -232,7 +232,7 @@
     buffer_state = !buffer_state;\
     if(last_buffer){\
         finish_write_data = true;\
-        gPC.puts("adf_off\r\n");\
+        /*gPC.puts("adf_off\r\n");*/\
     }\
 }
  
@@ -286,49 +286,50 @@
     
     
 #define adf_SND_SDCard {\
+    buffer_state = true;\
+    last_buffer = false;\
+    loop_on = true;\
+    ADF_off = false;\
     sent_tmfrom_SDcard = true;\
-    configure_adf;\
     signal = COM_MNG_TMTC_SIGNAL_ADF_SD;\
+    start_block_num = starting_add;\
+    end_block_num = ending_add;\
+    initial_adf_check;\
+    initiate;\
     send_data;\
     while(loop_on){\
         /*led2=!led2;*/\
-        /*gCOM_MNG_TMTC_THREAD->signal_wait(COM_MNG_TMTC_SIGNAL_ADF_SD);*/\
-        wait_ms(COM_TX_TICKER_LIMIT);\
-        if(IRQ){\
-            if(finish_write_data){\
-                if(ADF_off){\
-                    SPI_mutex.lock();\ 
-                    gCS_ADF=0;\
-                    spi.write(0xB1);\
-                    gCS_ADF=1;\
-                    SPI_mutex.unlock();\
-                    loop_on = false;\
-                    gPC.puts("Transmission done\r\n");\
-                }\
-                else{\
-                    ADF_off = true;\
-                }\
-            }else{\   
-                write_data;\
-                send_tm_from_SD_card();\
-            }\
+        gCOM_MNG_TMTC_THREAD->signal_wait(COM_MNG_TMTC_SIGNAL_ADF_SD);\
+        if(ADF_off){\
+            SPI_mutex.lock();\
+            /*ticker.detach();*/\
+            gCS_ADF=0;\
+            spi.write(0xB1);\
+            gCS_ADF=1;\
+            SPI_mutex.unlock();\
+            /*gPC.puts("transmission done\r\n");*/\
+            loop_on = false;\
+        }else{\
+            write_data;\
+            if(!last_buffer)\
+            send_tm_from_SD_card();\
         }\
     }\
 }
     
-//void read_TC(Base_tc* TC_ptr){
-//    gPC.puts("Inside sd card sending\r\n");
-//    unsigned char service_subtype = 0;
-//    uint64_t starting_add  = 0, ending_add = 0;
-//    service_subtype = (TC_ptr->TC_string[2])&0x0f;
-//    starting_add =  (TC_ptr->TC_string[5]) +  ( (TC_ptr->TC_string[4])<<8 ) + ( (TC_ptr->TC_string[3]) <<16);
-//    ending_add =  (TC_ptr->TC_string[8]) +  ( (TC_ptr->TC_string[7])<<8 ) + ( (TC_ptr->TC_string[6]) <<16);
-//    starting_add = 10; // for now
-//    ending_add = 20;
-////    adf_SND_SDCard(starting_add , ending_add);
-//    gPC.puts("sending from sd card\r\n");
-//    adf_SND_SDCard;
-//}
+/*void read_TC(Base_tc* TC_ptr){
+    //gPC.puts("Inside sd card sending\r\n");
+    unsigned char service_subtype = 0;
+    uint64_t starting_add  = 0, ending_add = 0;
+    service_subtype = (TC_ptr->TC_string[2])&0x0f;
+    starting_add =  (TC_ptr->TC_string[5]) +  ( (TC_ptr->TC_string[4])<<8 ) + ( (TC_ptr->TC_string[3]) <<16);
+    ending_add =  (TC_ptr->TC_string[8]) +  ( (TC_ptr->TC_string[7])<<8 ) + ( (TC_ptr->TC_string[6]) <<16);
+    starting_add = 10; // for now
+    ending_add = 20;
+//    adf_SND_SDCard(starting_add , ending_add);
+    //gPC.puts("sending from sd card\r\n");
+    adf_SND_SDCard;
+}*/
  
 #define configure_adf {\
     finish_write_data = false;\
@@ -337,9 +338,9 @@
     loop_on = true;\
     ADF_off = false;\
     initial_adf_check;\
-    gPC.puts("initial adf check\r\n");\
+    /*gPC.puts("initial adf check\r\n");*/\
     initiate;\
-    gPC.puts("adf configured\r\n");\
+    /*gPC.puts("adf configured\r\n");*/\
     gLEDR = !gLEDR;\
 }
  
@@ -350,7 +351,7 @@
     send_data;\
     while(loop_on){\
         wait_ms(COM_TX_TICKER_LIMIT);\
-        if(IRQ){\
+        if(IRQ || bypass_adf){\
             if(finish_write_data){\
                 if(ADF_off){\
                     SPI_mutex.lock();\ 
@@ -359,7 +360,7 @@
                     gCS_ADF=1;\
                     SPI_mutex.unlock();\
                     loop_on = false;\
-                    gPC.puts("Transmission done\r\n");\
+                    /*gPC.puts("Transmission done\r\n");*/\
                 }\
                 else{\
                     ADF_off = true;\
@@ -370,5 +371,5 @@
             }\
         }\
     }\
-    gPC.puts("after while loop\r\n");\
+    /*gPC.puts("after while loop\r\n");*/\
 }
\ No newline at end of file