wip

apple · Dec 12, 2024 · e0158cb · e0158cb
1 parent 7f52bd1
commit e0158cb
Show file tree

Hide file tree

Showing 20 changed files with 23 additions and 35 deletions.
diff --git a/...Documentation.docc/Resources/run-example-led-blink/walkthrough-example-led-blink-01.swift b/...Documentation.docc/Resources/run-example-led-blink/walkthrough-example-led-blink-01.swift
@@ -9,6 +9,6 @@
 //
 //===----------------------------------------------------------------------===//
 
-func app_main() {
+func main() {
   print("🏎️   Hello, Embedded Swift! (LED Blink)")
 }
diff --git a/...Documentation.docc/Resources/run-example-led-blink/walkthrough-example-led-blink-02.swift b/...Documentation.docc/Resources/run-example-led-blink/walkthrough-example-led-blink-02.swift
@@ -10,6 +10,6 @@
 //===----------------------------------------------------------------------===//
 
 @_cdecl("app_main")
-func app_main() {
+func main() {
   print("🏎️   Hello, Embedded Swift! (LED Blink)")
 }
diff --git a/...Documentation.docc/Resources/run-example-led-blink/walkthrough-example-led-blink-03.swift b/...Documentation.docc/Resources/run-example-led-blink/walkthrough-example-led-blink-03.swift
@@ -10,7 +10,7 @@
 //===----------------------------------------------------------------------===//
 
 @_cdecl("app_main")
-func app_main() {
+func main() {
   print("🏎️   Hello, Embedded Swift! (LED Blink)")
 
   let led = LED()

diff --git a/...Documentation.docc/Resources/run-example-led-blink/walkthrough-example-led-blink-04.swift b/...Documentation.docc/Resources/run-example-led-blink/walkthrough-example-led-blink-04.swift
@@ -10,7 +10,7 @@
 //===----------------------------------------------------------------------===//
 
 @_cdecl("app_main")
-func app_main() {
+func main() {
   print("🏎️   Hello, Embedded Swift! (LED Blink)")
 
   let led = LED()

diff --git a/...Documentation.docc/Resources/run-example-led-blink/walkthrough-example-led-blink-05.swift b/...Documentation.docc/Resources/run-example-led-blink/walkthrough-example-led-blink-05.swift
@@ -10,7 +10,7 @@
 //===----------------------------------------------------------------------===//
 
 @_cdecl("app_main")
-func app_main() {
+func main() {
   print("🏎️   Hello, Embedded Swift! (LED Blink)")
 
   let led = LED()

diff --git a/...mentation.docc/Resources/run-example-smart-light/walkthrough-example-smart-light-01.swift b/...mentation.docc/Resources/run-example-smart-light/walkthrough-example-smart-light-01.swift
@@ -10,6 +10,6 @@
 //===----------------------------------------------------------------------===//
 
 @_cdecl("app_main")
-func app_main() {
+func main() {
   print("🏎️   Hello, Embedded Swift! (Smart Light)")
 }
diff --git a/...mentation.docc/Resources/run-example-smart-light/walkthrough-example-smart-light-02.swift b/...mentation.docc/Resources/run-example-smart-light/walkthrough-example-smart-light-02.swift
@@ -10,7 +10,7 @@
 //===----------------------------------------------------------------------===//
 
 @_cdecl("app_main")
-func app_main() {
+func main() {
   print("🏎️   Hello, Embedded Swift! (Smart Light)")
 
   let led = LED()

diff --git a/...mentation.docc/Resources/run-example-smart-light/walkthrough-example-smart-light-03.swift b/...mentation.docc/Resources/run-example-smart-light/walkthrough-example-smart-light-03.swift
@@ -10,7 +10,7 @@
 //===----------------------------------------------------------------------===//
 
 @_cdecl("app_main")
-func app_main() {
+func main() {
   print("🏎️   Hello, Embedded Swift! (Smart Light)")
 
   let led = LED()

diff --git a/...ntation.docc/Resources/run-example-smart-light/walkthrough-example-smart-light-04-a.swift b/...ntation.docc/Resources/run-example-smart-light/walkthrough-example-smart-light-04-a.swift
@@ -10,7 +10,7 @@
 //===----------------------------------------------------------------------===//
 
 @_cdecl("app_main")
-func app_main() {
+func main() {
   print("🏎️   Hello, Embedded Swift! (Smart Light)")
 
   let led = LED()

diff --git a/...ntation.docc/Resources/run-example-smart-light/walkthrough-example-smart-light-04-b.swift b/...ntation.docc/Resources/run-example-smart-light/walkthrough-example-smart-light-04-b.swift
@@ -10,7 +10,7 @@
 //===----------------------------------------------------------------------===//
 
 @_cdecl("app_main")
-func app_main() {
+func main() {
   print("🏎️   Hello, Embedded Swift! (Smart Light)")
 
   let led = LED()

diff --git a/...ntation.docc/Resources/run-example-smart-light/walkthrough-example-smart-light-04-c.swift b/...ntation.docc/Resources/run-example-smart-light/walkthrough-example-smart-light-04-c.swift
@@ -10,7 +10,7 @@
 //===----------------------------------------------------------------------===//
 
 @_cdecl("app_main")
-func app_main() {
+func main() {
   print("🏎️   Hello, Embedded Swift! (Smart Light)")
 
   let led = LED()

diff --git a/...mentation.docc/Resources/run-example-smart-light/walkthrough-example-smart-light-04.swift b/...mentation.docc/Resources/run-example-smart-light/walkthrough-example-smart-light-04.swift
@@ -10,7 +10,7 @@
 //===----------------------------------------------------------------------===//
 
 @_cdecl("app_main")
-func app_main() {
+func main() {
   print("🏎️   Hello, Embedded Swift! (Smart Light)")
 
   let led = LED()

diff --git a/...mentation.docc/Resources/run-example-smart-light/walkthrough-example-smart-light-05.swift b/...mentation.docc/Resources/run-example-smart-light/walkthrough-example-smart-light-05.swift
@@ -10,7 +10,7 @@
 //===----------------------------------------------------------------------===//
 
 @_cdecl("app_main")
-func app_main() {
+func main() {
   print("🏎️   Hello, Embedded Swift! (Smart Light)")
 
   let led = LED()

diff --git a/...mentation.docc/Resources/run-example-smart-light/walkthrough-example-smart-light-06.swift b/...mentation.docc/Resources/run-example-smart-light/walkthrough-example-smart-light-06.swift
@@ -10,7 +10,7 @@
 //===----------------------------------------------------------------------===//
 
 @_cdecl("app_main")
-func app_main() {
+func main() {
   print("🏎️   Hello, Embedded Swift! (Smart Light)")
 
   let led = LED()

diff --git a/Sources/SwiftMatterExamples/Documentation.docc/Tutorials/Run-Example-LED-Blink.tutorial b/Sources/SwiftMatterExamples/Documentation.docc/Tutorials/Run-Example-LED-Blink.tutorial
@@ -64,16 +64,14 @@
 
     @Steps {
       @Step {
-        We start the application by declaring an **`app_main`** function with a print statement to show the application has started.
-
-        `app_main` serves the same purpose as a `main` function in a traditional user-land application and acts as the primary entry point for our firmware application.
+        We start the application by declaring an **`main`** function with a print statement to show the application has started.
 
         @Code(name: "Main.swift", file: "walkthrough-example-led-blink-01.swift", previousFile: "walkthrough-example-led-blink-00.swift")
       }
 
       @Step {
         We use the **`@_cdecl("app_main")`** attribute to generate a wrapper C symbol which is expected by ESP IDF.
-        
+
         > Important: Underscored attributes, like `@_cdecl`, are unstable features of the Swift compiler and may change behavior or break between compiler versions.        
 
         @Code(name: "Main.swift", file: "walkthrough-example-led-blink-02.swift", previousFile: "walkthrough-example-led-blink-01.swift")

diff --git a/empty-template/main/Main.swift b/empty-template/main/Main.swift
@@ -10,6 +10,6 @@
 //===----------------------------------------------------------------------===//
 
 @_cdecl("app_main")
-func app_main() {
+func main() {
   print("🏎️   Hello, Embedded Swift!")
 }
diff --git a/led-blink/main/Main.swift b/led-blink/main/Main.swift
@@ -10,7 +10,7 @@
 //===----------------------------------------------------------------------===//
 
 @_cdecl("app_main")
-func app_main() {
+func main() {
   print("🏎️   Hello, Embedded Swift! (LED Blink)")
 
   let led = LED()

diff --git a/smart-light/Matter/Clusters.swift b/smart-light/Matter/Clusters.swift
@@ -32,8 +32,6 @@ protocol MatterConcreteCluster: MatterCluster {
 struct ClusterID<Cluster: MatterCluster>: RawRepresentable {
   var rawValue: UInt32
 
-  init(rawValue: UInt32) { self.rawValue = rawValue }
-
   static var identify: ClusterID<Identify> { .init(rawValue: 0x0000_0003) }
   static var onOff: ClusterID<OnOff> { .init(rawValue: 0x0000_0006) }
   static var levelControl: ClusterID<LevelControl> {
@@ -65,8 +63,6 @@ struct Identify: MatterConcreteCluster {
   static var clusterTypeId: ClusterID<Self> { .identify }
   struct AttributeID<Attribute: MatterAttribute>: MatterAttributeID {
     var rawValue: UInt32
-
-    init(rawValue: UInt32) { self.rawValue = rawValue }
   }
 
   var cluster: UnsafeMutablePointer<esp_matter.cluster_t>
@@ -87,8 +83,6 @@ struct OnOff: MatterConcreteCluster {
   struct AttributeID<Attribute: MatterAttribute>: MatterAttributeID {
     var rawValue: UInt32
 
-    init(rawValue: UInt32) { self.rawValue = rawValue }
-
     static var state: AttributeID<OnOffState> { .init(rawValue: 0x0000_0000) }
   }
 
@@ -112,8 +106,6 @@ struct LevelControl: MatterConcreteCluster {
   struct AttributeID<Attribute: MatterAttribute>: MatterAttributeID {
     var rawValue: UInt32
 
-    init(rawValue: UInt32) { self.rawValue = rawValue }
-
     static var currentLevel: AttributeID<CurrentLevel> {
       .init(rawValue: 0x0000_0000)
     }
@@ -139,8 +131,6 @@ struct ColorControl: MatterConcreteCluster {
   struct AttributeID<Attribute: MatterAttribute>: MatterAttributeID {
     var rawValue: UInt32
 
-    init(rawValue: UInt32) { self.rawValue = rawValue }
-
     static var currentHue: AttributeID<CurrentHue> {
       .init(rawValue: 0x0000_0000)
     }

diff --git a/smart-light/Matter/Node.swift b/smart-light/Matter/Node.swift
@@ -36,17 +36,17 @@ struct RootNode: MatterNode {
     MatterAttributeEvent, Endpoint, Cluster, UInt32,
     UnsafeMutablePointer<esp_matter_attr_val_t>?
   ) -> Void
-  typealias identifyCallback = (
+  typealias IdentifyCallback = (
     esp_matter.identification.callback_type_t, UInt16, UInt8, UInt8
   ) -> Void
 
   final class Context {
     var attribute: AttributeCallback
-    var identify: identifyCallback
+    var identify: IdentifyCallback
 
     init(
       attribute: @escaping AttributeCallback,
-      identify: @escaping identifyCallback
+      identify: @escaping IdentifyCallback
     ) {
       self.attribute = attribute
       self.identify = identify
@@ -57,7 +57,7 @@ struct RootNode: MatterNode {
   let context: Context
 
   init?(
-    attribute: @escaping AttributeCallback, identify: @escaping identifyCallback
+    attribute: @escaping AttributeCallback, identify: @escaping IdentifyCallback
   ) {
     var nodeConfig = esp_matter.node.config_t()
     esp_matter.attribute.set_callback_shim {

diff --git a/smart-light/main/Main.swift b/smart-light/main/Main.swift
@@ -10,7 +10,7 @@
 //===----------------------------------------------------------------------===//
 
 @_cdecl("app_main")
-func app_main() {
+func main() {
   print("🏎️   Hello, Embedded Swift! (Smart Light)")
 
   let led = LED()