Merge pull request #95 from DavidLiu123/main

guozhenh · web-flow · commit a8d2a6baf210 · 2022-07-14T13:32:13.000+08:00
update FOTA introduction
diff --git a/en-us/api/QuecPythonClasslib.md b/en-us/api/QuecPythonClasslib.md
@@ -3194,9 +3194,13 @@ Module function: Firmware upgrade.
 
 ##### Create a fota Object
 
+Optional parameters to select whether to automatically restart after downloading the upgrade package 
+
 > **import fota**
 >
-> **fota_obj = fota()**
+> **fota_obj = fota()**#Automatically restart after downloading
+>
+> **fota_obj = fota(reset_disable=1)**#Not restart after downloading
 
 ##### One-click Upgrade Interface
 
@@ -3209,8 +3213,8 @@ Realize the whole process of firmware download and upgrade with one interface
 | Parameter | Parameter Type | Description                                                  |
 | --------- | -------------- | ------------------------------------------------------------ |
 | url1      | str            | The url of the first stage upgrade package to be downloaded  |
-| url2      | str            | The url of the second stage upgrade package to be downloaded. Note: this parameter must be input for the minimum system upgrade because the minimum system is divided into two stages, while this parameter is forbidden to be input  for DFOTA and FullFOTA upgrade because there is only one stage for DFOTA and FullFOTA. |
-| callback  | function       | Callback function which shows downloading progress and status (Optional). Note: This callback is valid on EC600S/EC600N modules with non-minimum system upgrade mode. It is invalid on other modules. |
+| url2      | str            | The url of the second stage upgrade package to be downloaded. Note: this parameter must be input for the minimum system upgrade because the minimum system is divided into two stages, while this parameter is forbidden to be input  for DFOTA and FullFOTA upgrade because there is only one stage for DFOTA and FullFOTA. Only EC600S/EC600N modules support the minimum system upgrade mode. |
+| callback  | function       | Callback function which shows downloading progress and status (Optional). Note: This callback is valid on non-minimum system upgrade mode. |
 
 - Return Value
 
@@ -3223,7 +3227,7 @@ Realize the whole process of firmware download and upgrade with one interface
 - Example
 
 ```python
-#args[0] indicates the download status. If the download is successful, it returns an integer value: 0 or 1 or 2. If the download fails, it returns an integer value: -1. args[1] represents the download progress. When the download status shows success, it represents the percentage. When the download status shows failure, it represents error code
+#args[0] indicates the download status. If the download is successful, it returns an integer value: 0 or 1 or 2. If the download fails, it returns an integer value: values other than 0,1,2. args[1] represents the download progress. Note:on EC600S/EC600N module,when the download status shows success, it represents the percentage. When the download status shows failure, it represents error code
 def result(args):
     print('download status:',args[0],'download process:',args[1])
     
@@ -3255,7 +3259,7 @@ Write upgrade package data stream
 
 * Note
 
-  * The BC25PA platform does not support this method.
+  * Currently only EC600S/EC600N/EC800N/EC200U/EC600U platform support this method.
 
 
 ##### Interface to Upgrade Step by Step and Refresh Cached Data to Flash
@@ -3273,9 +3277,9 @@ Refresh cached data to the flash.
   * 0 	Successful execution
   * -1	Failed execution
 
-* note
+* Note
 
-  * The BC25PA platform does not support this method.
+  * Currently only EC600S/EC600N/EC800N/EC200U/EC600U platform support this method.
 
 ##### Interface to Upgrade Step by Step and Verify the Data
 
@@ -3292,9 +3296,9 @@ Refresh cached data to the flash.
   * 0 	Successful execution
   * -1	Failed execution
 
-* note
+* Note
 
-  * The BC25PA platform does not support this method.
+  * Currently only EC600S/EC600N/EC800N/EC200U/EC600U platform support this method.
 
 * Example
 
@@ -3303,13 +3307,84 @@ Refresh cached data to the flash.
 0
 ```
 
+##### Interface to set up APN for FOTA download 
+
+> fota_obj.apn_set(fota_apn=,ip_type=,fota_user=,fota_password=)
+
+Set the APN information used for FOTA download.
+
+* Parameter
+
+| Parameter     | Parameter Type | Description                                                  |
+| ------------- | -------------- | ------------------------------------------------------------ |
+| fota_apn      | str            | APN（You can choose not to pass this parameter）             |
+| ip_type       | int            | IP type：0-IPV4，1-IPV6（You can choose not to pass this parameter） |
+| fota_user     | str            | user name（You can choose not to pass this parameter）       |
+| fota_password | str            | password（You can choose not to pass this parameter）        |
+
+* Return Value
+
+  * 0 	Successful execution
+  * -1	Failed execution
+
+* Example
+
+```python
+>>> fota_obj.apn_set(fota_apn="CMNET",ip_type=0,fota_user="abc",fota_password="123")
+0
+```
+
+* Note
+
+  - Currently only BG95 platform support this method.
+
+##### Interface to cancel FOTA downloading
+
+> fota_obj.download_cancel()
 
+Cancel the FOTA download in progress.
+
+- Parameter
+
+  - None
+
+* Return Value
+
+  * 0 	Successful execution
+  * -1	Failed execution
+
+* Example
+
+```python
+import fota
+import _thread
+import utime
+
+def th_func():
+    utime.sleep(40) #Depending on the size of the package, make sure to cancel before the download is complete
+    fota_obj.download_cancel()
+
+def result(args):
+    print('download status:',args[0],'download process:',args[1])
+
+fota_obj = fota()
+_thread.start_new_thread(th_func, ())
+fota_obj.httpDownload(url1="http://www.example.com/fota.bin",callback=result)
+```
+
+* Note
+
+  - Currently only BG95 platform support this method.
+
+  
 
 ##### Example
 
 ###### One-click Upgrade Interface
 
 ```python
+#Automatically restart after downloading
+
 import fota
 import utime
 import log
@@ -3340,10 +3415,26 @@ if __name__ == '__main__':
     run()    
 ```
 
+```python
+#Not automatically restart after the download is complete (not supported on the EC600S、EC600N、EC800N platform)
+
+# EC200A/EC200U/BG95 platform：
+import fota
+from misc import Power
+fota_obj = fota(reset_disable=1)
+def result(args):
+    print('download status:',args[0],'download process:',args[1])
+fota_obj.httpDownload(url1="http://www.example.com/dfota.bin",callback=result) #expected that not restart after execution
+Power.powerRestart() #Manually restart
+```
+
 
 
 ###### Interface to Upgrade Step by Step
 
+- Note
+  - Currently only EC600S/EC600N/EC800N/EC200U/EC600U platform support this feature.
+
 ```python
 '''
 @Author: Pawn
diff --git a/zh-cn/api/QuecPythonClasslib.md b/zh-cn/api/QuecPythonClasslib.md
@@ -3258,9 +3258,13 @@ if __name__ == '__main__':
 
 ##### 创建fota对象
 
+可选择传入参数以选择下载完升级包后是否自动重启
+
 > **import fota**
 >
-> **fota_obj = fota()**
+> **fota_obj = fota()** #下载完自动重启
+>
+> **fota_obj = fota(reset_disable=1)** #下载完不自动重启
 
 ##### 一键升级接口
 
@@ -3273,8 +3277,8 @@ if __name__ == '__main__':
 | 参数     | 参数类型 | 参数说明                                                     |
 | -------- | -------- | ------------------------------------------------------------ |
 | url1     | str      | 待下载的第一阶段升级包的url                                  |
-| url2     | str      | 待下载的第二阶段升级包的url，注：最小系统升级分为2个阶段，必须传入该参数，而差分升级、全包升级只有一个阶段，该参数禁止传入 |
-| callback | function | 回调函数，显示下载进度和状态，可选择传不传入，注：EC600S/EC600N平台且是非最小系统升级方式时有效，其他平台该回调没有反应 |
+| url2     | str      | 待下载的第二阶段升级包的url，注：最小系统升级分为2个阶段，必须传入该参数，而差分升级、全包升级只有一个阶段，该参数禁止传入，仅EC600S/EC600N平台支持最小系统升级方式 |
+| callback | function | 回调函数，显示下载进度和状态，可选择传不传入，注：非最小系统升级方式时有效 |
 
 - 返回值
 
@@ -3283,7 +3287,7 @@ if __name__ == '__main__':
 - 示例
 
 ```python
-#args[0]表示下载状态，下载成功返回整型值：0或1或2，下载失败返回整型值：-1，args[1]表示下载进度，当下载状态是成功时表示百分比，下载状态是失败时表示错误码
+#args[0]表示下载状态，下载成功返回整型值：0或1或2，下载失败返回整型值：非0、1、2，args[1]表示下载进度(注：EC600S/EC600N平台当下载状态是成功时表示百分比，下载状态是失败时表示错误码)
 def result(args):
     print('download status:',args[0],'download process:',args[1])
     
@@ -3314,7 +3318,7 @@ fota_obj.httpDownload(url1="http://www.example.com/fota1.bin",url2="http://www.e
 
 * 注意
 
-  BC25PA平台不支持此方法。
+  目前支持平台：EC600S/EC600N/EC800N/EC600U/EC200U。
 
 
 ##### 分步升级接口，刷新缓存数据到flash
@@ -3333,7 +3337,7 @@ fota_obj.httpDownload(url1="http://www.example.com/fota1.bin",url2="http://www.e
 
 * 注意
 
-  BC25PA平台不支持此方法。
+  目前支持平台：EC600S/EC600N/EC800N/EC600U/EC200U。
 
 
 ##### 分步升级接口，数据校验
@@ -3352,7 +3356,7 @@ fota_obj.httpDownload(url1="http://www.example.com/fota1.bin",url2="http://www.e
 
 * 注意
 
-  BC25PA平台不支持此方法。
+  目前支持平台：EC600S/EC600N/EC800N/EC600U/EC200U。
   
 * 示例
 
@@ -3361,13 +3365,82 @@ fota_obj.httpDownload(url1="http://www.example.com/fota1.bin",url2="http://www.e
 0
 ```
 
+##### 设置FOTA下载APN
+
+> fota_obj.apn_set(fota_apn=,ip_type=,fota_user=,fota_password=)
+
+设置FOTA下载使用的APN信息。
+
+* 参数
+
+| 参数          | 参数类型 | 参数说明                                       |
+| ------------- | -------- | ---------------------------------------------- |
+| fota_apn      | str      | APN（可选择传不传入该参数）                    |
+| ip_type       | int      | IP类型：0-IPV4，1-IPV6（可选择传不传入该参数） |
+| fota_user     | str      | 用户名（可选择传不传入该参数）                 |
+| fota_password | str      | 密码（可选择传不传入该参数）                   |
+
+* 返回值
+
+写入成功返回整型值0，写入失败返回值整型值-1。
+
+* 示例
+
+```python
+>>> fota_obj.apn_set(fota_apn="CMNET",ip_type=0,fota_user="abc",fota_password="123")
+0
+```
+
+* 注意
+
+  目前支持平台：BG95。
+
+##### 取消FOTA下载
+
+> fota_obj.download_cancel()
+
+取消正在进行的FOTA下载。
+
+- 参数
+
+无
+
+* 返回值
+
+取消成功返回整型值0，取消失败返回整型值-1。
+
+* 示例
+
+```python
+import fota
+import _thread
+import utime
+
+def th_func():
+    utime.sleep(40) #时间根据下载包的大小来定，确保在下载完之前取消
+    fota_obj.download_cancel()
+
+def result(args):
+    print('download status:',args[0],'download process:',args[1])
+
+fota_obj = fota()
+_thread.start_new_thread(th_func, ())
+fota_obj.httpDownload(url1="http://www.example.com/fota.bin",callback=result)
+```
+
+* 注意
+
+  目前支持平台：BG95。
+
 
 
 ##### 使用示例
 
 ###### 一键升级接口
 
 ```python
+#下载完自动重启
+
 import fota
 import utime
 import log
@@ -3398,10 +3471,27 @@ if __name__ == '__main__':
     run()    
 ```
 
+```python
+# 下载完不自动重启(EC600S/EC600N/EC800N/平台不支持)
+
+# EC200A/EC200U平台/BG95平台：
+import fota
+from misc import Power
+fota_obj = fota(reset_disable=1)
+def result(args):
+    print('download status:',args[0],'download process:',args[1])
+fota_obj.httpDownload(url1="http://www.example.com/dfota.bin",callback=result) #期望下载完不重启
+Power.powerRestart() #手动重启进行升级
+```
+
 
 
 ###### 分步升级接口
 
+- 注意
+
+  目前支持平台：EC600S/EC600N/EC800N/EC600U/EC200U。
+
 ```python
 '''
 @Author: Pawn
