From e5e4573e1dfafa8f05506fd74ab6d09635d953a9 Mon Sep 17 00:00:00 2001 From: payton Date: Fri, 3 Nov 2023 17:10:40 +0800 Subject: [PATCH] =?UTF-8?q?1.blue=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../code/source/sf_blue/src/sf_blue_app.c | 54 +++++++++++++------ .../code/source/sf_blue/src/sf_blue_app.h | 4 ++ 2 files changed, 43 insertions(+), 15 deletions(-) diff --git a/code/application/source/sf_app/code/source/sf_blue/src/sf_blue_app.c b/code/application/source/sf_app/code/source/sf_blue/src/sf_blue_app.c index 9604bf30e..08a4fb569 100644 --- a/code/application/source/sf_app/code/source/sf_blue/src/sf_blue_app.c +++ b/code/application/source/sf_app/code/source/sf_blue/src/sf_blue_app.c @@ -36,7 +36,7 @@ #define MSG_BLE_END_FIX 0xFFEE #define MSG_APP_2_BLE 0 #define MSG_BLE_2_APP 1 -#define SF_HW_TYPE "REVEAL-X3.0" +#define SF_HW_TYPE "reveal-x-pro3.0" #define SF_WIFI_AP_PWD_LEN 16 #define SF_WIFI_AP_SSID_LEN 16 @@ -195,14 +195,18 @@ static void sf_blue_command_get_camera_para(MSG_DEV_BLE_Param_Get_Rsp_T *CamPara { CamPara->imageSize = 2; } - /*else if(PHOTO_SIZE_16M == puiPara->ImgSize) + else if(PHOTO_SIZE_24M == puiPara->ImgSize) { CamPara->imageSize = 3; } else if(PHOTO_SIZE_32M == puiPara->ImgSize) { - CamPara->imageSize = 2; - }*/ + CamPara->imageSize = 4; + } + else if(PHOTO_SIZE_40M == puiPara->ImgSize) + { + CamPara->imageSize = 5; + } else { CamPara->imageSize = 2; @@ -516,15 +520,18 @@ static signed int sf_blue_command_request_process(U8 *val, unsigned int nval, U8 { puiPara->ImgSize = PHOTO_SIZE_8M; } - /* else if(tmpValue == 3) { - puiPara->ImgSize = PHOTO_SIZE_16M; + puiPara->ImgSize = PHOTO_SIZE_24M; } - else if(tmpValue == 2) + else if(tmpValue == 4) { puiPara->ImgSize = PHOTO_SIZE_32M; - }*/ + } + else if(tmpValue == 5) + { + puiPara->ImgSize = PHOTO_SIZE_40M; + } else { puiPara->ImgSize = PHOTO_SIZE_8M; @@ -662,27 +669,44 @@ static signed int sf_blue_command_request_process(U8 *val, unsigned int nval, U8 puiPara->TimeSend1.Min = pMsgStruct->msgBuf.setSendType.sendFirstTimeM % 60; puiPara->TimeSend2.Hour = pMsgStruct->msgBuf.setSendType.sendSecondTimeH % 24; puiPara->TimeSend2.Min = pMsgStruct->msgBuf.setSendType.sendSecondTimeM % 60; - + puiPara->TimeSend3.Hour = pMsgStruct->msgBuf.setSendType.sendThirdTimeH % 24; + puiPara->TimeSend3.Min = pMsgStruct->msgBuf.setSendType.sendThirdTimeM % 60; + puiPara->TimeSend4.Hour = pMsgStruct->msgBuf.setSendType.sendFourthTimeH % 24; + puiPara->TimeSend4.Min = pMsgStruct->msgBuf.setSendType.sendFourthTimeM % 60; if(puiPara->SendType == 0) { puiPara->TimeSend1Switch = 0; puiPara->TimeSend2Switch = 0; - //puiPara->TimeSend3 = 0; - //puiPara->TimeSend4 = 0; + puiPara->TimeSend3Switch = 0; + puiPara->TimeSend4Switch = 0; } else if(puiPara->SendType == 1) { puiPara->TimeSend1Switch = 1; puiPara->TimeSend2Switch = 0; - //puiPara->TimeSend3 = 0; - //puiPara->TimeSend4 = 0; + puiPara->TimeSend3Switch = 0; + puiPara->TimeSend4Switch = 0; } - else // if(puiPara->SendType == 2) + else if(puiPara->SendType == 2) { puiPara->TimeSend1Switch = 1; puiPara->TimeSend2Switch = 1; + puiPara->TimeSend3Switch = 0; + puiPara->TimeSend4Switch = 0; } - MLOGI("SendType:%d TimeSend1Switch:%d %02d:%02d TimeSend2Switch:%d %02d:%02d\n",puiPara->SendType,puiPara->TimeSend1Switch,puiPara->TimeSend1.Hour,puiPara->TimeSend1.Min,puiPara->TimeSend2Switch, puiPara->TimeSend2.Hour,puiPara->TimeSend2.Min); + else if(puiPara->SendType == 4) + { + puiPara->TimeSend1Switch = 1; + puiPara->TimeSend2Switch = 1; + puiPara->TimeSend3Switch = 1; + puiPara->TimeSend4Switch = 1; + } + MLOGI("SendType:%d TimeSend1Switch:%d %02d:%02d TimeSend2Switch:%d %02d:%02d TimeSend3Switch:%d %02d:%02d TimeSend4Switch:%d %02d:%02d\n", + puiPara->SendType, + puiPara->TimeSend1Switch, puiPara->TimeSend1.Hour,puiPara->TimeSend1.Min, + puiPara->TimeSend2Switch, puiPara->TimeSend2.Hour,puiPara->TimeSend2.Min, + puiPara->TimeSend3Switch, puiPara->TimeSend3.Hour,puiPara->TimeSend3.Min, + puiPara->TimeSend4Switch, puiPara->TimeSend4.Hour,puiPara->TimeSend4.Min); } respFlag = 2; diff --git a/code/application/source/sf_app/code/source/sf_blue/src/sf_blue_app.h b/code/application/source/sf_app/code/source/sf_blue/src/sf_blue_app.h index e4caf7444..5addf8d20 100644 --- a/code/application/source/sf_app/code/source/sf_blue/src/sf_blue_app.h +++ b/code/application/source/sf_app/code/source/sf_blue/src/sf_blue_app.h @@ -278,6 +278,10 @@ typedef struct UINT8 sendFirstTimeM; /* 0~59 (12小时和 24小时共用) */ UINT8 sendSecondTimeH; /* 0~23 */ UINT8 sendSecondTimeM; /* 0~59 */ + UINT8 sendThirdTimeH; /* 0~23 */ + UINT8 sendThirdTimeM; /* 0~59 */ + UINT8 sendFourthTimeH; /* 0~23 */ + UINT8 sendFourthTimeM; /* 0~59 */ UINT16 suffix; /* 0xFFEE */ } __attribute__((packed)) MSG_DEV_BLE_SendType_Set_T;