Revision 310:bd591ef82b76, committed 2016-11-22

Comitter:

spacelab

Date:

Tue Nov 22 08:39:38 2016 +0000

Parent:

309:6ed5535ac465

Commit message:

Testing cdms_code

Changed in this revision

--- a/CDMS_HK.h	Tue Nov 01 07:18:59 2016 +0000
+++ b/CDMS_HK.h	Tue Nov 22 08:39:38 2016 +0000
@@ -319,10 +319,10 @@
         else if(Iteration<14){
             resistance=24300*actual_data.temp_actual[Iteration]*3.3/(3.3-actual_data.temp_actual[Iteration]*3.3);
            
-            if(actual_data.temp_actual[Iteration]*3.3<1.47)      //Document says 1.378 .Pls Check
-                actual_data.temp_actual[Iteration]=3694/log(24.032242*resistance/10);
+            if(actual_data.temp_actual[Iteration]*3.3>1.47)      //Document says 1.378 .Pls Check
+                actual_data.temp_actual[Iteration]=3694/log(24.032242*resistance);
             else
-                actual_data.temp_actual[Iteration]=3365.4/log(7.60573*resistance/10);
+                actual_data.temp_actual[Iteration]=3365.4/log(7.60573*resistance);
         }
         else
             actual_data.temp_actual[Iteration]=(-90.7*3.3*actual_data.temp_actual[Iteration])+190.1543;

--- a/ThreadsAndFunctions.h	Tue Nov 01 07:18:59 2016 +0000
+++ b/ThreadsAndFunctions.h	Tue Nov 22 08:39:38 2016 +0000
@@ -2,6 +2,7 @@
 //SPI ISR
 void payload_isr_fun(){
     gSCIENCE_THREAD->signal_set(SCIENCE_SIGNAL);
+    
 }
 
 void payload_isr_fun_dma(void const *args ){
@@ -14,8 +15,7 @@
     gPAY_SPI->format(8,0); 
     gPC.printf("\n\rTest...........................");
     gPAY_SPI->bulkRead_init(gPAYLOAD_BUFFER, PAYLOAD_BUFFER_LENGTH, &payload_isr_fun);
-    gPAY_SPI->bulkRead_start();
-    
+    gPAY_SPI->bulkRead_start();    
     //AY_SPI->bulkRead_pause();
     //AY_SPI->bulkRead_resume(&payload_isr_fun);
     while(true){
@@ -30,19 +30,20 @@
       //  srp(gPAYLOAD_BUFFER);//skip one apcket when cdms resets
         //gPC.puts("exit_srp\r\n");
         //wait(2);/*timeout to be decided*/
-        if(dma)
-        {
-            PL_RCV_SC_DATA_COUNTER++;
-            gPAY_SPI->bulkRead_start();
-            DMA_LED1 = !DMA_LED1; // added by samp
+        //if(dma)
+        //{
+        PL_RCV_SC_DATA_COUNTER++;
+        gPAY_SPI->bulkRead_start();
+         // added by samp
             //gPAY_SPI->bulkRead_pause();
             //gPAY_SPI->bulkRead_resume(&payload_isr_fun);
-        }
+        //}
        // DMA_LED1 = !DMA_LED1; // added by samp
         
         srp(gPAYLOAD_BUFFER);//skip one apcket when cdms resets
         /*else
         gPC.printf("\n\rDMA error");*/
+        DMA_LED1 = !DMA_LED1;
         gMutex.unlock(); 
     }
 }