Diff: main.cpp

Revision:

18:25e7644115f2

Parent:

17:f410d4327247

Child:

19:a4ce74cca3fa

--- a/main.cpp	Thu Jul 07 15:31:41 2016 +0000
+++ b/main.cpp	Fri Jul 08 06:07:14 2016 +0000
@@ -85,6 +85,15 @@
 
 
 #define reset_flags {\
+finish_write_data = false;\
+buffer_state = true;\
+last_buffer = false;\
+loop_on = true;\
+ADF_off = false;\
+buffer_state = true;
+loop_on = true;
+ADF_off = false;
+sent_tmfrom_SDcard = false;
 Adf_data_counter=0;\
 status =0;\
 cmd_err_cnt=0;\
@@ -333,44 +342,6 @@
 }
 //for reseting the transmission call assert function after b5 and b1. after b1 assert_phi_on and after b5 assert_phi_tx.
 //----------------------------------------------------------------------------
-/*
-# define initiate {\
-    gCS_ADF=0;\
-    spi.write(0xFF);\
-    spi.write(0xFF);\
-    gCS_ADF=1;\
-    gCS_ADF=0;\
-    spi.write(0x08);\
-    spi.write(0x14);\
-    spi.write(0xFF);\
-    gCS_ADF=1;\
-    gCS_ADF=0;\
-    spi.write(0x08);\
-    spi.write(0x15);\
-    spi.write(0xFF);\
-    gCS_ADF=1;\
-    gCS_ADF=0;\
-    spi.write(0x09);\
-    spi.write(0x24);\
-    spi.write(0x20);\
-    gCS_ADF=1;\
-    gCS_ADF=0;\
-    spi.write(0x09);\
-    spi.write(0x37);\
-    spi.write(0xE0);\
-    gCS_ADF=1;\
-    gCS_ADF=0;\
-    spi.write(0x09);\
-    spi.write(0x36);\
-    spi.write(0x70);\
-    gCS_ADF=1;\
-    gCS_ADF=0;\
-    spi.write(0x09);\
-    spi.write(0x39);\
-    spi.write(0x10);\
-    gCS_ADF=1;\
-}*/
-
 unsigned char temp;
 bool reg_err;
 int reg_err_cnt;
@@ -389,46 +360,6 @@
             reg_err=true;\
     gCS_ADF=1;\
 }\
-//========================================================
-/*# define initiate {\
-    gCS_ADF=0;\
-    spi.write(0xFF);\
-    spi.write(0xFF);\
-    gCS_ADF=1;\
-    gCS_ADF=0;\
-    spi.write(0x08);\
-    spi.write(0x14);\
-    spi.write(0xFF);\
-    gCS_ADF=1;\
-    gCS_ADF=0;\
-    spi.write(0x08);\
-    spi.write(0x15);\
-    spi.write(0xFF);\
-    gCS_ADF=1;\
-    gCS_ADF=0;\
-    spi.write(0x09);\
-    spi.write(0x24);\
-    spi.write(0x20);\
-    gCS_ADF=1;\
-    gCS_ADF=0;\
-    spi.write(0x09);\
-    spi.write(0x37);\
-    spi.write(0xE0);\
-    gCS_ADF=1;\
-    gCS_ADF=0;\
-    spi.write(0x09);\
-    spi.write(0x36);\
-    spi.write(0x70);\
-    gCS_ADF=1;\
-    gCS_ADF=0;\
-    spi.write(0x09);\
-    spi.write(0x39);\
-    spi.write(0x10);\
-    gCS_ADF=1;\
-}*/
-
-//========================================================
-
 
 #define initiate {\
     gCS_ADF=0;\
@@ -583,37 +514,6 @@
         }\
     }\
 }
-//==============================================================
-
-/*void check()
-{
-    check_status; //remove me
-    printf("I 0x%X\r\n",(int)status);//Remove me
-    if(IRQ) {
-        printf("det\r\n");
-        //  if(1){
-        if(!ADF_off) {
-            //        gCOM_MNG_TMTC_THREAD->signal_set(signal);
-            if(stop_transmission) {
-                write_data;
-                ADF_off=true;
-
-            } else {
-                write_data;
-                transmitdata();
-            }
-        } else {
-            wait_ms(20);
-//            ticker.detach();
-            gCS_ADF=0;
-            spi.write(0xB1);
-            gCS_ADF=1;
-            gPC.puts("transmission done\r\n");
-//            cout<<counter<<endl;
-            loop_on=false;
-        }
-    }
-}*/
 //=============NEW CHECK VAriables===================================================================
 bool data_irq_err=0;
 
@@ -655,94 +555,6 @@
         }\
 }
 
-
-
-//=================================================================================
-
-
-
-//bool bypass_adf = false;
-//================================================================================
-//void check(){
-//if(IRQ || bypass_adf){\
-//            if(finish_write_data){\
-//                if(ADF_off){\
-//                    SPI_mutex.lock();\
-//                    gCS_ADF=0;\
-//                    spi.write(0xB1);\
-//                    data_tx_success=true;\
-//                    gCS_ADF=1;\
-//                    SPI_mutex.unlock();\
-//                    loop_on = false;\
-//                    gPC.puts("Transmission done\r\n");\
-//                    gLEDR = 1;\
-//                }\
-//                else{\
-//                    ADF_off = true;\
-//                }\
-//            }else{\
-//                gLEDR = !gLEDR;\
-//                write_data;\
-//                if(sent_tmfrom_SDcard)\
-//                send_tm_from_SD_card_fun();\
-//                else snd_tm.transmit_data(buffer_112,&last_buffer);\
-//            }\
-//            T.reset();\
-//        }\
-//        else{\
-//            if(T.read_us()>98000){\
-//                data_irq_err=true;\
-//                CMD(CMD_PHY_ON);\
-//                break;\
-//                }\
-//            }\
-//    }
-//================================================================================/=
-//
-//#define send_data {\
-//    gCS_ADF=0;\
-//    spi.write(0xBB);\
-//    gCS_ADF=1;\
-//    gCS_ADF=0;\
-//    spi.write(0xFF);\
-//    spi.write(0xFF);\
-//    gCS_ADF=1;\
-//    if(sent_tmfrom_SDcard){\
-//        send_tm_from_SD_card();\
-//    }else{\
-//        transmitdata();\
-//    }\
-//    write_data;\
-//    if(sent_tmfrom_SDcard){\
-//        send_tm_from_SD_card();\
-//    }else{\
-//        transmitdata();\
-//    }\
-//    write_data;\
-//    if(sent_tmfrom_SDcard){\
-//        send_tm_from_SD_card();\
-//    }else{\
-//        transmitdata();\
-//    }\
-//    gCS_ADF=0;\
-//    spi.write(0xB1);\
-//    gCS_ADF=1;\
-//    wait_us(300);\
-//    gCS_ADF=0;\
-//    spi.write(0xFF);\
-//    spi.write(0xFF);\
-//    gCS_ADF=1;\
-//    gCS_ADF=0;\
-//    spi.write(0xB5);\
-//    gCS_ADF=1;\
-//    wait_us(300);\
-//    gCS_ADF=0;\
-//    spi.write(0xFF);\
-//    spi.write(0xFF);\
-//    gCS_ADF=1;\
-//    ticker.attach_us(&check,32000);\
-//}
-
 #define send_data {\
     gCS_ADF=0;\
     spi.write(0xBB);\
@@ -873,21 +685,8 @@
 
 void adf_not_SDcard()
 {
-    buffer_state = true;
-//   last_buffer = false;
-    loop_on = true;
-    ADF_off = false;
-    sent_tmfrom_SDcard = false;
-
-//   signal = COM_MNG_TMTC_SIGNAL_ADF_NSD;
     initial_adf_check;
-   // gPC.puts("initial adf check\r\n");
-//   initiate;
     gPC.puts("Config_part done\r\n");
-    send_data;
-    //  gPC.puts("Inside adf transmission\r\n");
-//    ADF_non_responsive_timeout.attach(&ADF_non_responsive_fun, 10);
-
 }
 int main()
 {
@@ -899,6 +698,7 @@
         data_length = sizeof(Adf_data);
 //        cout<<data_length<<endl;
         adf_not_SDcard();
+        send_data;
         CMD(CMD_PHY_TX);
         wait_us(2000);
         while(loop_on){