修复运动数据配速BUG

diff --git a/code/sdk/drivers/peripheral/cywee/src/main_dml.c b/code/sdk/drivers/peripheral/cywee/src/main_dml.c
index 2aa8450..9ae8281 100644 (file)
--- a/code/sdk/drivers/peripheral/cywee/src/main_dml.c
+++ b/code/sdk/drivers/peripheral/cywee/src/main_dml.c
@@ -692,12 +692,12 @@ void CWM_AP_SensorListen(pSensorEVT_t sensorEVT) {
 
         if(get_acc_swtich)
         {
-            if(num_falg==25)
+            if(num_falg==GSENSON_MSG_COUNT)
             {
                 left_falg++;
                 right_falg++;
-                right_falg=right_falg%25;
-                left_falg=left_falg%25;
+                right_falg=right_falg%GSENSON_MSG_COUNT;
+                left_falg=left_falg%GSENSON_MSG_COUNT;
                 gxyz_t_queue[right_falg].x= sensorEVT->fData[0];
                 gxyz_t_queue[right_falg].y= sensorEVT->fData[1];
                 gxyz_t_queue[right_falg].z= sensorEVT->fData[2];
@@ -706,7 +706,7 @@ void CWM_AP_SensorListen(pSensorEVT_t sensorEVT) {
             {
                 //left_falg++;
                 right_falg++;
-                right_falg=right_falg%25;
+                right_falg=right_falg%GSENSON_MSG_COUNT ;
                 //left_falg=left_falg%16;
                 num_falg++;
                 gxyz_t_queue[right_falg].x= sensorEVT->fData[0];
@@ -922,7 +922,7 @@ void CWM_AP_SensorListen(pSensorEVT_t sensorEVT) {
                 c_activity_result_extre_info_t.avg_step_len = (float)sensorEVT->fData[2];
                 c_activity_result_extre_info_t.avg_pace = (int)(sensorEVT->fData[3] * 60);
                 c_activity_result_extre_info_t.max_step_freq = (int)sensorEVT->fData[4];
-                c_activity_result_extre_info_t.avg_pace = (int)(sensorEVT->fData[5] * 60);
+                c_activity_result_extre_info_t.max_pace = (int)(sensorEVT->fData[5] * 60);
                 c_activity_result_extre_info_t.activity_zone = (int)sensorEVT->fData[10];
                 c_activity_result_extre_info_t.ativity_zone_moderate_duration = (int)sensorEVT->fData[11];
                 c_activity_result_extre_info_t.ativity_zone_high_duration = (int)sensorEVT->fData[12];
@@ -1042,7 +1042,7 @@ struct AccelerationData {
     float acc_y;
     float acc_z;
 };
-struct AccelerationData rawdata[25];  //自定义buffer，用来缓存sensor数据
+struct AccelerationData rawdata[GSENSON_MSG_COUNT];  //自定义buffer，用来缓存sensor数据
 int AccdataCount = 0;                          //fifo长度
 
 void CWM_AP_dmlSensorDataOutput_listen(const dml_sensorData_t * pSdo) 
@@ -1066,12 +1066,12 @@ void CWM_AP_dmlSensorDataOutput_listen(const dml_sensorData_t * pSdo)
 
         if(get_acc_swtich)
         {
-            if(num_falg==25)
+            if(num_falg==GSENSON_MSG_COUNT)
             {
                 left_falg++;
                 right_falg++;
-                right_falg=right_falg%25;
-                left_falg=left_falg%25;
+                right_falg=right_falg%GSENSON_MSG_COUNT;
+                left_falg=left_falg%GSENSON_MSG_COUNT;
                 gxyz_t_queue[right_falg].x= pSdo->acc_data[0];
                 gxyz_t_queue[right_falg].y= pSdo->acc_data[1];
                 gxyz_t_queue[right_falg].z= pSdo->acc_data[2];
@@ -1080,7 +1080,7 @@ void CWM_AP_dmlSensorDataOutput_listen(const dml_sensorData_t * pSdo)
             {
                 //left_falg++;
                 right_falg++;
-                right_falg=right_falg%25;
+                right_falg=right_falg%GSENSON_MSG_COUNT;
                 //left_falg=left_falg%16;
                 num_falg++;
                 gxyz_t_queue[right_falg].x= pSdo->acc_data[0];
@@ -1092,7 +1092,7 @@ void CWM_AP_dmlSensorDataOutput_listen(const dml_sensorData_t * pSdo)
         } 
 
         AccdataCount++;
-        AccdataCount = AccdataCount % 25;
+        AccdataCount = AccdataCount % GSENSON_MSG_COUNT;
     }                     
 }
 
@@ -1281,7 +1281,7 @@ int cywee_main_dml(void)
 #else
     scl.iData[3] = 2;
     scl.iData[4] = 1; //1 anytime 2 fifo
-    scl.iData[6] = 25; //fifocount 先設定5    [1~25]
+    scl.iData[6] = GSENSON_MSG_COUNT; //fifocount 先設定5    [1~25]
     scl.iData[8] = 26; // for st sensor(52Hz)
 
     scl.iData[11] = 4; // G_INT_1