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 291:912da006918b, committed 2016-08-13

Comitter:
chaithanyarss
Date:
Sat Aug 13 12:14:09 2016 +0000
Parent:
290:3159ff1081a2
Commit message:
sat

Changed in this revision

CDMS_HK.h Show annotated file Show diff for this revision Revisions of this file 
--- a/CDMS_HK.h	Sun Aug 07 10:36:59 2016 +0000
+++ b/CDMS_HK.h	Sat Aug 13 12:14:09 2016 +0000
@@ -20,8 +20,14 @@
 
 DigitalOut SelectLinec3 (PIN79); // MSB of Select Lines
 DigitalOut SelectLinec2 (PIN78);
+DigitalOut SelectLinec1 (PIN76);
+DigitalOut SelectLinec0 (PIN77); // LSB of Select Lines
+
+/*
+Before SBC. To be restored in FM model
 DigitalOut SelectLinec1 (PIN77);
 DigitalOut SelectLinec0 (PIN76); // LSB of Select Lines
+*/
 
 Convolution CDMS_HEALTH;
 Convolution BAE_HEALTH;
@@ -280,6 +286,7 @@
     for(Iteration=0; Iteration<16; Iteration++) {
 
         actual_data.temp_actual[Iteration]=TempInput.read();
+        gPC.printf("\n\r%f",actual_data.temp_actual[Iteration]);
 
         SelectLinec0=!(SelectLinec0);
         if(Iteration%2==1)
@@ -294,10 +301,13 @@
 
     for(Iteration=0; Iteration<16; Iteration++) {
 
-        if(Iteration<14) {
-            actual_data.temp_actual[Iteration]=actual_data.temp_actual[Iteration]*3.3;
-            resistance=24000*actual_data.temp_actual[Iteration]/(3.3-actual_data.temp_actual[Iteration]);
-            
+        if(Iteration<4) {
+            actual_data.temp_actual[Iteration]=actual_data.temp_actual[Iteration]*3.3*20;
+            //gPC.printf("\n\r%f",actual_data.temp_actual[Iteration]);
+        }
+        else if(Iteration<14) {
+            actual_data.temp_actual[Iteration]=actual_data.temp_actual[Iteration]*3.3*20;
+            //resistance=24000*actual_data.temp_actual[Iteration]/(3.3-actual_data.temp_actual[Iteration]);  SBC uses 10K resistor for thermistor.
             if(actual_data.temp_actual[Iteration]>1.47) {
                 actual_data.temp_actual[Iteration]=3694/log(24.032242*resistance);
             } else {