From 6b3c8e520c09dfbcd091a58c83f18d611f53d6ff Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Grey=20Tu=28=E5=B1=A0=E5=BC=98=E5=8E=86=29?=
 <grey.tu@QUECTEL.COM>
Date: Wed, 31 Mar 2021 13:10:20 +0800
Subject: [PATCH 1/2] Merge branch 'develop' of
 https://gitee.com/quecpython/Community-document into loacl_write_doc

# Conflicts:
#	docs/Advanced_development/zh/QuecPythonWirelessNetwork/DataCall.md
#	docs/Advanced_development/zh/QuecPythonWirelessNetwork/cellLocator.md
#	docs/Advanced_development/zh/QuecPythonWirelessNetwork/media/Qp_Sim_fun_01.png
#	docs/Advanced_development/zh/QuecPythonWirelessNetwork/media/Qp_Sim_fun_02.png
#	docs/Advanced_development/zh/QuecPythonWirelessNetwork/media/image-20210113215601231.png
#	docs/Advanced_development/zh/QuecPythonWirelessNetwork/media/image-20210113220623353.png
#	docs/Advanced_development/zh/QuecPythonWirelessNetwork/media/mediaQp_Advanced_development_QuecPythonWirelessNetwork_SIM_card.png
#	docs/Advanced_development/zh/QuecPythonWirelessNetwork/media/mediaQp_Advanced_development_QuecPythonWirelessNetwork_cellLocator_overview.png
#	docs/Advanced_development/zh/QuecPythonWirelessNetwork/sim.md
---
 docs/little_demo/zh/QuecPythonTest/i2c_aht.md.rej | 9 +++++++++
 1 file changed, 9 insertions(+)
 create mode 100644 docs/little_demo/zh/QuecPythonTest/i2c_aht.md.rej

diff --git a/docs/little_demo/zh/QuecPythonTest/i2c_aht.md.rej b/docs/little_demo/zh/QuecPythonTest/i2c_aht.md.rej
new file mode 100644
index 0000000..4f5d50a
--- /dev/null
+++ b/docs/little_demo/zh/QuecPythonTest/i2c_aht.md.rej
@@ -0,0 +1,9 @@
+diff a/docs/little_demo/zh/QuecPythonTest/i2c_aht.md b/docs/little_demo/zh/QuecPythonTest/i2c_aht.md	(rejected hunks)
+@@ -134,6 +134,7 @@
+ 
+ 
+ 
++def aht10_init(self, addre=0x38, Alise="AHT10"):
+ 
+ 	self.i2c_log = log.getLogger(Alise)
+ 
-- 
Gitee


From b43b9841ff849069c9a14b56418357c8e0aacc30 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Grey=20Tu=28=E5=B1=A0=E5=BC=98=E5=8E=86=29?=
 <grey.tu@QUECTEL.COM>
Date: Wed, 31 Mar 2021 13:23:19 +0800
Subject: [PATCH 2/2] no message

---
 .../zh/QuecPythonWirelessNetwork/DataCall.md                 | 5 ++++-
 .../zh/QuecPythonWirelessNetwork/cellLocator.md              | 2 ++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/docs/Advanced_development/zh/QuecPythonWirelessNetwork/DataCall.md b/docs/Advanced_development/zh/QuecPythonWirelessNetwork/DataCall.md
index 5e558f3..2299b5b 100644
--- a/docs/Advanced_development/zh/QuecPythonWirelessNetwork/DataCall.md
+++ b/docs/Advanced_development/zh/QuecPythonWirelessNetwork/DataCall.md
@@ -193,4 +193,7 @@ if __name__ == "__main__":
 ## 配套代码
 
 <!-- * [下载代码](code/datacall_base.py) -->
- <a href="code/datacall_base.py" target="_blank">下载代码</a>
\ No newline at end of file
+ <a href="code/datacall_base.py" target="_blank">下载代码</a>
+
+
+
diff --git a/docs/Advanced_development/zh/QuecPythonWirelessNetwork/cellLocator.md b/docs/Advanced_development/zh/QuecPythonWirelessNetwork/cellLocator.md
index 9849958..ab78739 100644
--- a/docs/Advanced_development/zh/QuecPythonWirelessNetwork/cellLocator.md
+++ b/docs/Advanced_development/zh/QuecPythonWirelessNetwork/cellLocator.md
@@ -110,3 +110,5 @@ if __name__ == "__main__":
 <!-- * [下载代码](code/cellLocator_base.py) -->
  <a href="code/cellLocator_base.py" target="_blank">下载代码</a>
 
+
+
-- 
Gitee