Merge pull request #12 from ingchips/develop

release 4.0.2:
ingchips · Oct 30, 2020 · 7018c5b · 7018c5b
2 parents 4a68920 + fdc03ad
commit 7018c5b
Show file tree

Hide file tree

Showing 120 changed files with 659 additions and 655 deletions.
diff --git a/examples-gcc/peripheral_ibeacon/Makefile b/examples-gcc/peripheral_ibeacon/Makefile
@@ -6,6 +6,6 @@ APPNAME=peripheral_ibeacon
 
 PROJECT_FILES=src/main.c ../../examples/${APPNAME}/src/profile.c   ${ING_REL}/src/FWlib/peripheral_uart.c
 
-SYMDEFS=-Wl,--just-symbols=../../bundles/typical/ING9188xx/symdefs.g
+SYMDEFS=-Wl,--just-symbols=../../bundles/typical/ING9185xx/symdefs.g
 
 include makefile.conf
diff --git a/examples-gcc/peripheral_ibeacon/flash_download.ini b/examples-gcc/peripheral_ibeacon/flash_download.ini
@@ -14,13 +14,13 @@ script=
 [bin-0]
 Name=Burn Bin #1
 Checked=0
-FileName=../../bundles/typical/ING9188xx/platform.bin
+FileName=../../bundles/typical/ING9185xx/platform.bin
 Address=16384
 
 [bin-1]
 Name=Burn Bin #2
 Checked=1
-Address=155648
+Address=147456
 FileName=peripheral_ibeacon.bin
 
 [uart]

diff --git a/examples-gcc/peripheral_ibeacon/peripheral_ibeacon.ingw b/examples-gcc/peripheral_ibeacon/peripheral_ibeacon.ingw
diff --git a/examples-gcc/peripheral_ibeacon/peripheral_ibeacon.ld b/examples-gcc/peripheral_ibeacon/peripheral_ibeacon.ld
@@ -7,8 +7,8 @@
  */
 MEMORY
 {
-  FLASH (rx) : ORIGIN = 155648, LENGTH = 385024
-  RAM (rwx) : ORIGIN = 536903456, LENGTH = 32992
+  FLASH (rx) : ORIGIN = 147456, LENGTH = 131072
+  RAM (rwx) : ORIGIN = 536895376, LENGTH = 8304
 }
 
 /* Linker script to place sections and symbol values. Should be used together

diff --git a/examples-iar/peripheral_ibeacon/flash_download.ini b/examples-iar/peripheral_ibeacon/flash_download.ini
@@ -10,17 +10,19 @@ batch.current=5
 batch.limit=-1
 UseScript=0
 script=
+protection.enabled=0
+protection.unlock=0
 
 [bin-0]
 Name=Burn Bin #1
-Checked=0
-FileName=../../bundles/typical/ING9188xx/platform.bin
+Checked=1
+FileName=../../bundles/typical/ING9185xx/platform.bin
 Address=16384
 
 [bin-1]
 Name=Burn Bin #2
 Checked=1
-Address=155648
+Address=147456
 FileName=./Debug/Exe/peripheral_ibeacon.bin
 
 [uart]
@@ -29,11 +31,12 @@ Baud=115200
 Parity=
 DataBits=8
 StopBits=1
+Port=COM3
 
 [main]
 timeout=10000
 MIN_ADDR=16384
-MAX_ADDR=540672
+MAX_ADDR=540671
 
 [bin-2]
 Name=Burn Bin #3

diff --git a/examples-iar/peripheral_ibeacon/generic_cortex.icf b/examples-iar/peripheral_ibeacon/generic_cortex.icf
@@ -2,9 +2,9 @@
 /*-Editor annotation file-*/
 /* IcfEditorFile="$TOOLKIT_DIR$\config\ide\IcfEditor\cortex_v1_4.xml" */
 /*-Specials-*/
-define symbol                                                                                                                      __ICFEDIT_intvec_start__ = 155648;
+define symbol                                                                                                                            __ICFEDIT_intvec_start__ = 147456;
 /*-Memory Regions-*/
-define symbol                                                                                                                      __ICFEDIT_region_IROM1_start__ = 155648;
+define symbol                                                                                                                            __ICFEDIT_region_IROM1_start__ = 147456;
 define symbol __ICFEDIT_region_IROM1_end__   = 0x00084000;
 define symbol __ICFEDIT_region_IROM2_start__ = 0x0;
 define symbol __ICFEDIT_region_IROM2_end__   = 0x0;
@@ -14,7 +14,7 @@ define symbol __ICFEDIT_region_EROM2_start__ = 0x0;
 define symbol __ICFEDIT_region_EROM2_end__   = 0x0;
 define symbol __ICFEDIT_region_EROM3_start__ = 0x0;
 define symbol __ICFEDIT_region_EROM3_end__   = 0x0;
-define symbol                                                                                                                      __ICFEDIT_region_IRAM1_start__ = 536903456;
+define symbol                                                                                                                            __ICFEDIT_region_IRAM1_start__ = 536895376;
 define symbol __ICFEDIT_region_IRAM1_end__   = 0x2000FFFF;
 define symbol __ICFEDIT_region_IRAM2_start__ = 0x0;
 define symbol __ICFEDIT_region_IRAM2_end__   = 0x0;

diff --git a/examples-iar/peripheral_ibeacon/peripheral_ibeacon.ewp b/examples-iar/peripheral_ibeacon/peripheral_ibeacon.ewp
@@ -812,7 +812,7 @@
         </option>
         <option>
           <name>IlinkExtraOptions</name>
-          <state>-f ../../bundles/typical/ING9188xx/symdefs.i</state>
+          <state>-f ../../bundles/typical/ING9185xx/symdefs.i</state>
         </option>
         <option>
           <name>IlinkLowLevelInterfaceSlave</name>

diff --git a/examples-iar/peripheral_ibeacon/peripheral_ibeacon.ingw b/examples-iar/peripheral_ibeacon/peripheral_ibeacon.ingw
diff --git a/examples-nim/peripheral_battery/Makefile b/examples-nim/peripheral_battery/Makefile
@@ -1,7 +1,7 @@
 CMSIS_INC=${CMSIS_BASE}/Include
 ING_REL=../..
 ING_BUNDLE=../../bundles/typical/inc
-SYMDEFS=-Wl,--just-symbols=../../bundles/typical/ING9188xx/symdefs.g
+SYMDEFS=-Wl,--just-symbols=../../bundles/typical/ING9185xx/symdefs.g
 
 APPNAME=peripheral_battery
 

diff --git a/examples-nim/peripheral_battery/flash_download.ini b/examples-nim/peripheral_battery/flash_download.ini
@@ -16,13 +16,13 @@ script=
 [bin-0]
 Name=Burn Bin #1
 Checked=0
-FileName=../../bundles/typical/ING9188xx/platform.bin
+FileName=../../bundles/typical/ING9185xx/platform.bin
 Address=16384
 
 [bin-1]
 Name=Burn Bin #2
 Checked=1
-Address=155648
+Address=147456
 FileName=peripheral_battery.bin
 
 [uart]

diff --git a/examples-nim/peripheral_battery/peripheral_battery.ingw b/examples-nim/peripheral_battery/peripheral_battery.ingw
diff --git a/examples-nim/peripheral_battery/peripheral_battery.ld b/examples-nim/peripheral_battery/peripheral_battery.ld
@@ -7,8 +7,8 @@
  */
 MEMORY
 {
-  FLASH (rx) : ORIGIN = 155648, LENGTH = 385024
-  RAM (rwx) : ORIGIN = 536903456, LENGTH = 32992
+  FLASH (rx) : ORIGIN = 147456, LENGTH = 131072
+  RAM (rwx) : ORIGIN = 536895376, LENGTH = 8304
 }
 
 /* Linker script to place sections and symbol values. Should be used together

diff --git a/examples-nim/smart_home_hub/Makefile b/examples-nim/smart_home_hub/Makefile
@@ -1,7 +1,7 @@
 CMSIS_INC=${CMSIS_BASE}/Include
 ING_REL=../..
 ING_BUNDLE=../../bundles/typical/inc
-SYMDEFS=-Wl,--just-symbols=../../bundles/typical/ING9188xx/symdefs.g
+SYMDEFS=-Wl,--just-symbols=../../bundles/typical/ING9185xx/symdefs.g
 
 APPNAME=smart_home_hub
 

diff --git a/examples-nim/smart_home_hub/flash_download.ini b/examples-nim/smart_home_hub/flash_download.ini
@@ -16,13 +16,13 @@ script=
 [bin-0]
 Name=Burn Bin #1
 Checked=0
-FileName=../../bundles/typical/ING9188xx/platform.bin
+FileName=../../bundles/typical/ING9185xx/platform.bin
 Address=16384
 
 [bin-1]
 Name=Burn Bin #2
 Checked=1
-Address=155648
+Address=147456
 FileName=smart_home_hub.bin
 
 [uart]

diff --git a/examples-nim/smart_home_hub/smart_home_hub.ingw b/examples-nim/smart_home_hub/smart_home_hub.ingw
diff --git a/examples-nim/smart_home_hub/smart_home_hub.ld b/examples-nim/smart_home_hub/smart_home_hub.ld
@@ -7,8 +7,8 @@
  */
 MEMORY
 {
-  FLASH (rx) : ORIGIN = 155648, LENGTH = 385024
-  RAM (rwx) : ORIGIN = 536903456, LENGTH = 32992
+  FLASH (rx) : ORIGIN = 147456, LENGTH = 131072
+  RAM (rwx) : ORIGIN = 536895376, LENGTH = 8304
 }
 
 /* Linker script to place sections and symbol values. Should be used together

diff --git a/examples-rowley/peripheral_ibeacon/flash_download.ini b/examples-rowley/peripheral_ibeacon/flash_download.ini
@@ -10,11 +10,11 @@ batch=1
 [bin-0]
 Name=Burn Bin #1
 Checked=1
-FileName=../../bundles/typical/ING9188xx/platform.bin
+FileName=../../bundles/typical/ING9185xx/platform.bin
 Address=16384
 
 [bin-1]
 Name=Burn Bin #2
 Checked=1
-Address=155648
+Address=147456
 FileName=./peripheral_ibeacon Debug/peripheral_ibeacon.bin
diff --git a/examples-rowley/peripheral_ibeacon/peripheral_ibeacon.hzp b/examples-rowley/peripheral_ibeacon/peripheral_ibeacon.hzp
@@ -2,7 +2,7 @@
 <!DOCTYPE CrossStudio_Project_File >
 <solution Name="peripheral_ibeacon" target="8" version="2">
   <project Name="peripheral_ibeacon">
-    <configuration Name="Common" arm_endian="Little" arm_fp_abi="Soft" arm_fpu_type="None" project_type="Executable" arm_core_type="Cortex-M3" arm_architecture="v7M" project_directory="" arm_linker_variant="GNU" arm_linker_heap_size="0" linker_output_format="bin" arm_linker_stack_size="4" external_load_address="0x2000a000" arm_target_device_name="ING918xx" asm_additional_options="" debug_target_connection="J-Link" external_build_file_name="..\ING918xx.elf" arm_target_interface_type="SWD" c_only_additional_options="" linker_additional_options="--just-symbols=../../bundles/typical/ING9188xx/symdefs.g" c_preprocessor_definitions="USE_STDPERIPH_DRIVER;BLE50_ENABLED=1" c_user_include_directories="../../bundles/typical/inc;../../bundles/typical/inc/os;../../bundles/typical/inc/os/portable/GCC/ARM_CM3;../../src/BSP;../../src/FWlib;../../src/StartUP;../../src/Tools;../../src;C:/projects/ingWizard/CMSIS/Include" arm_linker_process_stack_size="0" linker_section_placement_file="$(StudioDir)/targets/Cortex_M/flash_placement.xml" linker_section_placements_segments="FLASH RX 155648 385024;RAM RWX 536903456 32992" arm_simulator_memory_simulation_parameter="RWX 10000000,00200000,CDCDCDCD"/>
+    <configuration Name="Common" arm_endian="Little" arm_fp_abi="Soft" arm_fpu_type="None" project_type="Executable" arm_core_type="Cortex-M3" arm_architecture="v7M" project_directory="" arm_linker_variant="GNU" arm_linker_heap_size="0" linker_output_format="bin" arm_linker_stack_size="4" external_load_address="0x2000a000" arm_target_device_name="ING918xx" asm_additional_options="" debug_target_connection="J-Link" external_build_file_name="..\ING918xx.elf" arm_target_interface_type="SWD" c_only_additional_options="" linker_additional_options="--just-symbols=../../bundles/typical/ING9185xx/symdefs.g" c_preprocessor_definitions="USE_STDPERIPH_DRIVER;BLE50_ENABLED=1" c_user_include_directories="../../bundles/typical/inc;../../bundles/typical/inc/os;../../bundles/typical/inc/os/portable/GCC/ARM_CM3;../../src/BSP;../../src/FWlib;../../src/StartUP;../../src/Tools;../../src;C:/projects/ingWizard/CMSIS/Include" arm_linker_process_stack_size="0" linker_section_placement_file="$(StudioDir)/targets/Cortex_M/flash_placement.xml" linker_section_placements_segments="FLASH RX 147456 131072;RAM RWX 536895376 8304" arm_simulator_memory_simulation_parameter="RWX 10000000,00200000,CDCDCDCD"/>
     <folder Name="App">
       <configuration Name="Common" filter="c;cpp;cxx;cc;h;s;asm;inc"/>
       <file file_name="./src/main.c"/>

diff --git a/examples-rowley/peripheral_ibeacon/peripheral_ibeacon.ingw b/examples-rowley/peripheral_ibeacon/peripheral_ibeacon.ingw
diff --git a/examples-segger/peripheral_ibeacon/flash_download.ini b/examples-segger/peripheral_ibeacon/flash_download.ini
@@ -14,13 +14,13 @@ script=
 [bin-0]
 Name=Burn Bin #1
 Checked=0
-FileName=../../bundles/typical/ING9188xx/platform.bin
+FileName=../../bundles/typical/ING9185xx/platform.bin
 Address=16384
 
 [bin-1]
 Name=Burn Bin #2
 Checked=1
-Address=155648
+Address=147456
 FileName=./Output/Debug/Exe/peripheral_ibeacon.bin
 
 [uart]

diff --git a/examples-segger/peripheral_ibeacon/peripheral_ibeacon.emProject b/examples-segger/peripheral_ibeacon/peripheral_ibeacon.emProject
@@ -2,7 +2,7 @@
 <!DOCTYPE CrossStudio_Project_File >
 <solution Name="peripheral_ibeacon" target="8" version="2">
   <project Name="peripheral_ibeacon">
-    <configuration Name="Common" arm_endian="Little" arm_fp_abi="Soft" arm_fpu_type="None" project_type="Executable" arm_core_type="Cortex-M3" arm_architecture="v7M" project_directory="" arm_linker_variant="SEGGER" arm_linker_heap_size="0" linker_output_format="bin" arm_linker_stack_size="4" arm_target_device_name="ING918xx" asm_additional_options="" debug_target_connection="J-Link" link_linker_script_file="$(ProjectDir)/Flash.icf" debug_initial_breakpoint="app_main" arm_target_interface_type="SWD" c_only_additional_options="" c_preprocessor_definitions="USE_STDPERIPH_DRIVER;BLE50_ENABLED=1" c_user_include_directories="../../bundles/typical/inc;../../bundles/typical/inc/os;../../bundles/typical/inc/os/portable/GCC/ARM_CM3;../../src/BSP;../../src/FWlib;../../src/StartUP;../../src/Tools;../../src;C:/projects/ingWizard/CMSIS/Include" arm_linker_process_stack_size="0" debug_startup_completion_point="app_main" linker_section_placements_segments="FLASH RX 155648 385024;RAM RWX 536903456 32992" linker_additional_options_from_file="../../bundles/typical/ING9188xx/symdefs.s" arm_simulator_memory_simulation_parameter="RX 172032,368640,FFFFFFFF;RWX 536919056,17392,CDCDCDCD"/>
+    <configuration Name="Common" arm_endian="Little" arm_fp_abi="Soft" arm_fpu_type="None" project_type="Executable" arm_core_type="Cortex-M3" arm_architecture="v7M" project_directory="" arm_linker_variant="SEGGER" arm_linker_heap_size="0" linker_output_format="bin" arm_linker_stack_size="4" arm_target_device_name="ING918xx" asm_additional_options="" debug_target_connection="J-Link" link_linker_script_file="$(ProjectDir)/Flash.icf" debug_initial_breakpoint="app_main" arm_target_interface_type="SWD" c_only_additional_options="" c_preprocessor_definitions="USE_STDPERIPH_DRIVER;BLE50_ENABLED=1" c_user_include_directories="../../bundles/typical/inc;../../bundles/typical/inc/os;../../bundles/typical/inc/os/portable/GCC/ARM_CM3;../../src/BSP;../../src/FWlib;../../src/StartUP;../../src/Tools;../../src;C:/projects/ingWizard/CMSIS/Include" arm_linker_process_stack_size="0" debug_startup_completion_point="app_main" linker_section_placements_segments="FLASH RX 147456 131072;RAM RWX 536895376 8304" linker_additional_options_from_file="../../bundles/typical/ING9185xx/symdefs.s" arm_simulator_memory_simulation_parameter="RX 172032,368640,FFFFFFFF;RWX 536919056,17392,CDCDCDCD"/>
     <folder Name="App">
       <configuration Name="Common" filter="c;cpp;cxx;cc;h;s;asm;inc"/>
       <file file_name="./src/main.c"/>

diff --git a/examples-segger/peripheral_ibeacon/peripheral_ibeacon.ingw b/examples-segger/peripheral_ibeacon/peripheral_ibeacon.ingw
diff --git a/examples/anti_lost_mas/anti_lost_mas.ingw b/examples/anti_lost_mas/anti_lost_mas.ingw
diff --git a/examples/anti_lost_mas/anti_lost_mas.uvoptx b/examples/anti_lost_mas/anti_lost_mas.uvoptx
@@ -253,7 +253,7 @@
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>..\..\bundles\typical\ING9188xx\symdefs.m</PathWithFileName>
+      <PathWithFileName>..\..\bundles\typical\ING9185xx\symdefs.m</PathWithFileName>
       <FilenameWithoutPath>symdefs.m</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>

diff --git a/examples/anti_lost_mas/anti_lost_mas.uvproj b/examples/anti_lost_mas/anti_lost_mas.uvproj
@@ -294,8 +294,8 @@
               </OCR_RVCT3>
               <OCR_RVCT4>
                 <Type>1</Type>
-                <StartAddress>155648</StartAddress>
-                <Size>385024</Size>
+                <StartAddress>147456</StartAddress>
+                <Size>131072</Size>
               </OCR_RVCT4>
               <OCR_RVCT5>
                 <Type>1</Type>
@@ -319,8 +319,8 @@
               </OCR_RVCT8>
               <OCR_RVCT9>
                 <Type>0</Type>
-                <StartAddress>536903456</StartAddress>
-                <Size>32992</Size>
+                <StartAddress>536895376</StartAddress>
+                <Size>8304</Size>
               </OCR_RVCT9>
               <OCR_RVCT10>
                 <Type>0</Type>
@@ -417,7 +417,7 @@
             <File>
               <FileName>symdefs.m</FileName>
               <FileType>3</FileType>
-              <FilePath>..\..\bundles\typical\ING9188xx\symdefs.m</FilePath>
+              <FilePath>..\..\bundles\typical\ING9185xx\symdefs.m</FilePath>
             </File>
           </Files>
         </Group>