Merge #162 into xts_origin from refs/changes/162/head

修改gsensor为定时器模式，优化cywee运动模式与静态模式消息发送

* refs/changes/162/head: (1 commits squashed)

  - 修改gsensor为定时器模式，优化cywee运动模式与静态模式消息发送

Signed-off-by: aliyun6865282430 <1624952103@qq.com>
Reviewed-by: snickersun@163.com <accounts_62b90f7fcf51ade33b6f628e@mail.teambition.com>
Merged-by: snickersun@163.com <accounts_62b90f7fcf51ade33b6f628e@mail.teambition.com>
link: https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230/change/162

diff --git a/code/sdk/application/wearable/service/broadcast/include/broadcast_feature.h b/code/sdk/application/wearable/service/broadcast/include/broadcast_feature.h
index 20a2c9f..434fced 100755 (executable)
--- a/code/sdk/application/wearable/service/broadcast/include/broadcast_feature.h
+++ b/code/sdk/application/wearable/service/broadcast/include/broadcast_feature.h
@@ -37,6 +37,7 @@ typedef enum {
     TOPIC_EVENT_NEXTDAY_UPDATE,
     TOPIC_EVENT_WEARSTATE_UPDATE,
     TOPIC_EVENT_STEPDATA_UPDATE,
+    TOPIC_EVENT_AR_ALERT_TYPE_UPDATE,
     TOPIC_EVENT_SHUTDOWN,
     TOPIC_EVENT_HEARTRATE_UPDATA,
     TOPIC_EVENT_HFP_INCOMMING,

diff --git a/code/sdk/application/wearable/service/broadcast/src/broadcast_implement.c b/code/sdk/application/wearable/service/broadcast/src/broadcast_implement.c
index 65ccaf1..2c88897 100755 (executable)
--- a/code/sdk/application/wearable/service/broadcast/src/broadcast_implement.c
+++ b/code/sdk/application/wearable/service/broadcast/src/broadcast_implement.c
@@ -24,6 +24,7 @@ static const TopicToCore topicToCoreArray[] = {
     {TOPIC_EVENT_NEXTDAY_UPDATE, A_CORE_MASK, 1},
     {TOPIC_EVENT_WEARSTATE_UPDATE, A_CORE_MASK, 1},
     {TOPIC_EVENT_STEPDATA_UPDATE, A_CORE_MASK, 1},
+    {TOPIC_EVENT_AR_ALERT_TYPE_UPDATE, A_CORE_MASK, 1},
     {TOPIC_EVENT_SHUTDOWN, A_CORE_MASK, 1},
     {TOPIC_EVENT_HEARTRATE_UPDATA, A_CORE_MASK, 1},
 #ifdef CYWEE_SPORT    

diff --git a/code/sdk/drivers/boards/brandy_evb/board_config/board_evb.h b/code/sdk/drivers/boards/brandy_evb/board_config/board_evb.h
index 81a6405..e585505 100755 (executable)
--- a/code/sdk/drivers/boards/brandy_evb/board_config/board_evb.h
+++ b/code/sdk/drivers/boards/brandy_evb/board_config/board_evb.h
@@ -172,7 +172,7 @@ const hal_pio_config_t g_pio_function_config[PIN_MAX_NUMBER] = {
     
     { HAL_PIO_FUNC_GPIO, HAL_PIO_DRIVE_MAX, HAL_PIO_PULL_DOWN, HAL_PIO_IE_DISABLE },    // S_AGPIO_L17 HX3507_INT   not use
     { HAL_PIO_FUNC_GPIO, HAL_PIO_DRIVE_MAX, HAL_PIO_PULL_DOWN, HAL_PIO_IE_DISABLE },    // S_AGPIO_L18  VDDEN  //暂时无用，采用VDDIO 默认开启 EXt V3.0 EXt V1.8
-    { HAL_PIO_FUNC_GPIO, HAL_PIO_DRIVE_MAX, HAL_PIO_PULL_DOWN, HAL_PIO_IE_ENBALE },  // S_AGPIO_L19  G_INT2  //暂时不用 
+    { HAL_PIO_FUNC_GPIO, HAL_PIO_DRIVE_MAX, HAL_PIO_PULL_DOWN, HAL_PIO_IE_DISABLE },  // S_AGPIO_L19  G_INT2  //暂时不用 
 
     { HAL_PIO_FUNC_GPIO, HAL_PIO_DRIVE_MAX, HAL_PIO_PULL_MAX, HAL_PIO_IE_DISABLE }, // S_AGPIO_L20  0.2C_CHRG
     { HAL_PIO_FUNC_GPIO, HAL_PIO_DRIVE_MAX, HAL_PIO_PULL_MAX, HAL_PIO_IE_DISABLE },    // S_AGPIO_L21  NTC_VDD_ON 给低打开 NTC上拉电源
@@ -291,9 +291,8 @@ const hal_gpio_config_t g_gpio_function_config[PIN_MAX_NUMBER] = {
 
 #ifdef ENABLE_CYWEE
     /**G sensor G_INT1 S_AGPIO_L11 G_INT2 S_AGPIO_L19*/
-    //{   S_AGPIO_L11, HAL_GPIO_DIRECTION_INPUT, HAL_GPIO_LEVEL_LOW, GPIO_INTERRUPT_RISING_EDGE, cywee_int_callback },
-    {   S_AGPIO_L19, HAL_GPIO_DIRECTION_INPUT, NULL, GPIO_INTERRUPT_DEDGE, cywee_int_callback },
-    // {   S_AGPIO_L19, HAL_GPIO_DIRECTION_INPUT, HAL_GPIO_LEVEL_LOW, 0, NULL },
+    //{   S_AGPIO_L11, HAL_GPIO_DIRECTION_INPUT, NULL, GPIO_INTERRUPT_DEDGE, cywee_int_callback },
+    //{   S_AGPIO_L19, HAL_GPIO_DIRECTION_INPUT, NULL, GPIO_INTERRUPT_DEDGE, cywee_int_callback },
 #endif   
     /**S_AGPIO_R1 GPO alipay默认resetpin*/
     {   S_AGPIO_R1, HAL_GPIO_DIRECTION_OUTPUT, HAL_GPIO_LEVEL_HIGH, 0, NULL },

diff --git a/code/sdk/drivers/peripheral/cywee/Inc/cywee_hal.h b/code/sdk/drivers/peripheral/cywee/Inc/cywee_hal.h
index f5b11ab..7df0ead 100644 (file)
--- a/code/sdk/drivers/peripheral/cywee/Inc/cywee_hal.h
+++ b/code/sdk/drivers/peripheral/cywee/Inc/cywee_hal.h
@@ -445,25 +445,20 @@ typedef struct
     int steps;
     int distance;
     int calories;
-    int duration;
     int step_frequency;
     int step_length;
     int pace;
-    int BMR_calories;
-    int is_pause;
     int avg_step_freq;
     int avg_step_len;
     int avg_pace;
     int max_step_freq;
     int max_pace;
-    int ar_alert_type;
-    int MHR_zone;
     int hrs;
 }cywee_activity_result_t;
 
 typedef struct 
 {
-    int inactivity_mode;
+    int output_number;
     int sedentary_status;
     int sleep_status;
     int nap_status;
@@ -508,7 +503,6 @@ void cyw_inactivity_mode_change(int mode);
 void cyw_activity_mode_change(int mode);
 void cywee_hand_updown_switch(int cmd);
 void cywee_ar_alert_switch(int cmd);
-
 extern uint8_t hrs_mode_state;
 
 #pragma pack()

diff --git a/code/sdk/drivers/peripheral/cywee/service/cywee_service.c b/code/sdk/drivers/peripheral/cywee/service/cywee_service.c
index 1ac1f72..629a025 100644 (file)
--- a/code/sdk/drivers/peripheral/cywee/service/cywee_service.c
+++ b/code/sdk/drivers/peripheral/cywee/service/cywee_service.c
@@ -47,7 +47,7 @@ typedef struct
  * 其他cmd在Header里定义，对外开放
  */
 
-#define CYWEE_CHECK_MS 60000
+#define CYWEE_CHECK_MS 500
 
 osTimerId_t g_cywee_service_timer = NULL;
 static bool g_batter_service_initialled = false;
@@ -70,56 +70,48 @@ void cywee_msg_callback(uint8_t msg_type, uint8_t *msg_data, int32_t msg_datalen
         switch (c_activity_result_t.activity_mode)
         {
         case SPORT_ACTIVE_MODE_NORMAL:
-            PRINT("activit_mode[%d], steps[%d], distance[%d], calories[%d], step frequency[%d], step length[%d], pace[%d], BMR calories[%d], is_pause[%d], hrs[%d], len[%d]\n",
-                  c_activity_result_t.activity_mode, c_activity_result_t.steps, c_activity_result_t.distance, c_activity_result_t.calories, c_activity_result_t.step_frequency,
-                  c_activity_result_t.step_length, c_activity_result_t.pace, c_activity_result_t.BMR_calories, c_activity_result_t.is_pause, c_activity_result_t.hrs, sizeof(cywee_activity_result_t));
+            PRINT("activit_mode[%d], steps[%d], distance[%d], calories[%d], step frequency[%d], step length[%d], pace[%d],hrs[%d]\n",
+                  c_activity_result_t.activity_mode, c_activity_result_t.steps, c_activity_result_t.distance, c_activity_result_t.calories, 
+                  c_activity_result_t.step_frequency,c_activity_result_t.step_length, c_activity_result_t.pace,  c_activity_result_t.hrs);
             CustomEventPublish(TOPIC_EVENT_ACTIVITY_UPDATE, &c_activity_result_t, sizeof(cywee_activity_result_t));
             break;
         case SPORT_ACTIVE_MODE_TREADMILL:
             PRINT("CYWEE_MSG_TYPE_TREADMILL_UPDATE\r\n");
             memcpy(&c_activity_result_t, msg_data, sizeof(cywee_activity_result_t));
-            PRINT("activit_mode[%d], steps[%d], distance[%d], calories[%d], step frequency[%d], step length[%d], pace[%d], BMR calories[%d], is_pause[%d],len[%d]\n",
-                  c_activity_result_t.activity_mode, c_activity_result_t.steps, c_activity_result_t.distance, c_activity_result_t.calories, c_activity_result_t.step_frequency,
-                  c_activity_result_t.step_length, c_activity_result_t.pace, c_activity_result_t.BMR_calories, c_activity_result_t.is_pause, sizeof(cywee_activity_result_t));
+            PRINT("activit_mode[%d], steps[%d], distance[%d], calories[%d], step frequency[%d], step length[%d], pace[%d],hrs[%d]\n",
+                  c_activity_result_t.activity_mode, c_activity_result_t.steps, c_activity_result_t.distance, c_activity_result_t.calories, 
+                  c_activity_result_t.step_frequency,c_activity_result_t.step_length, c_activity_result_t.pace, c_activity_result_t.hrs);
             CustomEventPublish(TOPIC_EVENT_ACTIVITY_UPDATE, &c_activity_result_t, sizeof(cywee_activity_result_t));
             break;
         case SPORT_ACTIVE_MODE_OUTDOOR_RUNNING:
+            PRINT("CYWEE_MSG_TYPE_OUTDOOR_RUNNING_UPDATE\r\n");
             memcpy(&c_activity_result_t, msg_data, sizeof(cywee_activity_result_t));
-            PRINT("activit_mode[%d], steps[%d], distance[%d], calories[%d], step frequency[%d], step length[%d], pace[%d], BMR calories[%d], is_pause[%d], hrs[%d], len[%d]\n",
-                  c_activity_result_t.activity_mode, c_activity_result_t.steps, c_activity_result_t.distance, c_activity_result_t.calories, c_activity_result_t.step_frequency,
-                  c_activity_result_t.step_length, c_activity_result_t.pace, c_activity_result_t.BMR_calories, c_activity_result_t.is_pause, c_activity_result_t.hrs, sizeof(cywee_activity_result_t));
+            PRINT("activit_mode[%d], steps[%d], distance[%d], calories[%d], step frequency[%d], step length[%d], pace[%d],hrs[%d]\n",
+                  c_activity_result_t.activity_mode, c_activity_result_t.steps, c_activity_result_t.distance, c_activity_result_t.calories, 
+                  c_activity_result_t.step_frequency,c_activity_result_t.step_length, c_activity_result_t.pace, c_activity_result_t.hrs);
             CustomEventPublish(TOPIC_EVENT_ACTIVITY_UPDATE, &c_activity_result_t, sizeof(cywee_activity_result_t));
             break;
         case SPORT_ACTIVE_MODE_INDOOR_RUNNING:
             PRINT("CYWEE_MSG_TYPE_INDOOR_RUNNING_UPDATE\r\n");
             memcpy(&c_activity_result_t, msg_data, sizeof(cywee_activity_result_t));
-            PRINT("activit_mode[%d], steps[%d], distance[%d], calories[%d], step frequency[%d], step length[%d], pace[%d], BMR calories[%d], is_pause[%d],len[%d]\n",
-                  c_activity_result_t.activity_mode, c_activity_result_t.steps, c_activity_result_t.distance, c_activity_result_t.calories, c_activity_result_t.step_frequency,
-                  c_activity_result_t.step_length, c_activity_result_t.pace, c_activity_result_t.BMR_calories, c_activity_result_t.is_pause, sizeof(cywee_activity_result_t));
+            PRINT("activit_mode[%d], steps[%d], distance[%d], calories[%d], step frequency[%d], step length[%d], pace[%d],hrs[%d]\n",
+                  c_activity_result_t.activity_mode, c_activity_result_t.steps, c_activity_result_t.distance, c_activity_result_t.calories, 
+                  c_activity_result_t.step_frequency,c_activity_result_t.step_length, c_activity_result_t.pace, c_activity_result_t.hrs);
             CustomEventPublish(TOPIC_EVENT_ACTIVITY_UPDATE, &c_activity_result_t, sizeof(cywee_activity_result_t));
             break;
         case SPORT_ACTIVE_MODE_FITNESS_PEDOMETERR:
             PRINT("CYWEE_MSG_TYPE_FITNESS_PEDOMETERR_UPDATE\r\n");
             memcpy(&c_activity_result_t, msg_data, sizeof(cywee_activity_result_t));
-            PRINT("activit_mode[%d], steps[%d], distance[%d], calories[%d], step frequency[%d], step length[%d], pace[%d], BMR calories[%d], is_pause[%d],len[%d]\n",
-                  c_activity_result_t.activity_mode, c_activity_result_t.steps, c_activity_result_t.distance, c_activity_result_t.calories, c_activity_result_t.step_frequency,
-                  c_activity_result_t.step_length, c_activity_result_t.pace, c_activity_result_t.BMR_calories, c_activity_result_t.is_pause, sizeof(cywee_activity_result_t));
+            PRINT("activit_mode[%d], steps[%d], distance[%d], calories[%d], step frequency[%d], step length[%d], pace[%d],hrs[%d]\n",
+                  c_activity_result_t.activity_mode, c_activity_result_t.steps, c_activity_result_t.distance, c_activity_result_t.calories, 
+                  c_activity_result_t.step_frequency,c_activity_result_t.step_length, c_activity_result_t.pace, c_activity_result_t.hrs);
             CustomEventPublish(TOPIC_EVENT_ACTIVITY_UPDATE, &c_activity_result_t, sizeof(cywee_activity_result_t));
             break;
         case SPORT_ACTIVE_MODE_FREE_TRAINING:
             PRINT("CYWEE_MSG_TYPE_FREE_TRAINING_UPDATE\r\n");
             memcpy(&c_activity_result_t, msg_data, sizeof(cywee_activity_result_t));
-            PRINT("activit_mode[%d], calories[%d], duration[%d], MHR_zone[%d],len[%d]\n",
-                  c_activity_result_t.activity_mode, c_activity_result_t.calories, c_activity_result_t.duration, c_activity_result_t.MHR_zone, sizeof(cywee_activity_result_t));
-            CustomEventPublish(TOPIC_EVENT_ACTIVITY_UPDATE, &c_activity_result_t, sizeof(cywee_activity_result_t));
-            break;
-
-        // 长时间动作侦测
-        case SPORT_ACTIVE_MODE_AR_ALERT:
-            PRINT("CYWEE_MSG_TYPE_AR_ALERT_UPDATE\r\n");
-            memcpy(&c_activity_result_t, msg_data, sizeof(cywee_activity_result_t));
-            PRINT("activit_mode[%d], ar alert type[%d], len[%d]\n",
-                  c_activity_result_t.activity_mode, c_activity_result_t.ar_alert_type, sizeof(cywee_activity_result_t));
+            PRINT("activit_mode[%d], calories[%d], duration[%d], MHR_zone[%d],hrs[%d]\n",
+                  c_activity_result_t.activity_mode, c_activity_result_t.calories, c_activity_result_t.hrs);
             CustomEventPublish(TOPIC_EVENT_ACTIVITY_UPDATE, &c_activity_result_t, sizeof(cywee_activity_result_t));
             break;
 
@@ -127,8 +119,8 @@ void cywee_msg_callback(uint8_t msg_type, uint8_t *msg_data, int32_t msg_datalen
         case SPORT_ACTIVE_MODE_EXTRA_INFO:
             PRINT("CYWEE_MSG_TYPE_EXTRA_INFO_UPDATE\r\n");
             memcpy(&c_activity_result_t, msg_data, sizeof(cywee_activity_result_t));
-            PRINT("average step frequency[%d], average step length[%d], average pace[%d], max step frequency[%d], max pace[%d], len[%d]\n",
-                  c_activity_result_t.avg_step_freq, c_activity_result_t.avg_step_len, c_activity_result_t.avg_pace, c_activity_result_t.max_step_freq, c_activity_result_t.max_pace, sizeof(cywee_activity_result_t));
+            PRINT("average step frequency[%d], average step length[%d], average pace[%d], max step frequency[%d], max pace[%d]\n",
+                  c_activity_result_t.avg_step_freq, c_activity_result_t.avg_step_len, c_activity_result_t.avg_pace, c_activity_result_t.max_step_freq, c_activity_result_t.max_pace);
             CustomEventPublish(TOPIC_EVENT_ACTIVITY_UPDATE, &c_activity_result_t, sizeof(cywee_activity_result_t));
             break;
         default:
@@ -138,22 +130,21 @@ void cywee_msg_callback(uint8_t msg_type, uint8_t *msg_data, int32_t msg_datalen
     else if (msg_type == CYWEE_MSG_TYPE_INACTIVITY_UPDATE)
     {
         memcpy(&c_inactivity_result_t, msg_data, sizeof(cywee_inactivity_result_t));
-        switch (c_inactivity_result_t.inactivity_mode)
+        switch (c_inactivity_result_t.output_number)
         {
         // 久坐
         case INACTIVITY_MODE_SEDENTARY_OUTPUT:
             memcpy(&c_inactivity_result_t, msg_data, sizeof(cywee_inactivity_result_t));
-            PRINT("inactivity_mode_number[%d], sedentary status[%d], stand freq[%d], len[%d]\n",
-                  c_inactivity_result_t.inactivity_mode, c_inactivity_result_t.sedentary_status,
-                  c_inactivity_result_t.stand_freq, sizeof(cywee_inactivity_result_t));
+            PRINT("sedentary status[%d], stand freq[%d]\n",
+                  c_inactivity_result_t.sedentary_status,c_inactivity_result_t.stand_freq);
             CustomEventPublish(TOPIC_EVENT_INACTIVITY_UPDATE, &c_activity_result_t, sizeof(cywee_activity_result_t));
             break;
 
         // 睡眠
         case INACTIVITY_MODE_SLEEPING_OUTPUT:
             memcpy(&c_inactivity_result_t, msg_data, sizeof(cywee_inactivity_result_t));
-            PRINT("inactivity_mode_number[%d], sleep status[%d], month[%d], day[%d], hour[%d], min[%d], len[%d]\n",
-                  c_inactivity_result_t.inactivity_mode, c_inactivity_result_t.sleep_status,
+            PRINT("sleep status[%d], month[%d], day[%d], hour[%d], min[%d]\n",
+                  c_inactivity_result_t.sleep_status,
                   c_inactivity_result_t.month, c_inactivity_result_t.day,
                   c_inactivity_result_t.hour, c_inactivity_result_t.minute,
                   sizeof(cywee_inactivity_result_t));
@@ -163,29 +154,29 @@ void cywee_msg_callback(uint8_t msg_type, uint8_t *msg_data, int32_t msg_datalen
         // 睡眠累计
         case INACTIVITY_MODE_SLEEPING_ACCUMULATE_TIME_OUTPUT:
             memcpy(&c_inactivity_result_t, msg_data, sizeof(cywee_inactivity_result_t));
-            PRINT("inactivity_mode_number[%d], total sleep time[%d], total nap time[%d], total deep sleep time[%d], total wake time[%d], total rem sleep time[%d], len[%d]\n",
-                  c_inactivity_result_t.inactivity_mode, c_inactivity_result_t.total_sleep_time, c_inactivity_result_t.total_mild_sleep_time,
-                  c_inactivity_result_t.total_deep_sleep_time, c_inactivity_result_t.total_wake_time, c_inactivity_result_t.total_rem_sleep_time,
-                  c_inactivity_result_t.stand_freq, sizeof(cywee_inactivity_result_t));
+            PRINT("total sleep time[%d], total nap time[%d], total deep sleep time[%d], total wake time[%d], total rem sleep time[%d]\n",
+                  c_inactivity_result_t.total_sleep_time, c_inactivity_result_t.total_mild_sleep_time,
+                  c_inactivity_result_t.total_deep_sleep_time, c_inactivity_result_t.total_wake_time, 
+                  c_inactivity_result_t.total_rem_sleep_time,c_inactivity_result_t.stand_freq);
             CustomEventPublish(TOPIC_EVENT_INACTIVITY_UPDATE, &c_activity_result_t, sizeof(cywee_activity_result_t));
             break;
 
         // 小睡
         case INACTIVITY_MODE_NAP_OUTPUT:
             memcpy(&c_inactivity_result_t, msg_data, sizeof(cywee_inactivity_result_t));
-            PRINT("inactivity_mode_number[%d], nap status[%d], month[%d], day[%d], hour[%d], min[%d], len[%d]\n",
-                  c_inactivity_result_t.inactivity_mode, c_inactivity_result_t.nap_status, c_inactivity_result_t.month,
-                  c_inactivity_result_t.day, c_inactivity_result_t.hour, c_inactivity_result_t.minute, sizeof(cywee_inactivity_result_t));
+            PRINT("nap status[%d], month[%d], day[%d], hour[%d], min[%d]\n",
+                  c_inactivity_result_t.nap_status, c_inactivity_result_t.month,
+                  c_inactivity_result_t.day, c_inactivity_result_t.hour, c_inactivity_result_t.minute);
             CustomEventPublish(TOPIC_EVENT_INACTIVITY_UPDATE, &c_activity_result_t, sizeof(cywee_activity_result_t));
             break;
 
         // 小睡累计
         case INACTIVITY_MODE_NAP_ACCUMULATE_TIME_OUTPUT:
             memcpy(&c_inactivity_result_t, msg_data, sizeof(cywee_inactivity_result_t));
-            PRINT("inactivity_mode_number[%d], total nap time[%d], total mild time[%d], total deep sleep time[%d], total wake time[%d], total rem sleep time[%d], len[%d]\n",
-                  c_inactivity_result_t.inactivity_mode, c_inactivity_result_t.total_nap_time, c_inactivity_result_t.total_mild_sleep_time,
-                  c_inactivity_result_t.total_deep_sleep_time, c_inactivity_result_t.total_wake_time, c_inactivity_result_t.total_rem_sleep_time,
-                  c_inactivity_result_t.stand_freq, sizeof(cywee_inactivity_result_t));
+            PRINT("total nap time[%d], total mild time[%d], total deep sleep time[%d], total wake time[%d], total rem sleep time[%d]\n",
+                  c_inactivity_result_t.total_nap_time, c_inactivity_result_t.total_mild_sleep_time,
+                  c_inactivity_result_t.total_deep_sleep_time, c_inactivity_result_t.total_wake_time, 
+                  c_inactivity_result_t.total_rem_sleep_time,c_inactivity_result_t.stand_freq);
             CustomEventPublish(TOPIC_EVENT_INACTIVITY_UPDATE, &c_activity_result_t, sizeof(cywee_activity_result_t));
             break;
         }
@@ -279,9 +270,9 @@ static void cywee_service_check_task(void const *arg)
         }
         else if (mail.cmd == CYWEE_SERVICE_CMD_START_CHECK)
         {
-            // cywee_service_running_stat = true;
+            cywee_service_running_stat = true;
             cywee_main_dml();
-            // cywee_service_timer_start_check(CYWEE_CHECK_MS);
+            cywee_service_timer_start_check(CYWEE_CHECK_MS);
         }
         else if (mail.cmd == CYWEE_SERVICE_CMD_STOP_CHECK)
         {

diff --git a/code/sdk/drivers/peripheral/cywee/src/main_dml.c b/code/sdk/drivers/peripheral/cywee/src/main_dml.c
index 900570e..b6c48a8 100644 (file)
--- a/code/sdk/drivers/peripheral/cywee/src/main_dml.c
+++ b/code/sdk/drivers/peripheral/cywee/src/main_dml.c
@@ -478,7 +478,7 @@ void CWM_AP_SensorListen(pSensorEVT_t sensorEVT) {
                                 (int)sensorEVT->fData[9],
                                 (int)sensorEVT->fData[10]);
                 memset(&c_inactivity_result_t,0,sizeof(cywee_inactivity_result_t));
-                c_inactivity_result_t.inactivity_mode = (int)sensorEVT->fData[15];
+                c_inactivity_result_t.output_number = (int)sensorEVT->fData[0];
                 c_inactivity_result_t.sedentary_status = (int)sensorEVT->fData[2];
                 c_inactivity_result_t.stand_freq = (int)sensorEVT->fData[3];
                 cywee_func(CYWEE_MSG_TYPE_INACTIVITY_UPDATE,&c_inactivity_result_t,sizeof(cywee_inactivity_result_t));
@@ -492,7 +492,7 @@ void CWM_AP_SensorListen(pSensorEVT_t sensorEVT) {
                                 (int)sensorEVT->fData[5],
                                 (int)sensorEVT->fData[6]);
                 memset(&c_inactivity_result_t,0,sizeof(cywee_inactivity_result_t));
-                c_inactivity_result_t.inactivity_mode = (int)sensorEVT->fData[15];
+                c_inactivity_result_t.output_number = (int)sensorEVT->fData[0];
                 c_inactivity_result_t.sleep_status = (int)sensorEVT->fData[2];
                 c_inactivity_result_t.month = (int)sensorEVT->fData[3];
                 c_inactivity_result_t.day = (int)sensorEVT->fData[4];
@@ -509,7 +509,7 @@ void CWM_AP_SensorListen(pSensorEVT_t sensorEVT) {
                                 (int)sensorEVT->fData[4],
                                 (int)sensorEVT->fData[5]);
                 memset(&c_inactivity_result_t,0,sizeof(cywee_inactivity_result_t));
-                c_inactivity_result_t.inactivity_mode = (int)sensorEVT->fData[15];
+                c_inactivity_result_t.output_number = (int)sensorEVT->fData[0];
                 c_inactivity_result_t.total_sleep_time = (int)sensorEVT->fData[1];
                 c_inactivity_result_t.total_mild_sleep_time = (int)sensorEVT->fData[2];
                 c_inactivity_result_t.total_deep_sleep_time = (int)sensorEVT->fData[3];
@@ -526,7 +526,7 @@ void CWM_AP_SensorListen(pSensorEVT_t sensorEVT) {
                                 (int)sensorEVT->fData[5],
                                 (int)sensorEVT->fData[6]);
                 memset(&c_inactivity_result_t,0,sizeof(cywee_inactivity_result_t));
-                c_inactivity_result_t.inactivity_mode = (int)sensorEVT->fData[15];
+                c_inactivity_result_t.output_number = (int)sensorEVT->fData[0];
                 c_inactivity_result_t.nap_status = (int)sensorEVT->fData[2];
                 c_inactivity_result_t.month = (int)sensorEVT->fData[3];
                 c_inactivity_result_t.day = (int)sensorEVT->fData[4];
@@ -543,7 +543,7 @@ void CWM_AP_SensorListen(pSensorEVT_t sensorEVT) {
                                 (int)sensorEVT->fData[4],
                                 (int)sensorEVT->fData[5]);
                 memset(&c_inactivity_result_t,0,sizeof(cywee_inactivity_result_t));
-                c_inactivity_result_t.inactivity_mode = (int)sensorEVT->fData[15];
+                c_inactivity_result_t.output_number = (int)sensorEVT->fData[0];
                 c_inactivity_result_t.total_nap_time = (int)sensorEVT->fData[1];
                 c_inactivity_result_t.total_mild_sleep_time = (int)sensorEVT->fData[2];
                 c_inactivity_result_t.total_deep_sleep_time = (int)sensorEVT->fData[3];
@@ -583,19 +583,14 @@ void CWM_AP_SensorListen(pSensorEVT_t sensorEVT) {
                 memset(&c_activity_result_t,0,sizeof(cywee_activity_result_t));
                 c_activity_result_t.activity_mode = (int)sensorEVT->fData[0];
                 c_activity_result_t.calories = (int)sensorEVT->fData[1];
-                c_activity_result_t.duration = (int)sensorEVT->fData[5];
-                c_activity_result_t.MHR_zone = (int)sensorEVT->fData[6];
                 c_activity_result_t.hrs = hrs;
                 cywee_func(CYWEE_MSG_TYPE_ACTIVITY_UPDATE,&c_activity_result_t,sizeof(cywee_activity_result_t));
 
             }else if((int)sensorEVT->fData[0] == 102)
             {
                 CWM_OS_dbgPrintf("ar alert type : %d\n",(int)sensorEVT->fData[1]);
-
-                memset(&c_activity_result_t,0,sizeof(cywee_activity_result_t));
-                c_activity_result_t.activity_mode = (int)sensorEVT->fData[0];
-                c_activity_result_t.ar_alert_type = (int)sensorEVT->fData[1];
-                cywee_func(CYWEE_MSG_TYPE_ACTIVITY_UPDATE,&c_activity_result_t,sizeof(cywee_activity_result_t));
+                int ar_alert_type = (int)sensorEVT->fData[1];
+                CustomEventPublish(TOPIC_EVENT_AR_ALERT_TYPE_UPDATE,&ar_alert_type,sizeof(int)); 
                 
             }else{
                  CWM_OS_dbgPrintf("activity_mode[%d], steps[%d], distance[%d], calories[%d], step frequency[%d], step length[%d], pace[%d], BMR calories[%d], is_pause[%d]\n",
@@ -617,8 +612,6 @@ void CWM_AP_SensorListen(pSensorEVT_t sensorEVT) {
                 c_activity_result_t.step_frequency = (int)sensorEVT->fData[5];
                 c_activity_result_t.step_length = (int)sensorEVT->fData[6];
                 c_activity_result_t.pace = (int)sensorEVT->fData[7];
-                c_activity_result_t.BMR_calories = (int)sensorEVT->fData[8];
-                c_activity_result_t.is_pause = (int)sensorEVT->fData[14];
                 c_activity_result_t.hrs = hrs;
                 cywee_func(CYWEE_MSG_TYPE_ACTIVITY_UPDATE,&c_activity_result_t,sizeof(cywee_activity_result_t));
 
@@ -788,19 +781,19 @@ int cywee_main_dml(void)
     memset(&scl, 0, sizeof(scl));
     scl.iData[0] = 1;
     scl.iData[7] = 5;  //轴向配置
-#if 0
+#if 1
     scl.iData[3] = 2;
     scl.iData[4] = 2; //1 anytime 2 fifo
-    scl.iData[6] = 5; //先設定5
-    scl.iData[8] = 52; // for st sensor(52Hz)
+    scl.iData[6] = 25; //先設定5
+    scl.iData[8] = 26; // for st sensor(52Hz)
 #else
     scl.iData[3] = 2;
     scl.iData[4] = 1; //1 anytime 2 fifo
     scl.iData[6] = 25; //fifocount 先設定5    [1~25]
     scl.iData[8] = 26; // for st sensor(52Hz)
 
-    //scl.iData[11] = 1; // G_INT_1
-    scl.iData[12] = 4; // G_INT_1
+    scl.iData[11] = 4; // G_INT_1
+    //scl.iData[12] = 4; // G_INT_1
 #endif
     CWM_SettingControl(SCL_DML_DRV_AG_CONFIG, &scl);
     //CWM_OS_dbgPrintf("[DBG] %s %d\n", __func__,__LINE__);

diff --git a/code/sdk/drivers/peripheral/ppg/ppgBleService/ppgBleService.c b/code/sdk/drivers/peripheral/ppg/ppgBleService/ppgBleService.c
index 7c15265..a3eee9a 100644 (file)
--- a/code/sdk/drivers/peripheral/ppg/ppgBleService/ppgBleService.c
+++ b/code/sdk/drivers/peripheral/ppg/ppgBleService/ppgBleService.c
@@ -119,8 +119,8 @@ errcode_t ble_ppgtest_server_send_input_report(const uint8_t *data, uint8_t len)
     }\r
     errcode_t ret = 0;\r
     ret = gatts_notify_indicate(g_ble_server_id, g_ble_conn_id, &param);\r
-    printf("ble_ppgtest_server_send_input_report: 0x%x g_ble_conn_id:%d g_ppgtest_notify_report_att_hdl:%d\r\n",\r
-            ret,g_ble_conn_id,g_ppgtest_notify_report_att_hdl);\r
+    //printf("ble_ppgtest_server_send_input_report: 0x%x g_ble_conn_id:%d g_ppgtest_notify_report_att_hdl:%d\r\n",\r
+    //        ret,g_ble_conn_id,g_ppgtest_notify_report_att_hdl);\r
     bt_os_free(param.value);\r
     return ERRCODE_BT_SUCCESS;\r
 }\r