优化开机动画,优化蓝牙产测。优化运动心率 332/1 332/head 333/target/1
authorpenglei <1624952103@qq.com>
Thu, 20 Jun 2024 09:10:20 +0000 (17:10 +0800)
committerpenglei <1624952103@qq.com>
Thu, 20 Jun 2024 09:10:20 +0000 (17:10 +0800)
62 files changed:
code/sdk/application/wearable/service/factorytest_service/factorytest_protocol.c
code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/system/ReBoot/1.bin [moved from code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/system/ReBoot/6S24000.bin with 100% similarity]
code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/system/ReBoot/10.bin [moved from code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/system/ReBoot/6S24018.bin with 100% similarity]
code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/system/ReBoot/11.bin [moved from code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/system/ReBoot/6S24020.bin with 100% similarity]
code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/system/ReBoot/12.bin [moved from code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/system/ReBoot/6S24022.bin with 100% similarity]
code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/system/ReBoot/13.bin [moved from code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/system/ReBoot/6S24024.bin with 100% similarity]
code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/system/ReBoot/14.bin [moved from code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/system/ReBoot/6S24026.bin with 100% similarity]
code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/system/ReBoot/15.bin [new file with mode: 0644]
code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/system/ReBoot/16.bin [new file with mode: 0644]
code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/system/ReBoot/17.bin [new file with mode: 0644]
code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/system/ReBoot/18.bin [new file with mode: 0644]
code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/system/ReBoot/19.bin [new file with mode: 0644]
code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/system/ReBoot/2.bin [moved from code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/system/ReBoot/6S24002.bin with 100% similarity]
code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/system/ReBoot/20.bin [new file with mode: 0644]
code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/system/ReBoot/21.bin [new file with mode: 0644]
code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/system/ReBoot/22.bin [new file with mode: 0644]
code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/system/ReBoot/23.bin [new file with mode: 0644]
code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/system/ReBoot/24.bin [new file with mode: 0644]
code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/system/ReBoot/25.bin [new file with mode: 0644]
code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/system/ReBoot/26.bin [new file with mode: 0644]
code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/system/ReBoot/27.bin [new file with mode: 0644]
code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/system/ReBoot/28.bin [new file with mode: 0644]
code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/system/ReBoot/29.bin [new file with mode: 0644]
code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/system/ReBoot/3.bin [moved from code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/system/ReBoot/6S24004.bin with 100% similarity]
code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/system/ReBoot/30.bin [new file with mode: 0644]
code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/system/ReBoot/31.bin [new file with mode: 0644]
code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/system/ReBoot/32.bin [new file with mode: 0644]
code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/system/ReBoot/33.bin [new file with mode: 0644]
code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/system/ReBoot/34.bin [new file with mode: 0644]
code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/system/ReBoot/35.bin [new file with mode: 0644]
code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/system/ReBoot/36.bin [new file with mode: 0644]
code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/system/ReBoot/4.bin [moved from code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/system/ReBoot/6S24006.bin with 100% similarity]
code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/system/ReBoot/5.bin [moved from code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/system/ReBoot/6S24008.bin with 100% similarity]
code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/system/ReBoot/6.bin [moved from code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/system/ReBoot/6S24010.bin with 100% similarity]
code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/system/ReBoot/6S24001.bin [deleted file]
code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/system/ReBoot/6S24003.bin [deleted file]
code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/system/ReBoot/6S24005.bin [deleted file]
code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/system/ReBoot/6S24007.bin [deleted file]
code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/system/ReBoot/6S24009.bin [deleted file]
code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/system/ReBoot/6S24011.bin [deleted file]
code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/system/ReBoot/6S24013.bin [deleted file]
code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/system/ReBoot/6S24015.bin [deleted file]
code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/system/ReBoot/6S24017.bin [deleted file]
code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/system/ReBoot/6S24019.bin [deleted file]
code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/system/ReBoot/6S24021.bin [deleted file]
code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/system/ReBoot/6S24023.bin [deleted file]
code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/system/ReBoot/6S24025.bin [deleted file]
code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/system/ReBoot/6S24027.bin [deleted file]
code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/system/ReBoot/6S24028.bin [deleted file]
code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/system/ReBoot/6S24029.bin [deleted file]
code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/system/ReBoot/7.bin [moved from code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/system/ReBoot/6S24012.bin with 100% similarity]
code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/system/ReBoot/8.bin [moved from code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/system/ReBoot/6S24014.bin with 100% similarity]
code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/system/ReBoot/9.bin [moved from code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/system/ReBoot/6S24016.bin with 100% similarity]
code/sdk/drivers/peripheral/cywee/Inc/cywee_hal.h
code/sdk/drivers/peripheral/cywee/src/board_yh601s.c
code/sdk/drivers/peripheral/cywee/src/main_dml.c
code/sdk/drivers/peripheral/mag/mmc5603/mmc5603_main.c
code/sdk/drivers/peripheral/ppg/hx3695/hx3695.c
code/sdk/drivers/peripheral/ppg/hx3695/hx3695.h
code/sdk/drivers/peripheral/ppg/service/ppg_service.cpp
code/sdk/drivers/peripheral/utils/custom_utils.c
code/sdk/middleware/services/gui/uikit/proprietary/src/service/src/graphic_service_wrapper.cpp

index cb08cb7..71a2fb8 100644 (file)
@@ -2,7 +2,7 @@
  * @Author: penglei 1624952103@qq.com\r
  * @Date: 2024-06-17 14:31:08\r
  * @LastEditors: penglei 1624952103@qq.com\r
- * @LastEditTime: 2024-06-19 17:07:52\r
+ * @LastEditTime: 2024-06-20 15:31:42\r
  * @FilePath: /FD230/code/sdk/application/wearable/service/factorytest_service/factorytest_protocol.c\r
  * @Description: \r
  * \r
@@ -465,13 +465,13 @@ void factorytest_protocol_common_decode(uint8_t submode,uint8_t testitem,uint8_t
                 //恢复出厂设置\r
                 uint8_t send_data = 0x00;\r
 \r
-                do_custom_cmd_service_check_msg(CUSTOM_CMD_MSG_TYPE_RESTORE_FACTORY_SETTING, NULL, 0);\r
-\r
                 factorytest_protocol_replymsg(BLE_TEST_CMD_MODE_COMMON,\r
                         BLE_TEST_CMD_COMMON_SUB_MODE_POWER_ON_OFF_DEVICE,\r
                         0x05,\r
                         &send_data,\r
                         1);\r
+\r
+                do_custom_cmd_service_check_msg(CUSTOM_CMD_MSG_TYPE_RESTORE_FACTORY_SETTING, NULL, 0);\r
             }\r
             break;\r
 \r
@@ -968,7 +968,7 @@ void factorytest_protocol_soft_test_decode(uint8_t submode,uint8_t testitem,uint
                 uint32_t timeout = *data;\r
                 PRINT("ScreenDurationTime : %d \r\n",*data);\r
                 //修改自动灭屏时间\r
-                uapi_setScreenDuration(timeout);\r
+                uapi_setScreenDuration(timeout * 1000);\r
                 \r
                 factorytest_protocol_replymsg(BLE_TEST_CMD_MODE_SOFT_TEST,\r
                         BLE_TEST_CMD_SOFT_TEST_SUB_MODE_LCD,\r
@@ -1588,6 +1588,15 @@ void factorytest_protocol_soft_test_decode(uint8_t submode,uint8_t testitem,uint
                         0x04,\r
                         &send_data,\r
                         1);\r
+            } else if(testitem == 0x05)\r
+            {\r
+                //删除录音\r
+                uint8_t send_data = uapi_delete_files("/user/userdata/microphone.mp3");\r
+                factorytest_protocol_replymsg(BLE_TEST_CMD_MODE_SOFT_TEST,\r
+                        BLE_TEST_CMD_SOFT_TEST_SUB_MODE_SPEAKER,\r
+                        0x05,\r
+                        &send_data,\r
+                        1);\r
             }\r
             break;\r
 \r
diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/system/ReBoot/15.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/system/ReBoot/15.bin
new file mode 100644 (file)
index 0000000..36626a1
--- /dev/null
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:f6a67b9062aaa46eff812864455a1646cb6cf8e11d9a3514a0fbf69622e63705
+size 146040
diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/system/ReBoot/16.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/system/ReBoot/16.bin
new file mode 100644 (file)
index 0000000..5901106
--- /dev/null
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:d61ccfdb7af0b398215b4c8687c1e10a16c89809e06ef42133c9ce16d0e5fae4
+size 146040
diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/system/ReBoot/17.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/system/ReBoot/17.bin
new file mode 100644 (file)
index 0000000..857184e
--- /dev/null
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:33660ebb32bfca061d3ec4f116e9bb1a0892a93b50babbfac0fd7d0cda2cb3c3
+size 146040
diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/system/ReBoot/18.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/system/ReBoot/18.bin
new file mode 100644 (file)
index 0000000..51528cd
--- /dev/null
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:8c2db91d9acb764137f7399e314b8115cdf9f7bcf7fe7f8de42808afd2422e4f
+size 146040
diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/system/ReBoot/19.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/system/ReBoot/19.bin
new file mode 100644 (file)
index 0000000..1879959
--- /dev/null
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:b5010861c2e72ef730075170d125e9b17b13f18baa5599933b43d68b8f28c8e0
+size 146040
diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/system/ReBoot/20.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/system/ReBoot/20.bin
new file mode 100644 (file)
index 0000000..e2d338f
--- /dev/null
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:3c0c9186312f8ad1abc6ab0573a961e342e1128494d664ebb726e0c82475c026
+size 146040
diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/system/ReBoot/21.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/system/ReBoot/21.bin
new file mode 100644 (file)
index 0000000..67f1e39
--- /dev/null
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:9856cbb512f87fe79fa7975e5459e5b267e361e3c0caa02947700b372cf4be4d
+size 146040
diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/system/ReBoot/22.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/system/ReBoot/22.bin
new file mode 100644 (file)
index 0000000..dac6741
--- /dev/null
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:e86ca47549e4d6edb7b1167a809afa451f21bf2f22812279f2f25286e86aaa0d
+size 146040
diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/system/ReBoot/23.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/system/ReBoot/23.bin
new file mode 100644 (file)
index 0000000..14f8969
--- /dev/null
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:dd5a005d99fef596455b8bb9a7cb1da1bc42084f4846c43b20d718e9933c8e6f
+size 146040
diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/system/ReBoot/24.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/system/ReBoot/24.bin
new file mode 100644 (file)
index 0000000..51d5220
--- /dev/null
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:24b85f500fbb8c0b61310ccfbcfabd92fbc399ae058c9e2e69268dd3962bc815
+size 146040
diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/system/ReBoot/25.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/system/ReBoot/25.bin
new file mode 100644 (file)
index 0000000..7fc6cb1
--- /dev/null
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:dfaca8cbd1b40395b77bbaa958bf976b2eca04b55a60915bda018abb774fffe8
+size 146040
diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/system/ReBoot/26.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/system/ReBoot/26.bin
new file mode 100644 (file)
index 0000000..7db9e90
--- /dev/null
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:af4ae290ee2dffa0a85fb99b445d7d533f43401049f2c4f60ffa73052504023d
+size 146040
diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/system/ReBoot/27.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/system/ReBoot/27.bin
new file mode 100644 (file)
index 0000000..068f64b
--- /dev/null
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:a6ca44bbfbd338c6cbff1d7329a9c1d554b5922ab1c13ea61351348f6049f68e
+size 146040
diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/system/ReBoot/28.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/system/ReBoot/28.bin
new file mode 100644 (file)
index 0000000..81f2be0
--- /dev/null
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:226a9c0dfa2b57afb94b689583e4bbdec67d55f87a1064db45962084b134c4bd
+size 146040
diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/system/ReBoot/29.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/system/ReBoot/29.bin
new file mode 100644 (file)
index 0000000..bbc54b2
--- /dev/null
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:ffd2771577bcbaa02eb35cb74e132c98de94db1060c4653ed243f1040e4baec4
+size 146040
diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/system/ReBoot/30.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/system/ReBoot/30.bin
new file mode 100644 (file)
index 0000000..ffb8769
--- /dev/null
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:b44f9c3ad594cbd7ef5b5aa38ed09d9c06f382a4945ec11a4a69a7166b823622
+size 146040
diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/system/ReBoot/31.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/system/ReBoot/31.bin
new file mode 100644 (file)
index 0000000..ff1f407
--- /dev/null
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:06b0a22558cca7d4980d33237982e694f0da0cea31707901d8f47f273c7cd037
+size 146040
diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/system/ReBoot/32.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/system/ReBoot/32.bin
new file mode 100644 (file)
index 0000000..3ab2d70
--- /dev/null
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:1d69bb84df6a0d20e8c726486e274cad71b5510f1387182b75f49de46d699de7
+size 146040
diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/system/ReBoot/33.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/system/ReBoot/33.bin
new file mode 100644 (file)
index 0000000..5be7d43
--- /dev/null
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:c798090c5c7b5f48f314608992a8f212d9f633f4f41eb188618921f69da31bf5
+size 146040
diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/system/ReBoot/34.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/system/ReBoot/34.bin
new file mode 100644 (file)
index 0000000..3b077e6
--- /dev/null
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:51b4ef6fadd390a70867ba99d8a75e9b1fb5c27f34cdeaafde3aec861c48e7f9
+size 146040
diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/system/ReBoot/35.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/system/ReBoot/35.bin
new file mode 100644 (file)
index 0000000..9f69b1d
--- /dev/null
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:daed50899830b040765db902f9412999622cb06efe035d455d2cc79e6e8fd4fb
+size 146040
diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/system/ReBoot/36.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/system/ReBoot/36.bin
new file mode 100644 (file)
index 0000000..66caca0
--- /dev/null
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:c1eaad41172815bee9988dbdd287616725961086efd5e7d5f2759b50b7e11429
+size 146040
diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/system/ReBoot/6S24001.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/system/ReBoot/6S24001.bin
deleted file mode 100644 (file)
index 63c9dd2..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:6fc36ab917be00c9a2dcb673a4fdc05198bedc304fae2aea092f7cadec8ff8c1
-size 146040
diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/system/ReBoot/6S24003.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/system/ReBoot/6S24003.bin
deleted file mode 100644 (file)
index b7f8786..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:77318b7c30dc165ad3446704f735074c9249cb9af532175bbc5fbe50a22346e0
-size 146040
diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/system/ReBoot/6S24005.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/system/ReBoot/6S24005.bin
deleted file mode 100644 (file)
index ffdcfc3..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:7fe3d6d01331bce80f744a20cf2a7a511a176491eeebe685232debbc59a60513
-size 146040
diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/system/ReBoot/6S24007.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/system/ReBoot/6S24007.bin
deleted file mode 100644 (file)
index 34cecf4..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:b1311d92b96c2ccd10e62ee6fcd20a2106f45dcc79b47b64ecc2060215037c37
-size 146040
diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/system/ReBoot/6S24009.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/system/ReBoot/6S24009.bin
deleted file mode 100644 (file)
index 9190647..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:4a0abcac99fd87c447d584b1e678f806a72aa14a7b09d4019e0ba31bb03bc4c4
-size 146040
diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/system/ReBoot/6S24011.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/system/ReBoot/6S24011.bin
deleted file mode 100644 (file)
index 5a71e53..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:7b6fdd69730f4e9184be64e3c6e4da276e9fdaa5f918fb67110a932c18e74472
-size 146040
diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/system/ReBoot/6S24013.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/system/ReBoot/6S24013.bin
deleted file mode 100644 (file)
index 782884b..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:616669a7f5854eff91afb479443b97de8f3b95aec06c4c881962411857fb701c
-size 146040
diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/system/ReBoot/6S24015.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/system/ReBoot/6S24015.bin
deleted file mode 100644 (file)
index 18cffae..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:3181ea3fefff911e91484480ba7d60fa055c8ca97dbda6e34c9f0961e2a77cc0
-size 146040
diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/system/ReBoot/6S24017.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/system/ReBoot/6S24017.bin
deleted file mode 100644 (file)
index 0e326b7..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:21013815879cb7652fe1dfc75a656ccc8b50d74c7f82f5e477743c4bdfa9c4b1
-size 146040
diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/system/ReBoot/6S24019.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/system/ReBoot/6S24019.bin
deleted file mode 100644 (file)
index aa6ca33..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:bee64e87ce7421f84f37bdc0a54a2009ea27ea5c9b5eae60e43a878e290ab471
-size 146040
diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/system/ReBoot/6S24021.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/system/ReBoot/6S24021.bin
deleted file mode 100644 (file)
index 779c4d1..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:1b6b27c9ced02c6c7a8f7112fd87e889dbacd35538f5ca36552ce66502708239
-size 146040
diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/system/ReBoot/6S24023.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/system/ReBoot/6S24023.bin
deleted file mode 100644 (file)
index d1e932c..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:d4dd8807e244acdbf9211cba60fdf703b71728e0555656fc4f6893e4106c193f
-size 146040
diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/system/ReBoot/6S24025.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/system/ReBoot/6S24025.bin
deleted file mode 100644 (file)
index fc2a0ae..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:e55e76d745e793c47c95f49b9156f6719af14b664285a762cf243bcbb33c2ffa
-size 146040
diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/system/ReBoot/6S24027.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/system/ReBoot/6S24027.bin
deleted file mode 100644 (file)
index d04cbd2..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:5308e5feca09ca15036164a04543287b350a02186e4681299394fed681ac0dca
-size 146040
diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/system/ReBoot/6S24028.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/system/ReBoot/6S24028.bin
deleted file mode 100644 (file)
index 8f65249..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:d4505667567257525d90db975552c8ae2e9757e606025497df6878f2e3dd99dd
-size 146040
diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/system/ReBoot/6S24029.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/system/ReBoot/6S24029.bin
deleted file mode 100644 (file)
index 4fb68c2..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:e08795fdde6362abb0f7aa9bac7a6587cdf7d79ee73dd5284a7c2990d5c15567
-size 146040
index cc96fc6..89e489e 100644 (file)
@@ -462,6 +462,8 @@ typedef struct
     int max_step_freq;
     int max_pace;
     int hrs;
+    int duration;
+    int MHR;
 }cywee_activity_result_t;
 
 typedef struct 
index 76a6b50..fd33fb2 100644 (file)
@@ -262,7 +262,7 @@ int CWM_OS_dbgPrintf(const char * format,...)
     CWM_OS_dbgOutput(InputBuff);
     return 0;
 }
-#define CWM_DATA_PATH "/user/userdata/sport/stepcount"
+#define CWM_DATA_PATH "/user/userdata/sport/stepcount.bin"
 void CWM_OS_saveData(int* data, uint32_t len){
     
     FILE * fp = fopen(CWM_DATA_PATH,"wb");
index cdda9dd..5ae371e 100644 (file)
@@ -133,8 +133,6 @@ void distances_history_save(void)
     CWM_OS_saveData_history(&new_calories,&history_calories,sizeof(int),CYWEE_SAVE_DATA_DISTANCE);
 }
 
-
-
 void cywee_ar_alert_switch(int cmd)
 {
     memset(&scl, 0, sizeof(scl));
@@ -253,6 +251,17 @@ void activity_mode_setstatus(int cmd)
     scl.iData[0] = 1;
     scl.iData[1] = cmd; 
     CWM_SettingControl(SCL_ACTIVITY_PAUSE, &scl);
+
+    if(hrs_mode_state == 0)
+    {
+        send_ppg_cmd_msg(PPG_SERVICE_CMD_TYPE_DO_PPG_TEST);
+        hrs_mode_state = 1;
+    }
+    else
+    {
+        send_ppg_cmd_msg(PPG_SERVICE_CMD_TYPE_STOP_PPG_TEST);
+        hrs_mode_state = 0;
+    }
 }
 
 void cywee_inactivity_mode_change(int mode)
@@ -420,9 +429,9 @@ void CWM_AP_SensorListen(pSensorEVT_t sensorEVT) {
         gxyz_t.z = sensorEVT->fData[2];
 
             // CWM_OS_dbgPrintf("acc: x=%.3f, y=%.3f, z=%.3f\n",
-            //                                            sensorEVT->fData[0],
-            //                                            sensorEVT->fData[1],
-            //                                            sensorEVT->fData[2]
+            //                                            sensorEVT->fData[0] * 418,
+            //                                            sensorEVT->fData[1] * 418,
+            //                                            sensorEVT->fData[2] * 418
             //                                             );
 
         if(get_acc_swtich)
@@ -665,10 +674,12 @@ void CWM_AP_SensorListen(pSensorEVT_t sensorEVT) {
                                 (int)sensorEVT->fData[1],
                                 (int)sensorEVT->fData[5],
                                 (int)sensorEVT->fData[6]);
-
+                
                 memset(&c_activity_result_t,0,sizeof(cywee_activity_result_t));
                 c_activity_result_t.activity_mode = (int)sensorEVT->fData[0];
                 c_activity_result_t.calories = (int)sensorEVT->fData[1];
+                c_activity_result_t.duration = (int)sensorEVT->fData[5];
+                c_activity_result_t.MHR = (int)sensorEVT->fData[6];
                 c_activity_result_t.hrs = hrs;
                 cywee_func(CYWEE_MSG_TYPE_ACTIVITY_UPDATE,&c_activity_result_t,sizeof(cywee_activity_result_t));
 
@@ -938,6 +949,7 @@ int cywee_main_dml(void)
     //配置跑步机模式相关参数(进入跑步机模式自动生效)
     memset(&scl, 0, sizeof(scl));
     scl.iData[0] = 1;
+    scl.iData[4] = 1;//extra info发送  0 打开,1关闭
     CWM_SettingControl(SCL_PEDO_CONFIG, &scl);
 
     memset(&scl, 0, sizeof(scl));
index 422b68b..580c261 100644 (file)
@@ -269,7 +269,7 @@ int SavePara(float *p)
        return 1;\r
 }\r
 \r
-#define MMC_DATA_PATH "/user/userdata/mmc_para"\r
+#define MMC_DATA_PATH "/user/userdata/mmc_para.bin"\r
 \r
 int SavePara_infile(void)\r
 {      \r
index a2763bc..8475fe7 100644 (file)
@@ -149,12 +149,6 @@ const  uint16_t  IR_FFT_POW_THRE = 500;           //fft_pow_min
 const  uint8_t   SLOPE_PARA_MAX = 28;\r
 const  uint8_t   SLOPE_PARA_MIN = 3;\r
 \r
-int32_t ble_hrs_data = 0;\r
-uint8_t ble_hrs_flag = 0;\r
-\r
-int32_t ble_spo2_data = 0;\r
-uint8_t ble_spo2_flag = 0;\r
-\r
 #ifdef SPO2_DATA_CALI\r
 static int32_t red_data_fifo[4] = {0};\r
 static int32_t ir_data_fifo[4] = {0};\r
@@ -2758,7 +2752,10 @@ void hx3695_hrs_ppg_Int_handle(void)
     PRINT("*count : %d \r\n",*count);\r
     if(*count < 10)\r
     {\r
-      gsensor_get_n_data(8,gsensordata);\r
+      if(hrs_mode_state == 1)\r
+      {\r
+          gsensor_get_n_data(8,gsensordata);\r
+      }\r
        for(ii=0; ii<*count; ii++)\r
        {\r
           if(ii == 8)\r
@@ -2769,14 +2766,10 @@ void hx3695_hrs_ppg_Int_handle(void)
           }\r
           else\r
           {\r
-              gsen_fifo_x_send[ii] = gsensordata[ii].x * 2048;\r
-              gsen_fifo_y_send[ii] = gsensordata[ii].y * 2048;\r
-              gsen_fifo_z_send[ii] = gsensordata[ii].z * 2048;\r
+              gsen_fifo_x_send[ii] = gsensordata[ii].x * 4096 / 10;\r
+              gsen_fifo_y_send[ii] = gsensordata[ii].y * 4096 / 10;\r
+              gsen_fifo_z_send[ii] = gsensordata[ii].z * 4096 / 10;\r
           }\r
-\r
-          if(abs(PPG_buf[ii]) > 10000)\r
-            ble_hrs_data = abs(PPG_buf[ii]);\r
-\r
           //PRINT("hxdata:%d/%d %d %d %.3f %.3f %.3f %d\r\n" ,1+ii,*count,PPG_buf[ii],ir_buf[0],gsen_fifo_x_send[ii],gsen_fifo_y_send[ii],gsen_fifo_z_send[ii],ppg_s_data.green_cur);\r
           PRINT("hxdata:%d/%d %d %d %d %d %d %d\r\n" ,1+ii,*count,PPG_buf[ii],ir_buf[0],gsen_fifo_x_send[ii],gsen_fifo_y_send[ii],gsen_fifo_z_send[ii],ppg_s_data.green_cur);\r
 \r
@@ -2834,11 +2827,6 @@ void hx3695_hrs_ppg_Int_handle(void)
         do_cywee_service_check_msg(CYWEE_SERVICE_CMD_HRS_WEARSTATUS_CHANGE,cywee_data);\r
     }\r
 \r
-    if(hrsresult.lastesthrs > 0)\r
-    {\r
-        ble_hrs_flag = 1;\r
-    }\r
-\r
        if(hrs_wear_status == MSG_HRS_WEAR && hrsresult.hr_living == MSG_LIVING_TRUE)\r
     {\r
 //             app_hr_reset_stop_timer();\r
@@ -3216,26 +3204,22 @@ void hx3695_spo2_ppg_Int_handle(void)
     PRINT("*count[%d] \r\n",*count);\r
     if(*count < 10)\r
     {\r
-       gsensor_get_n_data(8,gsensordata);\r
+       //gsensor_get_n_data(8,gsensordata);\r
        for(ii=0; ii<*count; ii++)\r
        {\r
  \r
-          if(ii == 8)\r
-          {\r
-              gsen_fifo_x_send[ii] = gsen_fifo_x_send[ii - 1];\r
-              gsen_fifo_y_send[ii] = gsen_fifo_y_send[ii - 1];\r
-              gsen_fifo_z_send[ii] = gsen_fifo_z_send[ii - 1];\r
-          }\r
-          else\r
-          {\r
-              gsen_fifo_x_send[ii] = gsensordata[ii].x * 2048;\r
-              gsen_fifo_y_send[ii] = gsensordata[ii].y * 2048;\r
-              gsen_fifo_z_send[ii] = gsensordata[ii].z * 2048;\r
-          }\r
-\r
-          if(abs(red_buf[ii]) > 10000)\r
-              ble_spo2_data = abs(red_buf[ii]) ;\r
-\r
+          // if(ii == 8)\r
+          // {\r
+          //     gsen_fifo_x_send[ii] = gsen_fifo_x_send[ii - 1];\r
+          //     gsen_fifo_y_send[ii] = gsen_fifo_y_send[ii - 1];\r
+          //     gsen_fifo_z_send[ii] = gsen_fifo_z_send[ii - 1];\r
+          // }\r
+          // else\r
+          // {\r
+          //     gsen_fifo_x_send[ii] = gsensordata[ii].x * 2048;\r
+          //     gsen_fifo_y_send[ii] = gsensordata[ii].y * 2048;\r
+          //     gsen_fifo_z_send[ii] = gsensordata[ii].z * 2048;\r
+          // }\r
           PRINT("hxdata:%d/%d %d %d %d %d %d %d\r\n",\r
             1+ii,*count,red_buf[ii],ir_buf[ii],green_buf[ii],gsen_fifo_x_send[ii],gsen_fifo_y_send[ii],gsen_fifo_z_send[ii]);\r
           //printf("FFF==>spo2  red_buf : %d,  %d,  %d,        %d \n", 1+ii, *count, red_buf[ii], ir_buf[0]);\r
@@ -3309,8 +3293,7 @@ void hx3695_spo2_ppg_Int_handle(void)
     DEBUG_PRINTF("block_cnt: %d, data_cnt:%d, hr_result:%d,ir_quality:%d,motion:%d,poor_signal:%d,reliable_score_result:%d,screen_up:%d,spo2_result:%d\r\n",spo2_alg_results.block_cnt,spo2_alg_results.data_cnt,spo2_alg_results.hr_result,spo2_alg_results.ir_quality,spo2_alg_results.motion,spo2_alg_results.poor_signal,spo2_alg_results.reliable_score_result,spo2_alg_results.screen_up,spo2_alg_results.spo2_result);\r
     \r
     hrsresult.lastestspo2 = spo2_alg_results.spo2_result;\r
-    if(hrsresult.lastestspo2 > 0)\r
-      ble_spo2_flag = 1;\r
+\r
 //     if(hrsresult.lastestspo2)\r
        {\r
                // store_latest_spo2(hrsresult.lastestspo2);\r
@@ -3451,7 +3434,7 @@ void hx3695_hrspo2_ppg_Int_handle(void)
 #ifndef GSEN_40MS_TIMMER\r
 //readFifoByHrsModule();\r
 #endif\r
-       DEBUG_PRINTF("\r\nsend  jlink cnt=%d\r\n",*count);              \r
+       //DEBUG_PRINTF("\r\nsend  jlink cnt=%d\r\n",*count);            \r
                \r
                \r
     // for(ii=0; ii<*count; ii++)\r
index 7e14873..326b399 100644 (file)
@@ -302,10 +302,4 @@ uint8_t hx3695_get_chip_id(void);
 \r
 #include "hx3695_hal.h"\r
 \r
-extern int32_t ble_hrs_data;\r
-extern uint8_t ble_hrs_flag;\r
-\r
-extern int32_t ble_spo2_data;\r
-extern uint8_t ble_spo2_flag;\r
-\r
 #endif\r
index 5aa5df3..56d494a 100644 (file)
@@ -312,6 +312,7 @@ static void ppg_service_check_task(void  *arg)
             do_cywee_service_check_msg(CYWEE_SERVICE_CMD_START_GET_ACC,NULL);
             cmd = "hrs";
             enable = 1;
+            uapi_pm_add_sleep_veto(PM_ID_HEART);
         }else if (mail == PPG_SERVICE_CMD_TYPE_DO_HRV_TEST){
             cmd = "hrv";
             enable = 1;
@@ -344,6 +345,7 @@ static void ppg_service_check_task(void  *arg)
             do_cywee_service_check_msg(CYWEE_SERVICE_CMD_STOP_GET_ACC,NULL);
             cmd = "hrs";
             enable = 0;
+            uapi_pm_remove_sleep_veto(PM_ID_HEART);
         }else if (mail == PPG_SERVICE_CMD_TYPE_STOP_SPO2_TEST){
    
             cmd = "spo2";
index 291f3a6..f96c19f 100644 (file)
@@ -969,7 +969,7 @@ void uapi_setScreenBrightness(int value)
 void uapi_setScreenDuration(int32_t time)
 {
     const power_display_svr_api_t *display_api = power_display_svr_get_api();
-    display_api->set_screen_auto_off_timeout(time);
+    errcode_t ret = display_api->set_screen_auto_off_timeout(time);
 }
 
 /*获取屏幕状态: return 0 screen on  ,  1 screen off*/
@@ -1490,8 +1490,6 @@ void touch_getid(uint16_t *id)
     }
 }
 
-#include "touch_screen_drv.h"
-
 void touch_getstate(void)
 {
     int32_t state;
index 693e97c..86486b8 100755 (executable)
@@ -52,7 +52,7 @@ static OHOS::UIViewGroup* group=nullptr;
 static OHOS::UIViewGroup* boot_group=nullptr;
 static OHOS::UIImageAnimatorView* ReBootImageAnimatorView=nullptr;
 static constexpr char *ReBootPaths = "/system/ReBoot/"; //开机图片路径
-static constexpr int16_t REBOOT_IMAGE_ANIMATOR_VIEW_NUM_FRAMES = 30; // 图片帧数
+static constexpr int16_t REBOOT_IMAGE_ANIMATOR_VIEW_NUM_FRAMES = 36; // 图片帧数
 static constexpr int16_t REBOOT_IMAGE_ANIMATOR_TIME = 150;           // 图片更新间隔
 static OHOS::ImageAnimatorInfo ReBootImageInfo[REBOOT_IMAGE_ANIMATOR_VIEW_NUM_FRAMES]; // 开机图像的信息
 static constexpr int16_t REBOOT_IMAGE_ANIMATOR_VIEW_X = 0;
@@ -134,10 +134,8 @@ static const char ** CreateImagePathsArray(const char *basePath, const char *fil
     char buffer[256];
     for (int i = 0; i < numImages; i++)
     {
-        if(i < 10)
-            snprintf(buffer, sizeof(buffer), "%s6S2400%d.%s", basePath, i , fileExtension);
-        else
-            snprintf(buffer, sizeof(buffer), "%s6S240%d.%s", basePath, i , fileExtension);
+        snprintf(buffer, sizeof(buffer), "%s%d.%s", basePath, i + 1 , fileExtension);
+
         imagePaths[i] = strdup(buffer);
     }
     return imagePaths;