From 14dd173c31874f1a1b79102126bbf3f92fdc01c3 Mon Sep 17 00:00:00 2001
From: wanghao <wanghao@shining3d.com>
Date: Wed, 28 Aug 2024 16:35:08 +0800
Subject: [PATCH] GPR_SR FW OK

---
 CHIRP/board/app_config.h                |  8 +++----
 XLSW_SONIC/Keil_project/Project.uvoptx  | 32 +++++++++++++++++++++----
 XLSW_SONIC/Keil_project/Project.uvprojx | 10 ++++++++
 XLSW_SONIC/main.c                       |  1 -
 4 files changed, 42 insertions(+), 9 deletions(-)

diff --git a/CHIRP/board/app_config.h b/CHIRP/board/app_config.h
index 9d3e68a..e7f5d0b 100644
--- a/CHIRP/board/app_config.h
+++ b/CHIRP/board/app_config.h
@@ -57,13 +57,13 @@
  */
 
 	/* CH101 GPR - general purpose rangefinding, standard range */
-#define	 CHIRP_SENSOR_FW_INIT_FUNC	ch101_gpr_init
+// #define	 CHIRP_SENSOR_FW_INIT_FUNC	ch101_gpr_init
 
 	/* CH101 GPR NARROW - general purpose rangefinding, narrow FoV */
 // #define	 CHIRP_SENSOR_FW_INIT_FUNC	ch101_gpr_narrow_init
 	
 	/* CH101 GPR SR - general purpose rangefinding, short range */
-// #define	 CHIRP_SENSOR_FW_INIT_FUNC	ch101_gpr_sr_init
+#define	 CHIRP_SENSOR_FW_INIT_FUNC	ch101_gpr_sr_init
  
 	/* CH101 GPR SR NARROW - general purpose rangefinding, short range, narrow FoV */ 
 //  #define	 CHIRP_SENSOR_FW_INIT_FUNC	ch101_gpr_sr_narrow_init
@@ -81,14 +81,14 @@
  * here is greater than the maximum possible range, the maximum possible range 
  * will be used.
  */
-#define	CHIRP_SENSOR_MAX_RANGE_MM		(1000)	/* maximum range, in mm */
+#define	CHIRP_SENSOR_MAX_RANGE_MM		(250)	/* maximum range, in mm */
 
 /* Static target rejection range
  * This value specifies if static target rejection (STR) will be used.  If
  * CHIRP_SENSOR_STATIC_RANGE is non-zero, STR will be enabled and will apply
  * to the specified number of samples at the beginning of a measurement.
  */
-#define	CHIRP_SENSOR_STATIC_RANGE		(100)	/* static target rejection sample 
+#define	CHIRP_SENSOR_STATIC_RANGE		(40)	/* static target rejection sample 
 											   range, in samples (0=disabled) */
 
 
diff --git a/XLSW_SONIC/Keil_project/Project.uvoptx b/XLSW_SONIC/Keil_project/Project.uvoptx
index b05d307..3df349f 100644
--- a/XLSW_SONIC/Keil_project/Project.uvoptx
+++ b/XLSW_SONIC/Keil_project/Project.uvoptx
@@ -276,7 +276,7 @@
       <GroupNumber>1</GroupNumber>
       <FileNumber>2</FileNumber>
       <FileType>1</FileType>
-      <tvExp>0</tvExp>
+      <tvExp>1</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
       <PathWithFileName>..\main.c</PathWithFileName>
@@ -672,7 +672,7 @@
       <GroupNumber>7</GroupNumber>
       <FileNumber>31</FileNumber>
       <FileType>1</FileType>
-      <tvExp>0</tvExp>
+      <tvExp>1</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
       <PathWithFileName>..\..\CHIRP\drivers\src\ch_api.c</PathWithFileName>
@@ -752,6 +752,30 @@
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
+    <File>
+      <GroupNumber>7</GroupNumber>
+      <FileNumber>38</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>..\..\CHIRP\drivers\src\ch101_gpr_sr.c</PathWithFileName>
+      <FilenameWithoutPath>ch101_gpr_sr.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>7</GroupNumber>
+      <FileNumber>39</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>..\..\CHIRP\drivers\src\ch101_gpr_sr_fw.c</PathWithFileName>
+      <FilenameWithoutPath>ch101_gpr_sr_fw.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
   </Group>
 
   <Group>
@@ -762,9 +786,9 @@
     <RteFlg>0</RteFlg>
     <File>
       <GroupNumber>8</GroupNumber>
-      <FileNumber>38</FileNumber>
+      <FileNumber>40</FileNumber>
       <FileType>1</FileType>
-      <tvExp>1</tvExp>
+      <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
       <PathWithFileName>..\..\CHIRP\ultrasound\src\ultrasound_display_config_info.c</PathWithFileName>
diff --git a/XLSW_SONIC/Keil_project/Project.uvprojx b/XLSW_SONIC/Keil_project/Project.uvprojx
index e665939..dade7f7 100644
--- a/XLSW_SONIC/Keil_project/Project.uvprojx
+++ b/XLSW_SONIC/Keil_project/Project.uvprojx
@@ -598,6 +598,16 @@
               <FileType>1</FileType>
               <FilePath>..\..\CHIRP\drivers\src\chbsp_dummy.c</FilePath>
             </File>
+            <File>
+              <FileName>ch101_gpr_sr.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>..\..\CHIRP\drivers\src\ch101_gpr_sr.c</FilePath>
+            </File>
+            <File>
+              <FileName>ch101_gpr_sr_fw.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>..\..\CHIRP\drivers\src\ch101_gpr_sr_fw.c</FilePath>
+            </File>
           </Files>
         </Group>
         <Group>
diff --git a/XLSW_SONIC/main.c b/XLSW_SONIC/main.c
index 31d2bfc..c9174ca 100644
--- a/XLSW_SONIC/main.c
+++ b/XLSW_SONIC/main.c
@@ -1,4 +1,3 @@
-// test
 /*!
     \file    main.c
     \brief   led spark with systick, USART print and key example