Merge pull request #88 from whj4674672/master

[fix] linker_scripts
RT-Thread-Studio · Oct 23, 2020 · a89e5ed · a89e5ed
2 parents 2604a1c + fae15ea
commit a89e5ed
Show file tree

Hide file tree

Showing 10 changed files with 25 additions and 16 deletions.
diff --git a/documents/UM5001-RT-Thread ART-Pi 快速上手.md b/documents/UM5001-RT-Thread ART-Pi 快速上手.md
@@ -14,15 +14,22 @@ ART-Pi 出厂自带一个好玩的例程，可通过蓝牙对开发板进行配
 
 ## 运行
 
-**出厂例程的正常运行需要蓝牙固件，WIFI 固件以及网页文件的支持，如果开发板缺少这些文件，则需要参照下方注意事项上传固件及网页**
+**开发板上电后请按一下步骤进行配网**：
+
+1. **微信** 扫描二维码打开 **WIFI 配网助手**
+
+![wifi-mini-program](./figures/wifi-mini-program.jpg)
+
+2. 设备选择 **ART-Pi**，输入所要连接的 WIFI SSID 和密码，输入完成后点击 **蓝牙配网** 按钮进行配网。
 
-开发板上电后需要蓝牙配网，打开微信 **WIFI 配网助手** 小程序，设备选择 **ART-Pi**，选择所要连接的 WIFI SSID 和密码，输入完成后点击 **蓝牙配网** 按钮进行配网。
 ![BT](./figures/bt.jpg)
 
-配网成功后小程序会跳出成功页面，并且显示开发板获取到的 IP 地址。
+3. 配网成功后小程序会跳出成功页面，并且显示开发板获取到的 IP 地址。
+
 ![BT](./figures/bt_success.jpg)
 
-此时点击 **一键复制** 将 IP 地址复制到剪切板并粘贴到浏览器中即可打开开发板主页。
+4. 此时点击 **一键复制** 将 IP 地址复制到剪切板并粘贴到浏览器中即可打开开发板主页。
+
 ![WEB](./figures/web.gif)
 
 ## 注意事项
@@ -31,6 +38,8 @@ ART-Pi 出厂自带一个好玩的例程，可通过蓝牙对开发板进行配
 
 ### 固件或网页丢失
 
+**出厂例程的正常运行需要蓝牙固件，WIFI 固件以及网页文件的支持，如果开发板缺少这些文件，则需要参照下方注意事项上传固件及网页**
+
 - 出厂默认刷好了 wifi 和蓝牙固件和网页文件，若固件丢失，可以按照文档 `UM3004-RT-Thread ART-Pi BT_WIFI 模块固件下载手册` 所描述方法重新传入。
 
 - 网页文件存在于 `/projects/art_pi_factory/applications/web_dist` 目录下，不同于 WIFI 及蓝牙固件的上传，网页文件需要联网后通过 **adb** 工具进行上传, 需要将 `webnet` 目录上传到开发板的 `/flash / 目录下 `。具体的使用方法如下：

diff --git a/documents/figures/wifi-mini-program.jpg b/documents/figures/wifi-mini-program.jpg
diff --git a/projects/art_pi_blink_led/board/linker_scripts/STM32H750XBHx/link.lds b/projects/art_pi_blink_led/board/linker_scripts/STM32H750XBHx/link.lds
@@ -5,7 +5,7 @@
 /* Program Entry, set to mark it as "used" and avoid gc */
 MEMORY
 {
-ROM (rx) : ORIGIN =0x90000000,LENGTH =16384k
+ROM (rx) : ORIGIN =0x90000000,LENGTH =8192k
 RAM (rw) : ORIGIN =0x24000000,LENGTH =512k
 }
 ENTRY(Reset_Handler)

diff --git a/projects/art_pi_blink_led/board/linker_scripts/STM32H750XBHx/link.sct b/projects/art_pi_blink_led/board/linker_scripts/STM32H750XBHx/link.sct
@@ -2,8 +2,8 @@
 ; *** Scatter-Loading Description File generated by uVision ***
 ; *************************************************************
 
-LR_IROM1 0x90000000 0x01000000  {    ; load region size_region
-  ER_IROM1 0x90000000 0x01000000  {  ; load address = execution address
+LR_IROM1 0x90000000 0x00800000  {    ; load region size_region
+  ER_IROM1 0x90000000 0x00800000  {  ; load address = execution address
    *.o (RESET, +First)
    *(InRoot$$Sections)
    .ANY (+RO)

diff --git a/projects/art_pi_factory/board/linker_scripts/STM32H750XBHx/link.lds b/projects/art_pi_factory/board/linker_scripts/STM32H750XBHx/link.lds
@@ -5,7 +5,7 @@
 /* Program Entry, set to mark it as "used" and avoid gc */
 MEMORY
 {
-ROM (rx) : ORIGIN =0x90000000,LENGTH =16384k
+ROM (rx) : ORIGIN =0x90000000,LENGTH =8192k
 RAM (rw) : ORIGIN =0x24000000,LENGTH =512k
 }
 ENTRY(Reset_Handler)

diff --git a/projects/art_pi_factory/board/linker_scripts/STM32H750XBHx/link.sct b/projects/art_pi_factory/board/linker_scripts/STM32H750XBHx/link.sct
@@ -2,8 +2,8 @@
 ; *** Scatter-Loading Description File generated by uVision ***
 ; *************************************************************
 
-LR_IROM1 0x90000000 0x01000000  {    ; load region size_region
-  ER_IROM1 0x90000000 0x01000000  {  ; load address = execution address
+LR_IROM1 0x90000000 0x00800000  {    ; load region size_region
+  ER_IROM1 0x90000000 0x00800000  {  ; load address = execution address
    *.o (RESET, +First)
    *(InRoot$$Sections)
    .ANY (+RO)

diff --git a/projects/art_pi_wifi/board/linker_scripts/STM32H750XBHx/link.lds b/projects/art_pi_wifi/board/linker_scripts/STM32H750XBHx/link.lds
@@ -5,7 +5,7 @@
 /* Program Entry, set to mark it as "used" and avoid gc */
 MEMORY
 {
-ROM (rx) : ORIGIN =0x90000000,LENGTH =16384k
+ROM (rx) : ORIGIN =0x90000000,LENGTH =8192k
 RAM (rw) : ORIGIN =0x24000000,LENGTH =512k
 }
 ENTRY(Reset_Handler)

diff --git a/projects/art_pi_wifi/board/linker_scripts/STM32H750XBHx/link.sct b/projects/art_pi_wifi/board/linker_scripts/STM32H750XBHx/link.sct
@@ -2,8 +2,8 @@
 ; *** Scatter-Loading Description File generated by uVision ***
 ; *************************************************************
 
-LR_IROM1 0x90000000 0x01000000  {    ; load region size_region
-  ER_IROM1 0x90000000 0x01000000  {  ; load address = execution address
+LR_IROM1 0x90000000 0x00800000  {    ; load region size_region
+  ER_IROM1 0x90000000 0x00800000  {  ; load address = execution address
    *.o (RESET, +First)
    *(InRoot$$Sections)
    .ANY (+RO)

diff --git a/projects/industry_io_gateway/board/linker_scripts/STM32H750XBHx/link.lds b/projects/industry_io_gateway/board/linker_scripts/STM32H750XBHx/link.lds
@@ -5,7 +5,7 @@
 /* Program Entry, set to mark it as "used" and avoid gc */
 MEMORY
 {
-ROM (rx) : ORIGIN =0x90000000,LENGTH =16384k
+ROM (rx) : ORIGIN =0x90000000,LENGTH =8192k
 RAM (rw) : ORIGIN =0x24000000,LENGTH =512k
 RxDecripSection (rw) : ORIGIN =0x30040000,LENGTH =32k
 TxDecripSection (rw) : ORIGIN =0x30040060,LENGTH =32k

diff --git a/projects/industry_io_gateway/board/linker_scripts/STM32H750XBHx/link.sct b/projects/industry_io_gateway/board/linker_scripts/STM32H750XBHx/link.sct
@@ -2,8 +2,8 @@
 ; *** Scatter-Loading Description File generated by uVision ***
 ; *************************************************************
 
-LR_IROM1 0x90000000 0x01000000  {    ; load region size_region
-  ER_IROM1 0x90000000 0x01000000  {  ; load address = execution address
+LR_IROM1 0x90000000 0x00800000  {    ; load region size_region
+  ER_IROM1 0x90000000 0x00800000  {  ; load address = execution address
    *.o (RESET, +First)
    *(InRoot$$Sections)
    .ANY (+RO)