samp Srinivasan / Mbed 2 deprecated CDMS_CODE_samp_22Nov16

publishing to check changes in cdms code

Dependencies:   FreescaleIAP SimpleDMA mbed-rtos mbed

Fork of CDMS_CODE_samp_23SEP_DMA_flag by samp Srinivasan

Files at this revision

API Documentation at this revision

Revision 308:af5ab655ba00, committed 2016-11-22

Comitter:
samp1234
Date:
Tue Nov 22 07:57:22 2016 +0000
Parent:
307:6ed5535ac465
Child:
309:91755ef8f22a
Commit message:
23sep_sdcard

Changed in this revision

CDMS_HK.h Show annotated file Show diff for this revision Revisions of this file
DefinitionsAndGlobals.h Show annotated file Show diff for this revision Revisions of this file
ThreadsAndFunctions.h Show annotated file Show diff for this revision Revisions of this file
main.cpp Show annotated file Show diff for this revision Revisions of this file 
--- a/CDMS_HK.h	Tue Nov 01 07:18:59 2016 +0000
+++ b/CDMS_HK.h	Tue Nov 22 07:57:22 2016 +0000
@@ -270,6 +270,8 @@
         for (int i = 4; i < 16; ++i) {
             min_max_data.temp_min[i] = saveMin(min_max_data.temp_min[i],quant_data.temp_quant[i]);
             min_max_data.temp_max[i] = saveMax(min_max_data.temp_max[i],quant_data.temp_quant[i]);
+    //        gPC.printf("\Max reading, iteration = %d, %d \n",min_max_data.temp_max[i], i);
+     //       gPC.printf("\Min reading, iteration = %d, %d \n",min_max_data.temp_min[i], i);
         }
 
         min_max_data.CDMS_temp_min = saveMin(min_max_data.CDMS_temp_min,quant_data.CDMS_temp_quant);
@@ -316,13 +318,17 @@
          //   gPC.printf("\rVoltage reading, iteration = %f, %d \n",actual_data.temp_actual[Iteration], Iteration);
           //  wait_ms(1);
         }
-        else if(Iteration<14){
-            resistance=24300*actual_data.temp_actual[Iteration]*3.3/(3.3-actual_data.temp_actual[Iteration]*3.3);
+        else if(Iteration<14)
+           {
+            resistance=24000*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);
+                
+                actual_data.temp_actual[Iteration]=(3694/log(24.032242*resistance))-273;  
             else
-                actual_data.temp_actual[Iteration]=3365.4/log(7.60573*resistance/10);
+                
+                actual_data.temp_actual[Iteration]=(3365.4/log(7.60573*resistance))-273;
+                 
         }
         else
             actual_data.temp_actual[Iteration]=(-90.7*3.3*actual_data.temp_actual[Iteration])+190.1543;
@@ -333,8 +339,10 @@
             quant_data.temp_quant[Iteration]=actual_data.temp_actual[Iteration] * 10;
         else if(Iteration<14)
             quant_data.temp_quant[Iteration]=quantiz(tstart_thermistor,tstep_thermistor,actual_data.temp_actual[Iteration]);
+          // quant_data.temp_quant[Iteration]=quantiz(0,1,actual_data.temp_actual[Iteration]);
         else
-            quant_data.temp_quant[Iteration]=quantiz(tstart,tstep,actual_data.temp_actual[Iteration]);
+           // quant_data.temp_quant[Iteration]=quantiz(tstart,tstep,actual_data.temp_actual[Iteration]);
+           quant_data.temp_quant[Iteration]=quantiz(tstart,tstep,actual_data.temp_actual[Iteration]);
     }
     quant_data.CDMS_temp_quant=quantiz(tstart,tstep,actual_data.CDMS_temp_actual);
 
@@ -357,6 +365,7 @@
     GPIO_STATUS=(COM_TX_OC_FAULT)?(GPIO_STATUS)|((uint16_t)(0x1<<10)):(GPIO_STATUS)&(~((uint16_t)(0x1<<10)));
     //BAE_OC_FAULT //$
     GPIO_STATUS=(BAE_OC_FAULT)?(GPIO_STATUS)|((uint16_t)(0x1<<9)):(GPIO_STATUS)&(~((uint16_t)(0x1<<9)));
+  
     //PL_GPIO_1_STATUS //$
     GPIO_STATUS=(PL_GPIO_1_STATUS)?(GPIO_STATUS)|((uint16_t)(0x1<<8)):(GPIO_STATUS)&(~((uint16_t)(0x1<<8)));
     //PL_GPIO_2_STATUS //$
@@ -372,6 +381,7 @@
     //EPS_V_D_EN_STATUS
     GPIO_STATUS=(COM_TX_CNTRL)?(GPIO_STATUS)|((uint16_t)(0x1<<2)):(GPIO_STATUS)&(~((uint16_t)(0x1<<2)));
   //  gPC.printf("%04x\n",GPIO_STATUS);
+   gPC.printf("\rBAE_OC STATE = %04x \n",GPIO_STATUS);
 }
 
 void VERIFY_COMRX()

--- a/DefinitionsAndGlobals.h	Tue Nov 01 07:18:59 2016 +0000
+++ b/DefinitionsAndGlobals.h	Tue Nov 22 07:57:22 2016 +0000
@@ -209,7 +209,8 @@
 //COM_RX
 DigitalOut COM_RX_CNTRL(PIN72,1);
 DigitalOut COM_TX_CNTRL(PIN56,1);
-DigitalIn COM_TX_OC_FAULT(PIN69);
+//DigitalIn COM_TX_OC_FAULT(PIN69);
+DigitalIn COM_TX_OC_FAULT(PIN58);
 
 // TC LIST
 Base_tc* gHEAD_NODE_TCL = NULL;

--- a/ThreadsAndFunctions.h	Tue Nov 01 07:18:59 2016 +0000
+++ b/ThreadsAndFunctions.h	Tue Nov 22 07:57:22 2016 +0000
@@ -41,6 +41,7 @@
        // DMA_LED1 = !DMA_LED1; // added by samp
         
         srp(gPAYLOAD_BUFFER);//skip one apcket when cdms resets
+    
         /*else
         gPC.printf("\n\rDMA error");*/
         gMutex.unlock(); 

--- a/main.cpp	Tue Nov 01 07:18:59 2016 +0000
+++ b/main.cpp	Tue Nov 22 07:57:22 2016 +0000
@@ -59,7 +59,8 @@
     gRX_COUNT = 0;
     RX1M.attach(&rx_read, Serial::RxIrq);
     
-    gPC.baud(1200);//changed for bypassing COM
+   gPC.baud(1200);//changed for bypassing COM
+   
     
     //Base_tm *tm_ptr = NULL;
     //SET_BCN_STANDBY(tm_ptr);