解决运动模式不能切换的问题

diff --git a/code/sdk/drivers/peripheral/cywee/Inc/cywee_service.h b/code/sdk/drivers/peripheral/cywee/Inc/cywee_service.h
index b2b5c10..6f80326 100644 (file)
--- a/code/sdk/drivers/peripheral/cywee/Inc/cywee_service.h
+++ b/code/sdk/drivers/peripheral/cywee/Inc/cywee_service.h
@@ -2,7 +2,7 @@
  * @Author: penglei 1624952103@qq.com
  * @Date: 2024-03-26 20:29:58
  * @LastEditors: penglei 1624952103@qq.com
- * @LastEditTime: 2024-04-11 18:40:09
+ * @LastEditTime: 2024-04-11 19:01:22
  * @FilePath: /FD230/code/sdk/drivers/peripheral/cywee/Inc/cywee_service.h
  * @Description: 
  * 
@@ -43,9 +43,19 @@ extern "C" {
 #define CYWEE_SERVICE_CMD_STOP_CHECK 0x13
 #define CYWEE_SERVICE_CMD_TEST 0x14
 
-#define CYWEE_SERVICE_CMD_PAUSE 0x15
-#define CYWEE_SERVICE_CMD_RESUME 0x16
-#define CYWEE_SERVICE_CMD_EXIT 0x17
+
+#define CYWEE_SERVICE_CMD_NORMAL_MODE 0x15
+#define CYWEE_SERVICE_CMD_TREADMILL_MODE 0x16
+#define CYWEE_SERVICE_CMD_OUTDOOR_RUNNING_MODE 0x17
+#define CYWEE_SERVICE_CMD_INDOOR_RUNNING_MODE 0x18
+#define CYWEE_SERVICE_CMD_FITNESS_PEDOMETER_MODE 0x19
+#define CYWEE_SERVICE_CMD_FREE_TRAINING_MODE 0x1A
+#define CYWEE_SERVICE_CMD_AR_ALERT_MODE 0x1B
+
+#define CYWEE_SERVICE_CMD_PAUSE 0x1C
+#define CYWEE_SERVICE_CMD_RESUME 0x1D
+
+#define CYWEE_SERVICE_CMD_EXIT 0x1E
 
 errcode_t uapi_cywee_service_init(void);
 void uapi_cywee_service_deinit(void);

diff --git a/code/sdk/drivers/peripheral/cywee/service/cywee_at_cmd.c b/code/sdk/drivers/peripheral/cywee/service/cywee_at_cmd.c
index 11a2fa9..6e5de78 100644 (file)
--- a/code/sdk/drivers/peripheral/cywee/service/cywee_at_cmd.c
+++ b/code/sdk/drivers/peripheral/cywee/service/cywee_at_cmd.c
@@ -57,6 +57,7 @@ static uint32_t cywee_do_test(uint8_t *para, uint32_t paraLen, char *strCommonCm
         return ERRCODE_FAIL;
     }
     char *mode = (char*)argv[0];
+
     if (strcmp(mode, "start") == 0) {
         PRINT("cywee start\n");
         do_cywee_service_check_msg(CYWEE_SERVICE_CMD_START_CHECK);
@@ -68,29 +69,34 @@ static uint32_t cywee_do_test(uint8_t *para, uint32_t paraLen, char *strCommonCm
         do_cywee_service_check_msg(CYWEE_SERVICE_CMD_TEST);
     } else if (strcmp(mode, "normal") == 0) {
         PRINT("cywee normal mode\n");
-        do_cywee_service_check_msg(SPORT_ACTIVE_MODE_NORMAL);
+        do_cywee_service_check_msg(CYWEE_SERVICE_CMD_NORMAL_MODE);
     } else if (strcmp(mode, "treadmill") == 0) {
         PRINT("cywee treadmill mode\n");
-        do_cywee_service_check_msg(SPORT_ACTIVE_MODE_TREADMILL);
+        do_cywee_service_check_msg(CYWEE_SERVICE_CMD_TREADMILL_MODE);
     } else if (strcmp(mode, "outdoor") == 0) {
         PRINT("cywee outdoor running mode\n");
-        do_cywee_service_check_msg(SPORT_ACTIVE_MODE_OUTDOOR_RUNNING);
+        do_cywee_service_check_msg(CYWEE_SERVICE_CMD_OUTDOOR_RUNNING_MODE);
     } else if (strcmp(mode, "indoor") == 0) {
         PRINT("cywee indoor running mode\n");
-        do_cywee_service_check_msg(SPORT_ACTIVE_MODE_INDOOR_RUNNING);
+        do_cywee_service_check_msg(CYWEE_SERVICE_CMD_INDOOR_RUNNING_MODE);
     } else if (strcmp(mode, "pedometer") == 0) {
         PRINT("cywee fitness pedometer mode\n");
-        do_cywee_service_check_msg(SPORT_ACTIVE_MODE_FITNESS_PEDOMETERR);
+        do_cywee_service_check_msg(CYWEE_SERVICE_CMD_FITNESS_PEDOMETER_MODE);
     } else if (strcmp(mode, "free") == 0) {
         PRINT("cywee free training mode\n");
-        do_cywee_service_check_msg(SPORT_ACTIVE_MODE_FREE_TRAINING);
+        do_cywee_service_check_msg(CYWEE_SERVICE_CMD_FREE_TRAINING_MODE);
     } else if (strcmp(mode, "pause") == 0) {
         PRINT("cywee pause\n");
         do_cywee_service_check_msg(CYWEE_SERVICE_CMD_PAUSE);
     } else if (strcmp(mode, "resume") == 0) {
         PRINT("cywee resume\n");
         do_cywee_service_check_msg(CYWEE_SERVICE_CMD_RESUME);
+    } else if (strcmp(mode, "exit") == 0)
+    {
+        PRINT("cywee exit\n");
+        do_cywee_service_check_msg(CYWEE_SERVICE_CMD_EXIT);
     }
+    
     return ERRCODE_SUCC;
 }
 

diff --git a/code/sdk/drivers/peripheral/cywee/service/cywee_service.c b/code/sdk/drivers/peripheral/cywee/service/cywee_service.c
index e1b99f4..d0c4b0e 100644 (file)
--- a/code/sdk/drivers/peripheral/cywee/service/cywee_service.c
+++ b/code/sdk/drivers/peripheral/cywee/service/cywee_service.c
@@ -278,32 +278,31 @@ static void cywee_service_check_task(void const *arg)
             cywee_service_running_stat = false;
             if (g_cywee_service_timer != NULL) osTimerStop(g_cywee_service_timer);
         }
-        
-        else if (mail.cmd == SPORT_ACTIVE_MODE_NORMAL){
+        else if (mail.cmd == CYWEE_SERVICE_CMD_NORMAL_MODE){
             cywee_service_running_stat = true;
             cywee_main_dml(SPORT_ACTIVE_MODE_NORMAL);
             cywee_service_timer_start_check(CYWEE_CHECK_MS);
-        }else if(mail.cmd == SPORT_ACTIVE_MODE_TREADMILL){
+        }else if(mail.cmd == CYWEE_SERVICE_CMD_TREADMILL_MODE){
             cywee_service_running_stat = true;
             cywee_main_dml(SPORT_ACTIVE_MODE_TREADMILL);
             cywee_service_timer_start_check(CYWEE_CHECK_MS);
-        }else if(mail.cmd == SPORT_ACTIVE_MODE_OUTDOOR_RUNNING){
+        }else if(mail.cmd == CYWEE_SERVICE_CMD_OUTDOOR_RUNNING_MODE){
             cywee_service_running_stat = true;
             cywee_main_dml(SPORT_ACTIVE_MODE_OUTDOOR_RUNNING);
             cywee_service_timer_start_check(CYWEE_CHECK_MS);
-        }else if(mail.cmd == SPORT_ACTIVE_MODE_INDOOR_RUNNING){
+        }else if(mail.cmd == CYWEE_SERVICE_CMD_INDOOR_RUNNING_MODE){
             cywee_service_running_stat = true;
             cywee_main_dml(SPORT_ACTIVE_MODE_INDOOR_RUNNING);
             cywee_service_timer_start_check(CYWEE_CHECK_MS);
-        }else if(mail.cmd == SPORT_ACTIVE_MODE_FITNESS_PEDOMETERR){
+        }else if(mail.cmd == CYWEE_SERVICE_CMD_FITNESS_PEDOMETER_MODE){
             cywee_service_running_stat = true;
             cywee_main_dml(SPORT_ACTIVE_MODE_FITNESS_PEDOMETERR);
             cywee_service_timer_start_check(CYWEE_CHECK_MS);
-        }else if(mail.cmd == SPORT_ACTIVE_MODE_FREE_TRAINING){
+        }else if(mail.cmd == CYWEE_SERVICE_CMD_FREE_TRAINING_MODE){
             cywee_service_running_stat = true;
             cywee_main_dml(SPORT_ACTIVE_MODE_FREE_TRAINING);
             cywee_service_timer_start_check(CYWEE_CHECK_MS);
-        }else if(mail.cmd == SPORT_ACTIVE_MODE_AR_ALERT){
+        }else if(mail.cmd == CYWEE_SERVICE_CMD_AR_ALERT_MODE){
             cywee_service_running_stat = true;
             cywee_main_dml(SPORT_ACTIVE_MODE_AR_ALERT);
             cywee_service_timer_start_check(CYWEE_CHECK_MS);
@@ -315,15 +314,7 @@ static void cywee_service_check_task(void const *arg)
             cywee_service_running_stat = false;
             if (g_cywee_service_timer != NULL) osTimerStop(g_cywee_service_timer);
             activity_exit();
-         }//else if(mail.cmd == INACTIVITY_MODE_SEDENTARY){
-        //     cyw_inactivity_mode_change(INACTIVITY_MODE_SEDENTARY);
-        // }else if(mail.cmd == INACTIVITY_MODE_SLEEPING){
-        //     cyw_inactivity_mode_change(INACTIVITY_MODE_SLEEPING);
-        // }else if(mail.cmd == INACTIVITY_MODE_SEDENTARY_AND_NAP){
-        //     cyw_inactivity_mode_change(INACTIVITY_MODE_SEDENTARY_AND_NAP);
-        // }else if(mail.cmd == INACTIVITY_MODE_NAP){
-        //     cyw_inactivity_mode_change(INACTIVITY_MODE_NAP);
-        //}
+        }
     }
 }
 #define CYWEE_APP_BOARD_MSG_COUNT 50