Diff: adf.h

Revision:

340:d05e7b4b6690

Parent:

338:d63eb331a67d

--- a/adf.h	Sat Jan 07 00:40:47 2017 +0000
+++ b/adf.h	Sat Jan 07 01:35:54 2017 +0000
@@ -11,7 +11,7 @@
 bool buffer_state;
 bool finish_write_data;
 uint8_t signal = 0x00;
-unsigned char bbram_buffer[66]={0x19,0x00,0x60,0x00,0x00,0x00,0x00,0x00,0x00,0x33,0x00,0xFB,0xC2,0x10,0xC0,0x00,0x30,0x31,0x07,0x00,0x01,0x00,/*PA Level Byte*/0x57/*PA Parameters*/,0x08/*GMSK_modulation*/,0x0B,0x37,0x00,0x00,0x40,0x0C,0x00,0x05,0x00,0x00,0x18,0x12,0x34,0x56,0x20,0x10,0xC4,0x14,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x70,0xE0,0x00,0x10,0x04,0x00,0x00,0x00,0x00,0x00};
+unsigned char bbram_buffer[66]={0x19,0x00,0x60,0x00,0x00,0x00,0x00,0x00,0x00,0x33,0x00,0xF4,0xC2,0x10,0xC0,0x00,0x30,0x31,0x07,0x00,0x01,0x00,/*PA Level Byte*/0x57/*PA Parameters*/,0x00,0x0B,0x37,0x00,0x00,0x40,0x0C,0x00,0x05,0x00,0x00,0x18,0x12,0x34,0x56,0x20,0x10,0xC4,0x14,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x70,0xE0,0x00,0x10,0x04,0x00,0x00,0x00,0x00,0x00};
 bool data_irq_err=0;
 bool data_err= false;
 unsigned char temp_byte=0x00;
@@ -249,7 +249,9 @@
                 spi.write(0x59);
                 spi.write(0x08);
                 gCS_ADF=1;
-
+                uint16_t sum_temp = 0;
+                for(int i =0; i< 10;i++)
+                {
                 gCS_ADF=0;
                 spi.write(0x3B);
                 spi.write(0x27);
@@ -268,28 +270,14 @@
                 spi.write(0xFF);
                 secondbyte = spi.write(0xFF);
                 gCS_ADF=1;
-                
-                COM_ADF_TMP = firstbyte & 0x03;
-                COM_ADF_TMP |= secondbyte & 0xfc;
-                COM_ADF_TMP = 0.9474*(COM_ADF_TMP - 28) +28.2;
-                
-                gPC.printf("\n\rCOM_ADF_TMP : %d \n",COM_ADF_TMP);
-                /*uint8_t txcurr = (3.3*COM_TX_OC_FAULT)/(0.05)*100;*///    ID_current
-                
-                
-                
+                COM_ADF_TMP = firstbyte<<6;
+                COM_ADF_TMP += secondbyte;
+                COM_ADF_TMP = (COM_ADF_TMP/1.83) - 118.43 + temp_correction_value;
+                sum_temp+=COM_ADF_TMP;
+                }
+                COM_ADF_TMP = sum_temp/10;
+                uint8_t txcurr = (3.3*COM_TX_OC_FAULT)/(0.05)*100;
     }
-    
-void get_com_oc_sw_status()
-{
-    COM_OC_SET = 1;
-    if (COM_TX_OC_FAULT){\
-         com_oc_sw_status = 0x1;\
-    }\
-    else{\
-        com_oc_sw_status = 0;\
-    }\
-} 
 
 bool hardware_reset(int bcn_call)
 {
@@ -473,7 +461,6 @@
     check_status;\
     /*gPC.printf("I 0x%X\r\n",(int)status);*/\
     if(IRQ){\
-        get_com_oc_sw_status();\
         /*gPC.printf("det\r\n");*/\
         if(!ADF_off) {\
             if(finish_write_data || restart_adf_flag) {\