Fix lint/formatting in stm32-lvgl

Author: kubamracek

stm32-lvgl/Package.swift

@@ -47,11 +47,13 @@ let package = Package(
     //
     // HOST TARGETS
     //
-    
-    .executableTarget(name: "HostSDLApp", dependencies: [
+
+    .executableTarget(
+      name: "HostSDLApp",
+      dependencies: [
         .product(name: "SDL", package: "SwiftSDL2"),
-        "CLVGL"
-        ],
-        swiftSettings: [.enableExperimentalFeature("Extern")],
-        linkerSettings: [.unsafeFlags(["-L.build/lvgl-host/lib", "-llvgl", "-llvgl_demos"])]),
+        "CLVGL",
+      ],
+      swiftSettings: [.enableExperimentalFeature("Extern")],
+      linkerSettings: [.unsafeFlags(["-L.build/lvgl-host/lib", "-llvgl", "-llvgl_demos"])]),
   ])

stm32-lvgl/Sources/Application/Main.swift

@@ -55,14 +55,14 @@ struct Main {
     log("initSysTick")
     initSysTick()
 
+    log("TouchPanel.initialize()")
+    TouchPanel.initialize()
+
     // Everything is initialized now. Run application logic.
 
     //log("dramTest()")
     //dramTest()
 
-    log("TouchPanel.initialize()")
-    TouchPanel.initialize()
-
     log("lvglDemo()")
     lvglDemo()
   }
@@ -103,13 +103,11 @@ struct Main {
 
     let bufSize: UInt32 = UInt32(Lcd.LCD_WIDTH * Lcd.LCD_HEIGHT * 4)
     let buf1 = UnsafeMutableRawPointer(bitPattern: 0xC000_0000 as UInt)!
-    let buf2 = UnsafeMutableRawPointer(
-      bitPattern: (0xC000_0000 as UInt) + UInt(bufSize))!
+    let buf2 = UnsafeMutableRawPointer(bitPattern: (0xC000_0000 as UInt) + UInt(bufSize))!
 
     let disp = lv_display_create(Int32(Lcd.LCD_WIDTH), Int32(Lcd.LCD_HEIGHT))!
     lv_display_set_color_format(disp, LV_COLOR_FORMAT_ARGB8888)
-    lv_display_set_buffers(
-      disp, buf1, buf2, bufSize, LV_DISPLAY_RENDER_MODE_FULL)
+    lv_display_set_buffers(disp, buf1, buf2, bufSize, LV_DISPLAY_RENDER_MODE_FULL)
     lv_display_set_flush_cb(
       disp,
       { disp, _, bufferToShow in
@@ -140,10 +138,10 @@ struct Main {
           data!.pointee.point.x = Int32(touchData.x)
           data!.pointee.point.y = Int32(touchData.y)
           data!.pointee.state = LV_INDEV_STATE_PRESSED
-          print("pressed: \(touchData.x) \(touchData.y)")
+          //print("pressed: \(touchData.x) \(touchData.y)")
         } else {
           data!.pointee.state = LV_INDEV_STATE_RELEASED
-          print("released")
+          //print("released")
         }
       })
 
@@ -152,13 +150,12 @@ struct Main {
 
     log("LVGL setup done, starting render loop")
 
-    var frameCounter = 0
     while true {
       // If we're pending a render, wait.
       while lcdInterruptVerticalSyncHandler != nil { /* busy wait */ nop() }
 
       lv_timer_handler()
-      
+
       // Update UI of application logic
       UIAppLogic.updateFrame()
     }

stm32-lvgl/Sources/Application/UIAppLogic.swift

@@ -26,10 +26,10 @@ enum UIAppLogic {
   static var style = lv_style_t()
   static var labelStyle = lv_style_t()
   static var gradient = lv_grad_dsc_t()
-  
+
   static var widgetDemoScreen: OpaquePointer! = nil
 
-  static func createUI() {    
+  static func createUI() {
     // Get the active screen
     let screen = lv_screen_active()
 
@@ -60,21 +60,25 @@ enum UIAppLogic {
     buttonLabel = lv_label_create(button)
     lv_label_set_text(buttonLabel, "Click me")
     lv_obj_center(buttonLabel)
-    lv_obj_add_event_cb(button, { event in
+    lv_obj_add_event_cb(
+      button,
+      { event in
         Self.clickCount += 1
         lv_label_set_text(Self.buttonLabel, "Clicked \(Self.clickCount)")
       }, LV_EVENT_CLICKED, nil)
-      
+
     // Create a 'Demo' button in the bottom right
     let demoButton = lv_button_create(screen)
     lv_obj_set_size(demoButton, 120, 50)
     lv_obj_align(demoButton, LV_ALIGN_BOTTOM_RIGHT, -10, -10)
     let demoButtonLabel = lv_label_create(demoButton)
     lv_label_set_text(demoButtonLabel, "Widget Demo")
     lv_obj_center(demoButtonLabel)
-    lv_obj_add_event_cb(demoButton, { event in
+    lv_obj_add_event_cb(
+      demoButton,
+      { event in
         lv_screen_load(Self.widgetDemoScreen)
-    }, LV_EVENT_CLICKED, nil)
+      }, LV_EVENT_CLICKED, nil)
 
     // Create a label
     let label = lv_label_create(screen)
@@ -118,7 +122,7 @@ enum UIAppLogic {
     lv_label_set_text(spinnerLabel, "Loading...")
     lv_obj_align(spinnerLabel, LV_ALIGN_BOTTOM_LEFT, 20, -20)
     lv_obj_add_style(spinnerLabel, &labelStyle, 0)
-    
+
     // Create a 2nd screen with the widgets demo app from LVGL, then switch back
     // to the original screen.
     widgetDemoScreen = lv_obj_create(nil)

stm32-lvgl/Sources/HostSDLApp/Main.swift

@@ -38,14 +38,18 @@ struct Main {
     let disp = lv_display_create(Int32(drawSize.width), Int32(drawSize.height))!
     lv_display_set_color_format(disp, LV_COLOR_FORMAT_ARGB8888)
     lv_display_set_buffers(disp, buf1, buf2, bufSize, LV_DISPLAY_RENDER_MODE_FULL)
-    lv_display_set_flush_cb(disp, { disp, _, bufferToShow in
+    lv_display_set_flush_cb(
+      disp,
+      { disp, _, bufferToShow in
         _ = SDL_UpdateTexture(texture, nil, bufferToShow, Int32(drawSize.width * 4))
         lv_display_flush_ready(disp)
       })
 
     let touch = lv_indev_create()
     lv_indev_set_type(touch, LV_INDEV_TYPE_POINTER)
-    lv_indev_set_read_cb(touch, { indev, data in
+    lv_indev_set_read_cb(
+      touch,
+      { indev, data in
         if mouseEvent.type == SDL_MOUSEBUTTONDOWN.rawValue {
           data!.pointee.point.x = Int32(mouseEvent.button.x) / windowScale
           data!.pointee.point.y = Int32(mouseEvent.button.y) / windowScale