Upgrade ncp-uart-hw

NabuCasa · Aug 5, 2024 · 5e9be0b · 5e9be0b
1 parent fd9004c
commit 5e9be0b
Show file tree

Hide file tree

Showing 10 changed files with 163 additions and 18 deletions.
diff --git a/src/ncp-uart-hw/.cproject b/src/ncp-uart-hw/.cproject
diff --git a/src/ncp-uart-hw/config/pin_config.h b/src/ncp-uart-hw/config/pin_config.h
@@ -5,6 +5,22 @@
 // [CMU]$
 
 // $[LFXO]
+// LFXO LFXTAL_I on PD01
+#ifndef LFXO_LFXTAL_I_PORT                      
+#define LFXO_LFXTAL_I_PORT                       gpioPortD
+#endif
+#ifndef LFXO_LFXTAL_I_PIN                       
+#define LFXO_LFXTAL_I_PIN                        1
+#endif
+
+// LFXO LFXTAL_O on PD00
+#ifndef LFXO_LFXTAL_O_PORT                      
+#define LFXO_LFXTAL_O_PORT                       gpioPortD
+#endif
+#ifndef LFXO_LFXTAL_O_PIN                       
+#define LFXO_LFXTAL_O_PIN                        0
+#endif
+
 // [LFXO]$
 
 // $[PRS.ASYNCH0]

diff --git a/src/ncp-uart-hw/config/sl_board_control_config.h b/src/ncp-uart-hw/config/sl_board_control_config.h
@@ -53,4 +53,4 @@
 
 // <<< sl:end pin_tool >>>
 
-#endif // SL_BOARD_CONTROL_CONFIG_H
+#endif // SL_BOARD_CONTROL_CONFIG_H
diff --git a/src/ncp-uart-hw/config/sl_debug_swo_config.h b/src/ncp-uart-hw/config/sl_debug_swo_config.h
@@ -103,4 +103,4 @@
 // [GPIO_SL_DEBUG]$
 // <<< sl:end pin_tool >>>
 
-#endif // SL_DEBUG_SWO_CONFIG_H
+#endif // SL_DEBUG_SWO_CONFIG_H
diff --git a/src/ncp-uart-hw/config/sl_device_init_lfxo_config.h b/src/ncp-uart-hw/config/sl_device_init_lfxo_config.h
@@ -66,23 +66,28 @@
 // <<< sl:start pin_tool >>>
 // <lfxo signal=(LFXTAL_O),(LFXTAL_I),(LF_EXTCLK)> SL_DEVICE_INIT_LFXO
 // $[LFXO_SL_DEVICE_INIT_LFXO]
+#ifndef SL_DEVICE_INIT_LFXO_PERIPHERAL          
 #define SL_DEVICE_INIT_LFXO_PERIPHERAL           LFXO
+#endif
 
 // LFXO LFXTAL_O on PD00
+#ifndef SL_DEVICE_INIT_LFXO_LFXTAL_O_PORT       
 #define SL_DEVICE_INIT_LFXO_LFXTAL_O_PORT        gpioPortD
+#endif
+#ifndef SL_DEVICE_INIT_LFXO_LFXTAL_O_PIN        
 #define SL_DEVICE_INIT_LFXO_LFXTAL_O_PIN         0
+#endif
 
 // LFXO LFXTAL_I on PD01
+#ifndef SL_DEVICE_INIT_LFXO_LFXTAL_I_PORT       
 #define SL_DEVICE_INIT_LFXO_LFXTAL_I_PORT        gpioPortD
+#endif
+#ifndef SL_DEVICE_INIT_LFXO_LFXTAL_I_PIN        
 #define SL_DEVICE_INIT_LFXO_LFXTAL_I_PIN         1
-
+#endif
 
 // [LFXO_SL_DEVICE_INIT_LFXO]$
 
-// $[LFXO_EXTERNAL_DIGITAL_CLOCK]
-#define SL_DEVICE_INIT_LFXO_LF_EXTCLK_PORT         gpioPortD
-#define SL_DEVICE_INIT_LFXO_LF_EXTCLK_PIN          1
-// [LFXO_EXTERNAL_DIGITAL_CLOCK]$
 // <<< sl:end pin_tool >>>
 
-#endif // SL_DEVICE_INIT_LFXO_CONFIG_H
+#endif // SL_DEVICE_INIT_LFXO_CONFIG_H
diff --git a/src/ncp-uart-hw/config/sl_iostream_usart_vcom_config.h b/src/ncp-uart-hw/config/sl_iostream_usart_vcom_config.h
@@ -125,4 +125,4 @@
 // [USART_SL_IOSTREAM_USART_VCOM]$
 // <<< sl:end pin_tool >>>
 
-#endif
+#endif
diff --git a/src/ncp-uart-hw/config/sl_rail_util_pti_config.h b/src/ncp-uart-hw/config/sl_rail_util_pti_config.h
@@ -79,4 +79,4 @@
 
 // <<< sl:end pin_tool >>>
 
-#endif // SL_RAIL_UTIL_PTI_CONFIG_H
+#endif // SL_RAIL_UTIL_PTI_CONFIG_H
diff --git a/src/ncp-uart-hw/ncp-uart-hw.pintool b/src/ncp-uart-hw/ncp-uart-hw.pintool
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="ASCII"?>
-<device:XMLDevice xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:device="http://www.silabs.com/ss/hwconfig/document/device.ecore" name="pin_tool.EFR32MG21A010F1024IM32" partId="mcu.arm.efr32.mg21.efr32mg21a010f1024im32" contextId="com.silabs.sdk.stack.super:4.4.2._-295637085">
+<device:XMLDevice xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:device="http://www.silabs.com/ss/hwconfig/document/device.ecore" name="pin_tool.EFR32MG21A010F1024IM32" partId="mcu.arm.efr32.mg21.efr32mg21a010f1024im32" contextId="com.silabs.sdk.stack.super:4.4.3._-295637086">
   <mode name="DefaultMode">
     <property object="DefaultMode" propertyId="mode.diagramLocation" value="100, 100"/>
   </mode>

diff --git a/src/ncp-uart-hw/ncp-uart-hw.slcp b/src/ncp-uart-hw/ncp-uart-hw.slcp
@@ -26,7 +26,7 @@ source:
 - {path: main.c}
 - {path: app.c}
 tag: [prebuilt_demo]
-sdk: {id: gecko_sdk, version: 4.4.2}
+sdk: {id: gecko_sdk, version: 4.4.3}
 toolchain_settings: []
 component:
 - {id: EFR32MG21A010F1024IM32}

diff --git a/src/ncp-uart-hw/ncp-uart-hw.slps b/src/ncp-uart-hw/ncp-uart-hw.slps
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="ASCII"?>
 <model:MDescriptors xmlns:model="http://www.silabs.com/ss/Studio.ecore">
   <descriptors name="ncp-uart-hw">
-    <properties key="projectCommon.sdkId" value="com.silabs.sdk.stack.super:4.4.2._-295637085"/>
+    <properties key="projectCommon.sdkId" value="com.silabs.sdk.stack.super:4.4.3._-295637086"/>
     <properties key="universalConfig.relativeWorkspacePath" value="../ncp-uart-hw.slcw"/>
     <properties key="universalConfig.generationDirectory" value=""/>
     <properties key="universalConfig.toolchainCompatibility" value="iar gcc"/>
@@ -12,5 +12,6 @@
     <properties key="projectCommon.toolchainId" value="com.silabs.ss.tool.ide.arm.toolchain.gnu.cdt:12.2.1.20221205"/>
     <properties key="universalConfig.projectTypeIds" value="com.silabs.ss.framework.ide.project.core.cdtMbsProjectType"/>
     <properties key="projectCommon.importModeId" value="LINK_LIBRARIES"/>
+    <properties key="universalConfig.compSelProjInstanceId" value="1722887056067"/>
   </descriptors>
 </model:MDescriptors>
Original file line number	Diff line number	Diff line change
Expand Up		@@ -53,4 +53,4 @@

		// <<< sl:end pin_tool >>>

		#endif // SL_BOARD_CONTROL_CONFIG_H
		#endif // SL_BOARD_CONTROL_CONFIG_H
-Original file line number
+Diff line change
@@ Expand Up / @@ -125,4 +125,4 @@ @@
     // [USART_SL_IOSTREAM_USART_VCOM]$
     // <<< sl:end pin_tool >>>
-    #endif
+    #endif
Original file line number	Diff line number	Diff line change
Expand Up		@@ -79,4 +79,4 @@

		// <<< sl:end pin_tool >>>

		#endif // SL_RAIL_UTIL_PTI_CONFIG_H
		#endif // SL_RAIL_UTIL_PTI_CONFIG_H