Sfoglia il codice sorgente

2.3.0.28-soc数据读取测试

CHENJIE-PC\QiXiang_CHENJIE 3 anni fa
parent
commit
1e36025a26
4 ha cambiato i file con 14 aggiunte e 12 eliminazioni
  1. 1 1
      src/GpsTask.c
  2. 2 0
      src/MainTask.c
  3. 1 1
      src/bsp_custom.c
  4. 10 10
      src/sensor.c

+ 1 - 1
src/GpsTask.c

@@ -175,7 +175,7 @@ static void GpsTask(void* arg)
             xzyDataSend[0] = (xData[0] + xData[1] + xData[2])/3;
             xzyDataSend[1] = (yData[0] + yData[1] + yData[2])/3;
             xzyDataSend[2] = (zData[0] + zData[1] + zData[2])/3;
-            #ifdef USING_PRINTF1
+            #ifdef USING_PRINTF
                 printf("\n%d %d %d \r\n", xzyDataSend[0],xzyDataSend[1],xzyDataSend[2]);
             #endif
 

+ 2 - 0
src/MainTask.c

@@ -307,6 +307,8 @@ static void MainTask(void* arg)
                 slpManDeepSlpTimerStart(deepslpTimerID, AppNVMData.sleepTime*1000*60);
                 UINT8 sleeptime_count=0;
                 RxInterprut = 0;
+                Aoi1Event=0;
+                Aoi2Event=0;
                 while(1)
                 {
                     if(!slpManDeepSlpTimerIsRunning(deepslpTimerID))

+ 1 - 1
src/bsp_custom.c

@@ -297,7 +297,7 @@ void Pad4_WakeupIntHandler(void)
 {
     if(slpManExtIntPreProcess(PadWakeup4_IRQn)==false)
         return;
-    Aoi1Event = 2;
+    Aoi2Event = 1;
     // add custom code below //
     #ifdef USING_PRINTF1
         printf("[%d]PadWakeup3_IRQn\r\n",__LINE__);

+ 10 - 10
src/sensor.c

@@ -19,7 +19,7 @@ INT8  SL_SC7A20_BOOT(void)
 {
     UINT8 SL_Read_Reg=0xff;
     GSENSOR_ReadReg(SL_SC7A20_CTRL_REG5,1, &SL_Read_Reg);
-    SL_Read_Reg=SL_SC7A20_BOOT_ENABLE;//|SL_Read_Reg;
+    SL_Read_Reg=SL_SC7A20_MTP_ENABLE;//|SL_Read_Reg;
     GSENSOR_WriteReg(SL_SC7A20_CTRL_REG5, SL_Read_Reg);
     return  1;
 }
@@ -261,24 +261,24 @@ INT8  SL_SC7A20_INT_Config(void)
     UINT8 SL_Read_Reg;
 
     /*******************AOI1  IN  INT1********************/
-    SL_Read_Reg=0x08;//AOI1 LATCH
+    SL_Read_Reg=0x00;//AOI1 LATCH
     GSENSOR_WriteReg(SL_SC7A20_CTRL_REG5, SL_Read_Reg); 
     
-    SL_Read_Reg=SL_SC7A20_INT_ACTIVE_HIGH_LEVEL;
+    SL_Read_Reg=SL_SC7A20_INT_ACTIVE_LOWER_LEVEL;
     //interrupt happen,int pin output lower level
     GSENSOR_WriteReg(SL_SC7A20_CTRL_REG6, SL_Read_Reg);  
     
     //AOI1 CONFIG
     SL_Read_Reg=0x00;            //0x7F
-    SL_Read_Reg=SL_Read_Reg|0x40;//�����˶�ʶ��ģʽ
-    SL_Read_Reg=SL_Read_Reg|0x03;//X ��ߵ��¼� X�����ݵľ���ֵ������ֵ
-    SL_Read_Reg=SL_Read_Reg|0x0C;//Y ��ߵ��¼� Y�����ݵľ���ֵ������ֵ	
-    SL_Read_Reg=SL_Read_Reg|0x30;//Z ��ߵ��¼� Z�����ݵľ���ֵ������ֵ	
+    SL_Read_Reg=SL_Read_Reg|0x00;//�����˶�ʶ��ģʽ
+    SL_Read_Reg=SL_Read_Reg|0x02;//X ��ߵ��¼� X�����ݵľ���ֵ������ֵ
+    SL_Read_Reg=SL_Read_Reg|0x08;//Y ��ߵ��¼� Y�����ݵľ���ֵ������ֵ	
+    SL_Read_Reg=SL_Read_Reg|0x20;//Z ��ߵ��¼� Z�����ݵľ���ֵ������ֵ	
     GSENSOR_WriteReg(SL_SC7A20_INT1_CFG, SL_Read_Reg);    
 
     //HPF SET
   //  GSENSOR_ReadReg(SL_SC7A20_CTRL_REG2,1, &SL_Read_Reg); 
-    SL_Read_Reg=0x00;//SL_Read_Reg|0x81;//Normal HP , HPF TO AOI1 
+    SL_Read_Reg=0x81;//SL_Read_Reg|0x81;//Normal HP , HPF TO AOI1 
     GSENSOR_WriteReg(SL_SC7A20_CTRL_REG2, SL_Read_Reg);
     
     //�ж���ֵ����
@@ -499,7 +499,7 @@ void  SL_SC7A20_Reg_read_all(void)
 	UINT8 adr;
 	for(adr=0x20;adr<=0x3F;adr++){
 		GSENSOR_ReadReg(adr,1, &SL_Read_Reg);
-		printf("%#x = %#x\r\n",adr,SL_Read_Reg);	
+		printf("%#x = %#x, ",adr,SL_Read_Reg);	
 	}
     printf("SL_SC7A20_Reg_readall --------\r\n");	
 }
@@ -592,7 +592,7 @@ void GsensorInit(void)
 		SL_SC7A20_FS_Config(SL_SC7A20_FS_4G);
 		SL_SC7A20_INT_Config();
 		//SL_SC7A20_INT_RESET();
-		SL_SC7A20_Power_Config(SL_SC7A20_LOWER_POWER_ODR_400HZ);
+		SL_SC7A20_Power_Config(SL_SC7A20_ODR_400HZ);
 	}
 }
 #endif