Revert "add a .clang-format file (#9154)" (#9172)

I thought git would be smart enough to understand all the whitespace changes but even with all the flags I know to make it ignore theses it still blows up if there are identical changes on both sides. I have a solution but it require creating a new commit at the merge base for each conflicting PR and merging it into develop. I don't think blowing up all PRs is worth for now, maybe if we can coordinate this for V3 let's say. This reverts commit 0d11331d18.
2026-01-25 03:07:44 +00:00 · 2026-01-04 12:15:53 +01:00
parent 0d11331d18
commit beb268ff25
771 changed files with 83399 additions and 77967 deletions
--- a/src/graphics/tftSetup.cpp
+++ b/src/graphics/tftSetup.cpp
@@ -18,110 +18,120 @@ DeviceScreen *deviceScreen = nullptr;

 #ifdef ARCH_ESP32
 // Get notified when the system is entering light sleep
-CallbackObserver<DeviceScreen, void *> tftSleepObserver = CallbackObserver<DeviceScreen, void *>(deviceScreen, &DeviceScreen::prepareSleep);
+CallbackObserver<DeviceScreen, void *> tftSleepObserver =
+    CallbackObserver<DeviceScreen, void *>(deviceScreen, &DeviceScreen::prepareSleep);
 CallbackObserver<DeviceScreen, esp_sleep_wakeup_cause_t> endSleepObserver =
    CallbackObserver<DeviceScreen, esp_sleep_wakeup_cause_t>(deviceScreen, &DeviceScreen::wakeUp);
 #endif

-void tft_task_handler(void *param = nullptr) {
-  while (true) {
-    spiLock->lock();
-    deviceScreen->task_handler();
-    spiLock->unlock();
-    deviceScreen->sleep();
-  }
+void tft_task_handler(void *param = nullptr)
+{
+    while (true) {
+        spiLock->lock();
+        deviceScreen->task_handler();
+        spiLock->unlock();
+        deviceScreen->sleep();
+    }
 }

-void tftSetup(void) {
+void tftSetup(void)
+{
 #ifndef ARCH_PORTDUINO
-  deviceScreen = &DeviceScreen::create();
-  PacketAPI::create(PacketServer::init());
-  deviceScreen->init(new PacketClient);
-#else
-  if (portduino_config.displayPanel != no_screen) {
-    DisplayDriverConfig displayConfig;
-    static char *panels[] = {"NOSCREEN", "X11", "FB", "ST7789", "ST7735", "ST7735S", "ST7796", "ILI9341", "ILI9342", "ILI9486", "ILI9488", "HX8357D"};
-    static char *touch[] = {"NOTOUCH", "XPT2046", "STMPE610", "GT911", "FT5x06"};
-#if defined(USE_X11)
-    if (portduino_config.displayPanel == x11) {
-      if (portduino_config.displayWidth && portduino_config.displayHeight)
-        displayConfig = DisplayDriverConfig(DisplayDriverConfig::device_t::X11, (uint16_t)portduino_config.displayWidth,
-                                            (uint16_t)portduino_config.displayHeight);
-      else
-        displayConfig.device(DisplayDriverConfig::device_t::X11);
-    } else
-#elif defined(USE_FRAMEBUFFER)
-    if (portduino_config.displayPanel == fb) {
-      if (portduino_config.displayWidth && portduino_config.displayHeight)
-        displayConfig =
-            DisplayDriverConfig(DisplayDriverConfig::device_t::FB, (uint16_t)portduino_config.displayWidth, (uint16_t)portduino_config.displayHeight);
-      else
-        displayConfig.device(DisplayDriverConfig::device_t::FB);
-    } else
-#endif
-    {
-      displayConfig.device(DisplayDriverConfig::device_t::CUSTOM_TFT)
-          .panel(
-              DisplayDriverConfig::panel_config_t{.type = panels[portduino_config.displayPanel],
-                                                  .panel_width = (uint16_t)portduino_config.displayWidth,
-                                                  .panel_height = (uint16_t)portduino_config.displayHeight,
-                                                  .rotation = (bool)portduino_config.displayRotate,
-                                                  .pin_cs = (int16_t)portduino_config.displayCS.pin,
-                                                  .pin_rst = (int16_t)portduino_config.displayReset.pin,
-                                                  .offset_x = (uint16_t)portduino_config.displayOffsetX,
-                                                  .offset_y = (uint16_t)portduino_config.displayOffsetY,
-                                                  .offset_rotation = (uint8_t)portduino_config.displayOffsetRotate,
-                                                  .invert = portduino_config.displayInvert ? true : false,
-                                                  .rgb_order = (bool)portduino_config.displayRGBOrder,
-                                                  .dlen_16bit = portduino_config.displayPanel == ili9486 || portduino_config.displayPanel == ili9488})
-          .bus(DisplayDriverConfig::bus_config_t{
-              .freq_write = (uint32_t)portduino_config.displayBusFrequency,
-              .freq_read = 16000000,
-              .spi{.pin_dc = (int8_t)portduino_config.displayDC.pin, .use_lock = true, .spi_host = (uint16_t)portduino_config.display_spi_dev_int}})
-          .input(
-              DisplayDriverConfig::input_config_t{.keyboardDevice = portduino_config.keyboardDevice, .pointerDevice = portduino_config.pointerDevice})
-          .light(DisplayDriverConfig::light_config_t{.pin_bl = (int16_t)portduino_config.displayBacklight.pin,
-                                                     .pwm_channel = (int8_t)portduino_config.displayBacklightPWMChannel.pin,
-                                                     .invert = (bool)portduino_config.displayBacklightInvert});
-      if (portduino_config.touchscreenI2CAddr == -1) {
-        displayConfig.touch(DisplayDriverConfig::touch_config_t{.type = touch[portduino_config.touchscreenModule],
-                                                                .freq = (uint32_t)portduino_config.touchscreenBusFrequency,
-                                                                .pin_int = (int16_t)portduino_config.touchscreenIRQ.pin,
-                                                                .offset_rotation = (uint8_t)portduino_config.touchscreenRotate,
-                                                                .spi{
-                                                                    .spi_host = (int8_t)portduino_config.touchscreen_spi_dev_int,
-                                                                },
-                                                                .pin_cs = (int16_t)portduino_config.touchscreenCS.pin});
-      } else {
-        displayConfig.touch(DisplayDriverConfig::touch_config_t{
-            .type = touch[portduino_config.touchscreenModule],
-            .freq = (uint32_t)portduino_config.touchscreenBusFrequency,
-            .x_min = 0,
-            .x_max = (int16_t)((portduino_config.touchscreenRotate & 1 ? portduino_config.displayWidth : portduino_config.displayHeight) - 1),
-            .y_min = 0,
-            .y_max = (int16_t)((portduino_config.touchscreenRotate & 1 ? portduino_config.displayHeight : portduino_config.displayWidth) - 1),
-            .pin_int = (int16_t)portduino_config.touchscreenIRQ.pin,
-            .offset_rotation = (uint8_t)portduino_config.touchscreenRotate,
-            .i2c{.i2c_addr = (uint8_t)portduino_config.touchscreenI2CAddr}});
-      }
-    }
-    deviceScreen = &DeviceScreen::create(&displayConfig);
+    deviceScreen = &DeviceScreen::create();
    PacketAPI::create(PacketServer::init());
    deviceScreen->init(new PacketClient);
-  } else {
-    LOG_INFO("Running without TFT display!");
-  }
+#else
+    if (portduino_config.displayPanel != no_screen) {
+        DisplayDriverConfig displayConfig;
+        static char *panels[] = {"NOSCREEN", "X11",     "FB",      "ST7789",  "ST7735",  "ST7735S",
+                                 "ST7796",   "ILI9341", "ILI9342", "ILI9486", "ILI9488", "HX8357D"};
+        static char *touch[] = {"NOTOUCH", "XPT2046", "STMPE610", "GT911", "FT5x06"};
+#if defined(USE_X11)
+        if (portduino_config.displayPanel == x11) {
+            if (portduino_config.displayWidth && portduino_config.displayHeight)
+                displayConfig = DisplayDriverConfig(DisplayDriverConfig::device_t::X11, (uint16_t)portduino_config.displayWidth,
+                                                    (uint16_t)portduino_config.displayHeight);
+            else
+                displayConfig.device(DisplayDriverConfig::device_t::X11);
+        } else
+#elif defined(USE_FRAMEBUFFER)
+        if (portduino_config.displayPanel == fb) {
+            if (portduino_config.displayWidth && portduino_config.displayHeight)
+                displayConfig = DisplayDriverConfig(DisplayDriverConfig::device_t::FB, (uint16_t)portduino_config.displayWidth,
+                                                    (uint16_t)portduino_config.displayHeight);
+            else
+                displayConfig.device(DisplayDriverConfig::device_t::FB);
+        } else
+#endif
+        {
+            displayConfig.device(DisplayDriverConfig::device_t::CUSTOM_TFT)
+                .panel(DisplayDriverConfig::panel_config_t{.type = panels[portduino_config.displayPanel],
+                                                           .panel_width = (uint16_t)portduino_config.displayWidth,
+                                                           .panel_height = (uint16_t)portduino_config.displayHeight,
+                                                           .rotation = (bool)portduino_config.displayRotate,
+                                                           .pin_cs = (int16_t)portduino_config.displayCS.pin,
+                                                           .pin_rst = (int16_t)portduino_config.displayReset.pin,
+                                                           .offset_x = (uint16_t)portduino_config.displayOffsetX,
+                                                           .offset_y = (uint16_t)portduino_config.displayOffsetY,
+                                                           .offset_rotation = (uint8_t)portduino_config.displayOffsetRotate,
+                                                           .invert = portduino_config.displayInvert ? true : false,
+                                                           .rgb_order = (bool)portduino_config.displayRGBOrder,
+                                                           .dlen_16bit = portduino_config.displayPanel == ili9486 ||
+                                                                         portduino_config.displayPanel == ili9488})
+                .bus(DisplayDriverConfig::bus_config_t{.freq_write = (uint32_t)portduino_config.displayBusFrequency,
+                                                       .freq_read = 16000000,
+                                                       .spi{.pin_dc = (int8_t)portduino_config.displayDC.pin,
+                                                            .use_lock = true,
+                                                            .spi_host = (uint16_t)portduino_config.display_spi_dev_int}})
+                .input(DisplayDriverConfig::input_config_t{.keyboardDevice = portduino_config.keyboardDevice,
+                                                           .pointerDevice = portduino_config.pointerDevice})
+                .light(DisplayDriverConfig::light_config_t{.pin_bl = (int16_t)portduino_config.displayBacklight.pin,
+                                                           .pwm_channel = (int8_t)portduino_config.displayBacklightPWMChannel.pin,
+                                                           .invert = (bool)portduino_config.displayBacklightInvert});
+            if (portduino_config.touchscreenI2CAddr == -1) {
+                displayConfig.touch(
+                    DisplayDriverConfig::touch_config_t{.type = touch[portduino_config.touchscreenModule],
+                                                        .freq = (uint32_t)portduino_config.touchscreenBusFrequency,
+                                                        .pin_int = (int16_t)portduino_config.touchscreenIRQ.pin,
+                                                        .offset_rotation = (uint8_t)portduino_config.touchscreenRotate,
+                                                        .spi{
+                                                            .spi_host = (int8_t)portduino_config.touchscreen_spi_dev_int,
+                                                        },
+                                                        .pin_cs = (int16_t)portduino_config.touchscreenCS.pin});
+            } else {
+                displayConfig.touch(DisplayDriverConfig::touch_config_t{
+                    .type = touch[portduino_config.touchscreenModule],
+                    .freq = (uint32_t)portduino_config.touchscreenBusFrequency,
+                    .x_min = 0,
+                    .x_max = (int16_t)((portduino_config.touchscreenRotate & 1 ? portduino_config.displayWidth
+                                                                               : portduino_config.displayHeight) -
+                                       1),
+                    .y_min = 0,
+                    .y_max = (int16_t)((portduino_config.touchscreenRotate & 1 ? portduino_config.displayHeight
+                                                                               : portduino_config.displayWidth) -
+                                       1),
+                    .pin_int = (int16_t)portduino_config.touchscreenIRQ.pin,
+                    .offset_rotation = (uint8_t)portduino_config.touchscreenRotate,
+                    .i2c{.i2c_addr = (uint8_t)portduino_config.touchscreenI2CAddr}});
+            }
+        }
+        deviceScreen = &DeviceScreen::create(&displayConfig);
+        PacketAPI::create(PacketServer::init());
+        deviceScreen->init(new PacketClient);
+    } else {
+        LOG_INFO("Running without TFT display!");
+    }
 #endif

-  if (deviceScreen) {
+    if (deviceScreen) {
 #ifdef ARCH_ESP32
-    tftSleepObserver.observe(&notifyLightSleep);
-    endSleepObserver.observe(&notifyLightSleepEnd);
-    xTaskCreatePinnedToCore(tft_task_handler, "tft", 10240, NULL, 1, NULL, 0);
+        tftSleepObserver.observe(&notifyLightSleep);
+        endSleepObserver.observe(&notifyLightSleepEnd);
+        xTaskCreatePinnedToCore(tft_task_handler, "tft", 10240, NULL, 1, NULL, 0);
 #elif defined(ARCH_PORTDUINO)
-    std::thread *tft_task = new std::thread([] { tft_task_handler(); });
+        std::thread *tft_task = new std::thread([] { tft_task_handler(); });
 #endif
-  }
+    }
 }

 #endif