Revision 105:5ce0337e7c15, committed 2016-01-29

Comitter:

shreeshas95

Date:

Fri Jan 29 19:27:28 2016 +0000

Parent:

104:a50ae79ca36e

Child:

106:cd10ac5ad10e

Child:

108:2efd0974d40b

Child:

113:b8991d9e3b6c

Commit message:

Changed pins from the last version

Changed in this revision

--- a/CDMS_HK.h	Fri Jan 29 17:50:20 2016 +0000
+++ b/CDMS_HK.h	Fri Jan 29 19:27:28 2016 +0000
@@ -25,8 +25,8 @@
     hk_cdms.printf(" \r\nCDMS HK entered Verify COM RX RSSI >0.4 \r\n");
    
     int HK_I2C;
-    char BAE_HK[73];
-    FCTN_I2C_READ(BAE_HK,73);
+    char BAE_HK[74];
+    FCTN_I2C_READ(BAE_HK,74);
     printf("BAE_HK=%s",BAE_HK);
     /*if(HK_I2C==0)
     {
@@ -78,10 +78,10 @@
         {
             printf("%d",data[i]);
         }
-        uint8_t fsc=FCTN_SD_MNGR(0x3);
-        printf("FSC where SD is written is %d\r\n",fsc);
-        int a=SD_WRITE(data,0x00000012,0x3);
-        printf("Result of writing is %d \r\n",a);
+        //uint8_t fsc=FCTN_SD_MNGR(0x3);
+        //printf("FSC where SD is written is %d\r\n",fsc);
+        //int a=SD_WRITE(data,0x00000012,0x3);
+        //printf("Result of writing is %d \r\n",a);
         //BCN long frame ???
         //CDMS_HK_STATUS=(CDMS_HK_STATUS)&(~(HK_MAIN_STATUS));
         hk_cdms.printf("CDMS executed succesfully\r\n");

--- a/i2c.h	Fri Jan 29 17:50:20 2016 +0000
+++ b/i2c.h	Fri Jan 29 19:27:28 2016 +0000
@@ -2,8 +2,10 @@
 #define tc_len 135
 #define tc_test_len 135
 
-DigitalOut irpt_2_slv(PIN67);                                        //I2C interrupt to CDMS
-I2C master(PIN32,PIN31);
+InterruptIn irpt_4m_slv(D3);                                      //I2c interrupt from CDMS
+DigitalOut irpt_2_slv(D4);                                        //I2C interrupt to CDMS
+//I2C master(PIN32,PIN31);
+I2C master(PTC9,PTC8);
 //DigitalOut led1(PIN46);
 //DigitalOut led2(PIN95);
 const int addr = 0x20;                                            //slave address 

--- a/main.cpp	Fri Jan 29 17:50:20 2016 +0000
+++ b/main.cpp	Fri Jan 29 19:27:28 2016 +0000
@@ -27,7 +27,7 @@
 #include "Compression.h"
 #include "ThreadsAndFunctions.h"
 
-void set_sig(){gSCIENCE_THREAD->signal_set(SCIENCE_SIGNAL);}
+//void set_sig(){gSCIENCE_THREAD->signal_set(SCIENCE_SIGNAL);}
 int main()
 {
     #if DEBUG
@@ -59,7 +59,7 @@
     gCS_ADF = 1;
     
     //FCTN_CDMS_INIT_RTC();/* rtc initialization*/
-    FCTN_CDMS_SD_INIT();/* sd card initialization*/
+//    FCTN_CDMS_SD_INIT();/* sd card initialization*/
     
     // initialise_card();
     // int result= initialise_card();
@@ -76,9 +76,9 @@
     #if DEBUG
     gPC.puts("allocating threads\r\n");
     #endif
-    gSCIENCE_THREAD = new Thread(SCIENCE_FUN);
+//    gSCIENCE_THREAD = new Thread(SCIENCE_FUN);
    // gPC.puts("step one complete\r\n");
-    gSCIENCE_THREAD->set_priority(osPriorityBelowNormal);
+//    gSCIENCE_THREAD->set_priority(osPriorityBelowNormal);
     #if DEBUG
     gPC.puts("competed allocating threads\r\n");
     #endif
@@ -86,10 +86,10 @@
     // *******************INITIALISATIONS END********************
     
     RtosTimer gCDMS_HK_TIMER(FCTN_CDMS_HK_MAIN, osTimerPeriodic);
-    gCDMS_HK_TIMER.start(30000);
+    gCDMS_HK_TIMER.start(5000);
     
     /*starting the thread with signal*/
-    set_sig();
+//    set_sig();
     
     /*Calculating Stack used*/