From: 彭磊 <1624952103@qq.com> Date: Thu, 13 Jun 2024 09:11:40 +0000 (+0000) Subject: Merge #273 into sdk602patch0521 from refs/changes/273/head X-Git-Tag: release_V1.2.70_20241020_135402~1005^2~1^2 X-Git-Url: http://git.snicker.com.cn/css/static/gitweb.css?a=commitdiff_plain;h=refs%2Fchanges%2F276%2Ftarget%2F1;p=mirrors%2FFD230.git Merge #273 into sdk602patch0521 from refs/changes/273/head Code review from 彭磊 * refs/changes/273/head: (3 commits squashed) - 优化蓝牙产测,添加ppg关闭led指令 - Merge branch 'sdk602patch0521' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into remotes/origin/sdk602patch0521 - 蓝牙产测添加NTC测试指令 Signed-off-by: aliyun6865282430 <1624952103@qq.com> Reviewed-by: snickersun@163.com Merged-by: snickersun@163.com CR-link: https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230/change/273 --- diff --git a/code/sdk/application/wearable/service/factorytest_service/factorytest_protocol.c b/code/sdk/application/wearable/service/factorytest_service/factorytest_protocol.c index de9e3e390..25650fece 100644 --- a/code/sdk/application/wearable/service/factorytest_service/factorytest_protocol.c +++ b/code/sdk/application/wearable/service/factorytest_service/factorytest_protocol.c @@ -25,6 +25,8 @@ #include "string.h" #include "custom_runtime.h" #include "bletest.h" +#include "battery_service.h" + #pragma pack(1) typedef struct factorytest_cmd_header_t { @@ -947,6 +949,33 @@ void factorytest_protocol_soft_test_decode(uint8_t submode,uint8_t testitem,uint 0x02, send_data, datalen); + } else if(testitem == 0x03) + { + //获取电池温度 + uint8_t send_data[2] = {0}; + float bat_temp = 0.0f; + batteryservice_get_battery_temp(&bat_temp); + send_data[1] = bat_temp; + PRINT("bat_temp : %f \r\n",bat_temp); + factorytest_protocol_replymsg(BLE_TEST_CMD_MODE_SOFT_TEST, + BLE_TEST_CMD_SOFT_TEST_SUB_MODE_CUSTOM_CMD, + 0x03, + send_data, + 2); + + } else if(testitem == 0x04) + { + //获取pcb温度 + uint8_t send_data[2] = {0}; + float pcb_temp = 0.0f; + batteryservice_get_pcb_temp(&pcb_temp); + send_data[1] = pcb_temp; + PRINT("pcb_temp : %f \r\n",pcb_temp); + factorytest_protocol_replymsg(BLE_TEST_CMD_MODE_SOFT_TEST, + BLE_TEST_CMD_SOFT_TEST_SUB_MODE_CUSTOM_CMD, + 0x04, + send_data, + 2); } else if(testitem == 0x11) { uint8_t i;