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 <accounts_62b90f7fcf51ade33b6f628e@mail.teambition.com>
Merged-by: snickersun@163.com <accounts_62b90f7fcf51ade33b6f628e@mail.teambition.com>
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 de9e3e3..25650fe 100644 (file)
--- 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"\r
 #include "custom_runtime.h"\r
 #include "bletest.h"\r
+#include "battery_service.h"\r
+\r
 #pragma pack(1)\r
 typedef struct factorytest_cmd_header_t\r
 {\r
@@ -947,6 +949,33 @@ void factorytest_protocol_soft_test_decode(uint8_t submode,uint8_t testitem,uint
                         0x02,\r
                         send_data,\r
                         datalen);\r
+            } else if(testitem == 0x03)\r
+            {\r
+                //获取电池温度\r
+                uint8_t send_data[2] = {0};\r
+                float bat_temp = 0.0f;\r
+                batteryservice_get_battery_temp(&bat_temp);\r
+                send_data[1] = bat_temp;\r
+                PRINT("bat_temp : %f \r\n",bat_temp);\r
+                factorytest_protocol_replymsg(BLE_TEST_CMD_MODE_SOFT_TEST,\r
+                        BLE_TEST_CMD_SOFT_TEST_SUB_MODE_CUSTOM_CMD,\r
+                        0x03,\r
+                        send_data,\r
+                        2);\r
+\r
+            } else if(testitem == 0x04)\r
+            {\r
+                //获取pcb温度\r
+                uint8_t send_data[2] = {0};\r
+                float pcb_temp = 0.0f;\r
+                batteryservice_get_pcb_temp(&pcb_temp);\r
+                send_data[1] = pcb_temp;\r
+                PRINT("pcb_temp : %f \r\n",pcb_temp);\r
+                factorytest_protocol_replymsg(BLE_TEST_CMD_MODE_SOFT_TEST,\r
+                        BLE_TEST_CMD_SOFT_TEST_SUB_MODE_CUSTOM_CMD,\r
+                        0x04,\r
+                        send_data,\r
+                        2); \r
             } else if(testitem == 0x11)\r
             {\r
                 uint8_t i;\r