From dc6393d8f17e75f32d2c16bc9acf0a708975e1a5 Mon Sep 17 00:00:00 2001 From: penglei <1624952103@qq.com> Date: Fri, 19 Apr 2024 20:20:18 +0800 Subject: [PATCH] =?utf8?q?=E4=BF=AE=E6=94=B9=E5=BC=80=E5=85=B3=E6=8A=AC?= =?utf8?q?=E8=85=95=E4=BA=AE=E5=B1=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- .../peripheral/cywee/Inc/cywee_service.h | 3 ++ .../peripheral/cywee/service/cywee_service.c | 9 ++++++ .../drivers/peripheral/utils/custom_utils.c | 29 ++++--------------- .../drivers/peripheral/utils/custom_utils.h | 1 - 4 files changed, 17 insertions(+), 25 deletions(-) diff --git a/code/sdk/drivers/peripheral/cywee/Inc/cywee_service.h b/code/sdk/drivers/peripheral/cywee/Inc/cywee_service.h index 0260d846d..d8cb51184 100644 --- a/code/sdk/drivers/peripheral/cywee/Inc/cywee_service.h +++ b/code/sdk/drivers/peripheral/cywee/Inc/cywee_service.h @@ -63,6 +63,9 @@ extern "C" { #define CYWEE_SERVICE_CMD_NAP_MODE 0x23 #define CYWEE_SERVICE_CMD_SLEEPING_MODE 0x24 +#define CYWEE_SERVICE_CMD_OPEN_HAND_UPDOWN 0x25 +#define CYWEE_SERVICE_CMD_CLOSE_HAND_UPDOWN 0x26 + errcode_t uapi_cywee_service_init(void); void uapi_cywee_service_deinit(void); diff --git a/code/sdk/drivers/peripheral/cywee/service/cywee_service.c b/code/sdk/drivers/peripheral/cywee/service/cywee_service.c index a546e163a..e7c4ce3f4 100644 --- a/code/sdk/drivers/peripheral/cywee/service/cywee_service.c +++ b/code/sdk/drivers/peripheral/cywee/service/cywee_service.c @@ -349,6 +349,15 @@ static void cywee_service_check_task(void const *arg) { cyw_inactivity_mode_change(INACTIVITY_MODE_SLEEPING); } + else if (mail.cmd == CYWEE_SERVICE_CMD_OPEN_HAND_UPDOWN) + { + hand_updown_switch(1); + } + else if (mail.cmd == CYWEE_SERVICE_CMD_CLOSE_HAND_UPDOWN) + { + hand_updown_switch(0); + } + } } #define CYWEE_APP_BOARD_MSG_COUNT 50 diff --git a/code/sdk/drivers/peripheral/utils/custom_utils.c b/code/sdk/drivers/peripheral/utils/custom_utils.c index 126d847fb..05323209c 100644 --- a/code/sdk/drivers/peripheral/utils/custom_utils.c +++ b/code/sdk/drivers/peripheral/utils/custom_utils.c @@ -36,7 +36,7 @@ #include "time.h" #include "custom_utils.h" -#include "cywee_hal.h" +#include "cywee_service.h" errcode_t uapi_create_osThread_custom(app_task_definition_t *task_cfg) { @@ -911,34 +911,15 @@ void vibrator_cyclicity(uint16_t duty , uint16_t cycle_time_ms,uint16_t duration g_VibratorFunc(duty,cycle_time_ms,duration_time_ms); } -void uapi_set_vibrator_level(int level) -{ - uint16_t duty =20; - uint16_t cycle_time_ms = 200; - uint16_t duration_time_ms = 0; - switch(level) - { - case 1: - duration_time_ms = 200; - break; - case 2: - duration_time_ms = 500; - break; - case 3: - duration_time_ms = 1000; - break; - default: - break; - } - g_VibratorFunc(duty,cycle_time_ms,duration_time_ms); -} void uapi_take_to_wake(int cmd) { - hand_updown_switch(cmd); + if(cmd == 1) + do_cywee_service_check_msg(CYWEE_SERVICE_CMD_OPEN_HAND_UPDOWN,NULL); + else + do_cywee_service_check_msg(CYWEE_SERVICE_CMD_CLOSE_HAND_UPDOWN,NULL); } - #include "lcd_common.h" void lcd_getid(uint32_t *id) diff --git a/code/sdk/drivers/peripheral/utils/custom_utils.h b/code/sdk/drivers/peripheral/utils/custom_utils.h index e1433e312..7e5bd12f1 100644 --- a/code/sdk/drivers/peripheral/utils/custom_utils.h +++ b/code/sdk/drivers/peripheral/utils/custom_utils.h @@ -79,7 +79,6 @@ errcode_t uapi_get_buildversion(uint8_t *para, uint32_t para_len); void uapi_take_to_wake(int cmd); //开关马达 -void uapi_set_vibrator_level(int level); void vibrator_cyclicity(uint16_t duty , uint16_t cycle_time_ms,uint16_t duration_time_ms); //获取lcd id -- 2.17.1