rebuild exp bundles: accept ENH_CONN_CMPL_V2 event

ingchips · Nov 28, 2023 · f6ccf22 · f6ccf22
1 parent 1349faf
commit f6ccf22
Show file tree

Hide file tree

Showing 33 changed files with 2,110 additions and 2,107 deletions.
diff --git a/bundles/exp/ING9168xx/apis.json b/bundles/exp/ING9168xx/apis.json
diff --git a/bundles/exp/ING9168xx/meta.json b/bundles/exp/ING9168xx/meta.json
@@ -8,11 +8,11 @@
     },
     "rom": {
         "base": 33562624,
-        "size": 177776
+        "size": 177784
     },
     "version": [
         2,
         3,
-        3
+        4
     ]
 }
diff --git a/bundles/exp/ING9168xx/platform.bin b/bundles/exp/ING9168xx/platform.bin
diff --git a/bundles/exp/ING9187xx/apis.json b/bundles/exp/ING9187xx/apis.json
diff --git a/bundles/exp/ING9187xx/meta.json b/bundles/exp/ING9187xx/meta.json
@@ -8,11 +8,11 @@
     },
     "rom": {
         "base": 16384,
-        "size": 152040
+        "size": 152044
     },
     "version": [
         1,
         9,
-        42
+        43
     ]
 }
diff --git a/bundles/exp/ING9187xx/platform.bin b/bundles/exp/ING9187xx/platform.bin
diff --git a/bundles/exp/ING9188xx/apis.json b/bundles/exp/ING9188xx/apis.json
diff --git a/bundles/exp/ING9188xx/meta.json b/bundles/exp/ING9188xx/meta.json
@@ -13,6 +13,6 @@
     "version": [
         1,
         9,
-        42
+        43
     ]
 }
diff --git a/bundles/exp/ING9188xx/platform.bin b/bundles/exp/ING9188xx/platform.bin
diff --git a/bundles/noos_exp/ING9168xx/apis.json b/bundles/noos_exp/ING9168xx/apis.json
diff --git a/bundles/noos_exp/ING9168xx/meta.json b/bundles/noos_exp/ING9168xx/meta.json
@@ -8,11 +8,11 @@
     },
     "rom": {
         "base": 33562624,
-        "size": 166912
+        "size": 166920
     },
     "version": [
         2,
         3,
-        3
+        4
     ]
 }
diff --git a/bundles/noos_exp/ING9168xx/platform.bin b/bundles/noos_exp/ING9168xx/platform.bin
diff --git a/bundles/noos_exp/ING9187xx/apis.json b/bundles/noos_exp/ING9187xx/apis.json
diff --git a/bundles/noos_exp/ING9187xx/meta.json b/bundles/noos_exp/ING9187xx/meta.json
@@ -8,11 +8,11 @@
     },
     "rom": {
         "base": 16384,
-        "size": 141252
+        "size": 141260
     },
     "version": [
         1,
         9,
-        42
+        43
     ]
 }
diff --git a/bundles/noos_exp/ING9187xx/platform.bin b/bundles/noos_exp/ING9187xx/platform.bin
diff --git a/bundles/noos_exp/ING9188xx/apis.json b/bundles/noos_exp/ING9188xx/apis.json
diff --git a/bundles/noos_exp/ING9188xx/meta.json b/bundles/noos_exp/ING9188xx/meta.json
@@ -8,11 +8,11 @@
     },
     "rom": {
         "base": 16384,
-        "size": 148164
+        "size": 148176
     },
     "version": [
         1,
         9,
-        42
+        43
     ]
 }
diff --git a/bundles/noos_exp/ING9188xx/platform.bin b/bundles/noos_exp/ING9188xx/platform.bin
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__ = 155648;
 /*-Memory Regions-*/
-define symbol                                                                                                                                                                   __ICFEDIT_region_IROM1_start__ = 155648;
+define symbol                                                                                                                                                                    __ICFEDIT_region_IROM1_start__ = 155648;
 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__ = 536900792;
+define symbol                                                                                                                                                                    __ICFEDIT_region_IRAM1_start__ = 536900792;
 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/direct_conn/direct_conn.ingw b/examples/direct_conn/direct_conn.ingw
@@ -2,7 +2,7 @@
  "watchdog": true,
  "bundle_meta": {
   "rom": {
-   "size": 152040,
+   "size": 152044,
    "base": 16384
   },
   "ram": {
@@ -13,7 +13,7 @@
    "base": 172032
   },
   "version": [
-   1,9,42]
+   1,9,43]
  },
  "tc_dir": "C:\\Keil_v5\\UV4",
  "eflash_addr": "0x42000",

diff --git a/examples/direct_conn/src/profile.c b/examples/direct_conn/src/profile.c
@@ -253,6 +253,7 @@ static void user_packet_handler(uint8_t packet_type, uint16_t channel, const uin
         switch (hci_event_le_meta_get_subevent_code(packet))
         {
         case HCI_SUBEVENT_LE_ENHANCED_CONNECTION_COMPLETE:
+        case HCI_SUBEVENT_LE_ENHANCED_CONNECTION_COMPLETE_V2:
             platform_printf("connected\n");
 #if (CONN_ROLE == HCI_ROLE_MASTER)
 #else

diff --git a/examples/hid_keyboard/hid_keyboard.ingw b/examples/hid_keyboard/hid_keyboard.ingw
@@ -2,7 +2,7 @@
  "watchdog": false,
  "bundle_meta": {
   "rom": {
-   "size": 152040,
+   "size": 152044,
    "base": 16384
   },
   "ram": {
@@ -13,7 +13,7 @@
    "base": 172032
   },
   "version": [
-   1,9,42]
+   1,9,43]
  },
  "tc_dir": "C:\\Keil_v5\\UV4",
  "eflash_addr": "0x42000",

diff --git a/examples/hid_keyboard/hid_keyboard.uvproj b/examples/hid_keyboard/hid_keyboard.uvproj
@@ -1,10 +1,7 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="project_proj.xsd">
-
   <SchemaVersion>1.1</SchemaVersion>
-
   <Header>### uVision Project, (C) Keil Software</Header>
-
   <Targets>
     <Target>
       <TargetName>Target 1</TargetName>
@@ -15,27 +12,27 @@
           <Device>ING91800</Device>
           <Vendor>INGCHIPS</Vendor>
           <Cpu>CLOCK(48000000) CPUTYPE("Cortex-M3") ELITTLE IROM(0x4000-0x43fff) IRAM(0x20000000-0x2000ffff)</Cpu>
-          <FlashUtilSpec></FlashUtilSpec>
-          <StartupFile></StartupFile>
-          <FlashDriverDll></FlashDriverDll>
+          <FlashUtilSpec/>
+          <StartupFile/>
+          <FlashDriverDll/>
           <DeviceId>0</DeviceId>
-          <RegisterFile></RegisterFile>
-          <MemoryEnv></MemoryEnv>
-          <Cmp></Cmp>
-          <Asm></Asm>
-          <Linker></Linker>
-          <OHString></OHString>
-          <InfinionOptionDll></InfinionOptionDll>
-          <SLE66CMisc></SLE66CMisc>
-          <SLE66AMisc></SLE66AMisc>
-          <SLE66LinkerMisc></SLE66LinkerMisc>
-          <SFDFile></SFDFile>
+          <RegisterFile/>
+          <MemoryEnv/>
+          <Cmp/>
+          <Asm/>
+          <Linker/>
+          <OHString/>
+          <InfinionOptionDll/>
+          <SLE66CMisc/>
+          <SLE66AMisc/>
+          <SLE66LinkerMisc/>
+          <SFDFile/>
           <UseEnv>0</UseEnv>
-          <BinPath></BinPath>
-          <IncludePath></IncludePath>
-          <LibPath></LibPath>
-          <RegisterFilePath></RegisterFilePath>
-          <DBRegisterFilePath></DBRegisterFilePath>
+          <BinPath/>
+          <IncludePath/>
+          <LibPath/>
+          <RegisterFilePath/>
+          <DBRegisterFilePath/>
           <TargetStatus>
             <Error>0</Error>
             <ExitCodeStop>0</ExitCodeStop>
@@ -57,8 +54,8 @@
           <BeforeCompile>
             <RunUserProg1>0</RunUserProg1>
             <RunUserProg2>0</RunUserProg2>
-            <UserProg1Name></UserProg1Name>
-            <UserProg2Name></UserProg2Name>
+            <UserProg1Name/>
+            <UserProg2Name/>
             <UserProg1Dos16Mode>0</UserProg1Dos16Mode>
             <UserProg2Dos16Mode>0</UserProg2Dos16Mode>
             <nStopU1X>0</nStopU1X>
@@ -67,21 +64,21 @@
           <BeforeMake>
             <RunUserProg1>0</RunUserProg1>
             <RunUserProg2>0</RunUserProg2>
-            <UserProg1Name></UserProg1Name>
-            <UserProg2Name></UserProg2Name>
+            <UserProg1Name/>
+            <UserProg2Name/>
             <UserProg1Dos16Mode>0</UserProg1Dos16Mode>
             <UserProg2Dos16Mode>0</UserProg2Dos16Mode>
           </BeforeMake>
           <AfterMake>
             <RunUserProg1>1</RunUserProg1>
             <RunUserProg2>0</RunUserProg2>
             <UserProg1Name>fromelf.exe --bin -o hid_keyboard.bin ./output/hid_keyboard.axf</UserProg1Name>
-            <UserProg2Name></UserProg2Name>
+            <UserProg2Name/>
             <UserProg1Dos16Mode>0</UserProg1Dos16Mode>
             <UserProg2Dos16Mode>0</UserProg2Dos16Mode>
           </AfterMake>
           <SelectedForBatchBuild>0</SelectedForBatchBuild>
-          <SVCSIdString></SVCSIdString>
+          <SVCSIdString/>
         </TargetCommonOption>
         <CommonProperty>
           <UseCPPCompiler>0</UseCPPCompiler>
@@ -95,16 +92,16 @@
           <AssembleAssemblyFile>0</AssembleAssemblyFile>
           <PublicsOnly>0</PublicsOnly>
           <StopOnExitCode>3</StopOnExitCode>
-          <CustomArgument></CustomArgument>
-          <IncludeLibraryModules></IncludeLibraryModules>
+          <CustomArgument/>
+          <IncludeLibraryModules/>
         </CommonProperty>
         <DllOption>
           <SimDllName>SARMCM3.DLL</SimDllName>
-          <SimDllArguments></SimDllArguments>
+          <SimDllArguments/>
           <SimDlgDll>DCM.DLL</SimDlgDll>
           <SimDlgDllArguments>-pCM3</SimDlgDllArguments>
           <TargetDllName>SARMCM3.DLL</TargetDllName>
-          <TargetDllArguments></TargetDllArguments>
+          <TargetDllArguments/>
           <TargetDlgDll>TCM.DLL</TargetDlgDll>
           <TargetDlgDllArguments>-pCM3</TargetDlgDllArguments>
         </DllOption>
@@ -141,17 +138,17 @@
           <RunDebugAfterBuild>0</RunDebugAfterBuild>
           <TargetSelection>1</TargetSelection>
           <SimDlls>
-            <CpuDll></CpuDll>
-            <CpuDllArguments></CpuDllArguments>
-            <PeripheralDll></PeripheralDll>
-            <PeripheralDllArguments></PeripheralDllArguments>
+            <CpuDll/>
+            <CpuDllArguments/>
+            <PeripheralDll/>
+            <PeripheralDllArguments/>
             <InitializationFile>..\map.ini</InitializationFile>
           </SimDlls>
           <TargetDlls>
-            <CpuDll></CpuDll>
-            <CpuDllArguments></CpuDllArguments>
-            <PeripheralDll></PeripheralDll>
-            <PeripheralDllArguments></PeripheralDllArguments>
+            <CpuDll/>
+            <CpuDllArguments/>
+            <PeripheralDll/>
+            <PeripheralDllArguments/>
             <InitializationFile>.\init.ini</InitializationFile>
             <Driver>BIN\UL2CM3.DLL</Driver>
           </TargetDlls>
@@ -168,7 +165,7 @@
           <bUseTDR>0</bUseTDR>
           <Flash2>BIN\UL2CM3.DLL</Flash2>
           <Flash3>"" ()</Flash3>
-          <Flash4></Flash4>
+          <Flash4/>
         </Utilities>
         <TargetArmAds>
           <ArmAdsMisc>
@@ -200,7 +197,7 @@
             <RvctClst>0</RvctClst>
             <GenPPlst>0</GenPPlst>
             <AdsCpuType>"Cortex-M3"</AdsCpuType>
-            <RvctDeviceName></RvctDeviceName>
+            <RvctDeviceName/>
             <mOS>0</mOS>
             <uocRom>0</uocRom>
             <uocRam>0</uocRam>
@@ -297,8 +294,8 @@
               </OCR_RVCT3>
               <OCR_RVCT4>
                 <Type>1</Type>
-                <StartAddress>0x2a000</StartAddress>
-                <Size>0x5a000</Size>
+                <StartAddress>172032</StartAddress>
+                <Size>368640</Size>
               </OCR_RVCT4>
               <OCR_RVCT5>
                 <Type>1</Type>
@@ -322,16 +319,16 @@
               </OCR_RVCT8>
               <OCR_RVCT9>
                 <Type>0</Type>
-                <StartAddress>0x20007640</StartAddress>
-                <Size>0x89c0</Size>
+                <StartAddress>536901184</StartAddress>
+                <Size>35264</Size>
               </OCR_RVCT9>
               <OCR_RVCT10>
                 <Type>0</Type>
                 <StartAddress>0x0</StartAddress>
                 <Size>0x0</Size>
               </OCR_RVCT10>
             </OnChipMemories>
-            <RvctStartVector></RvctStartVector>
+            <RvctStartVector/>
           </ArmAdsMisc>
           <Cads>
             <interw>1</interw>
@@ -350,7 +347,7 @@
             <VariousControls>
               <MiscControls>--gnu</MiscControls>
               <Define>USE_STDPERIPH_DRIVER,BOARD_USE_KEYS</Define>
-              <Undefine></Undefine>
+              <Undefine/>
               <IncludePath>../../bundles/exp/inc;../../bundles/exp/inc/os;../../src/BSP;../../src/FWlib;../../src/StartUP/ing918;../../src/Tools;../../src</IncludePath>
             </VariousControls>
           </Cads>
@@ -364,10 +361,10 @@
             <NoWarn>0</NoWarn>
             <uSurpInc>0</uSurpInc>
             <VariousControls>
-              <MiscControls></MiscControls>
-              <Define></Define>
-              <Undefine></Undefine>
-              <IncludePath></IncludePath>
+              <MiscControls/>
+              <Define/>
+              <Undefine/>
+              <IncludePath/>
             </VariousControls>
           </Aads>
           <LDads>
@@ -379,12 +376,12 @@
             <useFile>0</useFile>
             <TextAddressRange>0x00000000</TextAddressRange>
             <DataAddressRange>0x00000000</DataAddressRange>
-            <ScatterFile></ScatterFile>
-            <IncludeLibs></IncludeLibs>
-            <IncludeLibsPath></IncludeLibsPath>
-            <Misc></Misc>
-            <LinkerInputFile></LinkerInputFile>
-            <DisabledWarnings></DisabledWarnings>
+            <ScatterFile/>
+            <IncludeLibs/>
+            <IncludeLibsPath/>
+            <Misc/>
+            <LinkerInputFile/>
+            <DisabledWarnings/>
           </LDads>
         </TargetArmAds>
       </TargetOption>
@@ -502,5 +499,4 @@
       </Groups>
     </Target>
   </Targets>
-
 </Project>
diff --git a/examples/hid_keyboard/src/profile.c b/examples/hid_keyboard/src/profile.c
@@ -481,6 +481,7 @@ static void user_packet_handler(uint8_t packet_type, uint16_t channel, const uin
         switch (hci_event_le_meta_get_subevent_code(packet))
         {
         case HCI_SUBEVENT_LE_ENHANCED_CONNECTION_COMPLETE:
+        case HCI_SUBEVENT_LE_ENHANCED_CONNECTION_COMPLETE_V2:
             att_set_db(decode_hci_le_meta_event(packet, le_meta_event_enh_create_conn_complete_t)->handle, att_db_util_get_address());
             handle_send = decode_hci_le_meta_event(packet, le_meta_event_enh_create_conn_complete_t)->handle;
             break;
-Original file line number
+Diff line change
@@ Expand Up / @@ -13,6 +13,6 @@ @@
         "version": [
 ,
 ,
         ]
     }