Apply clang-format 13

Author: ainyan03

src/common_header.h

@@ -1294,10 +1294,10 @@ struct draw_param_t : public config_param_t {
     uint8_t update_count      = 0;
     uint8_t modify_count      = 0;
     uint32_t draw_count       = 0;
-    int8_t battery_state = m5::Power_Class::charge_unknown;
-    int8_t battery_level = -1;
-    uint8_t font_height     = 8;
-    bool oncloud_conf_valid = false;
+    int8_t battery_state      = m5::Power_Class::charge_unknown;
+    int8_t battery_level      = -1;
+    uint8_t font_height       = 8;
+    bool oncloud_conf_valid   = false;
     uint8_t macaddr[8];
 
     enum cloud_status_t {
@@ -1316,10 +1316,10 @@ struct draw_param_t : public config_param_t {
     std::string
         net_tmp_pwd;  // APモードで設定のために一時的に利用するパスワード
     std::string net_ap_wifi_qr;  // Wi-Fi credentials for joining the setup AP
-    std::string net_ap_url;    // APモードアクセス用URL
-    std::string net_url_mdns;  // mDNS名アクセス用URL
-    std::string net_url_ip;    // mDNS名アクセス用URL
-    std::string net_hostname;  // DNS host label, without .local
+    std::string net_ap_url;      // APモードアクセス用URL
+    std::string net_url_mdns;    // mDNS名アクセス用URL
+    std::string net_url_ip;      // mDNS名アクセス用URL
+    std::string net_hostname;    // DNS host label, without .local
     std::string cloud_url;
     IPAddress cloud_ip;
 

src/main.cpp

@@ -1949,8 +1949,8 @@ class header_ui_t : public ui_base_t {
                 param->battery_state == m5::Power_Class::is_charging;
             const bool unknown =
                 param->battery_state == m5::Power_Class::charge_unknown;
-            const uint32_t color = charging ? 0x00FF00u
-                : (unknown ? 0x808080u : 0xFFFFFFu);
+            const uint32_t color =
+                charging ? 0x00FF00u : (unknown ? 0x808080u : 0xFFFFFFu);
             canvas->drawRect(xpos, y, 14, 10, color);
             canvas->fillRect(xpos + 14, y + 3, 2, 4, color);
             if (param->battery_level >= 0) {
@@ -2015,14 +2015,15 @@ class header_ui_t : public ui_base_t {
                     snprintf(countdown, sizeof(countdown), "%u",
                              unsigned(param->cloud_countdown_sec));
                     const lgfx::IFont* font = &fonts::Font2;
-                    if (canvas->textWidth(countdown, font) > xpos - _client_rect.x) {
+                    if (canvas->textWidth(countdown, font) >
+                        xpos - _client_rect.x) {
                         font = &fonts::Font0;
                     }
                     // Narrow layouts prioritize the three status icons.
-                    if (canvas->textWidth(countdown, font) <= xpos - _client_rect.x) {
-                        xpos -= canvas->drawString(countdown, xpos,
-                                                   _client_rect.y - canvas_y,
-                                                   font);
+                    if (canvas->textWidth(countdown, font) <=
+                        xpos - _client_rect.x) {
+                        xpos -= canvas->drawString(
+                            countdown, xpos, _client_rect.y - canvas_y, font);
                     }
                 }
             }
@@ -2244,7 +2245,7 @@ class image_ui_t : public ui_base_t {
                            param->range_temp_lower)
                           << 8) /
                          param->temp_diff;
-            v3 = (v3 < 0) ? 0 : (v3 > 255) ? 255 : v3;
+            v3         = (v3 < 0) ? 0 : (v3 > 255) ? 255 : v3;
             int32_t x1 = 0;
             for (int32_t fx = 1; fx < frame_width; ++fx) {
                 int32_t x0       = x1;
@@ -2280,7 +2281,7 @@ class image_ui_t : public ui_base_t {
                               canvas->getBuffer())[_client_rect.x + x0 +
                                                    ypos * canvas->width()];
                     for (int32_t bx = 0; bx < boxWidth; ++bx) {
-                        uint32_t v   = (v02 * (boxWidth - bx) + v13 * bx) >> 16;
+                        uint32_t v  = (v02 * (boxWidth - bx) + v13 * bx) >> 16;
                         img_buf[bx] = m5gfx::getSwap16(param->color_map[v]);
                     }
                 }
@@ -2896,9 +2897,8 @@ uint8_t changeLayout(uint8_t layout_idx) {
 }
 
 void drawTask(void*) {
-    ui_base_t* ui_list[] = {&text_ui,   &hist_ui,
-                            &image_ui,   &graph_ui,  &config_ui,
-                            &header_ui,  &qrcode_ui, &overlay_ui};
+    ui_base_t* ui_list[] = {&text_ui,   &hist_ui,   &image_ui,  &graph_ui,
+                            &config_ui, &header_ui, &qrcode_ui, &overlay_ui};
     static constexpr const uint32_t disp_buf_height = 16;
     static constexpr const size_t disp_buf_count =
         3;  // 描画バッファの数。jpegエンコーダのqueueにセットする分があるため3とする
@@ -3090,8 +3090,8 @@ static void wifiTask(void*) {
     bool rtc_sync = false;
     config_param_t::net_setup_mode_t prev_net_setup_mode =
         config_param_t::net_setup_mode_off;
-    bool prev_ap_connected  = false;
-    bool prev_sta_connected = false;
+    bool prev_ap_connected    = false;
+    bool prev_sta_connected   = false;
     uint32_t connect_retry_at = millis() + 15000;
 
     for (;;) {
@@ -3208,13 +3208,12 @@ static void wifiTask(void*) {
 
         const bool wifi_requested = (bool)draw_param.request_wifi_state;
         const bool ap_setup_active =
-            draw_param.net_setup_mode ==
-            draw_param.net_setup_mode_accesspoint;
+            draw_param.net_setup_mode == draw_param.net_setup_mode_accesspoint;
         const bool sta_enabled = WiFi.getMode() & WIFI_MODE_STA;
         if (!need_wifi_reconnect &&
-            (wifi_requested ? WiFi.isConnected()
-                            : (ap_setup_active ? !WiFi.isConnected()
-                                               : !sta_enabled))) {
+            (wifi_requested
+                 ? WiFi.isConnected()
+                 : (ap_setup_active ? !WiFi.isConnected() : !sta_enabled))) {
             continue;
         }
 
@@ -3231,7 +3230,7 @@ static void wifiTask(void*) {
                                     draw_param.net_setup_mode_off);
             }
             need_wifi_reconnect = false;
-            connect_retry_at = millis();
+            connect_retry_at    = millis();
         } else {
             if (int32_t(millis() - connect_retry_at) >= 0) {
                 if (!draw_param.net_tmp_ssid.empty()) {
@@ -3584,7 +3583,8 @@ void setup(void) {
 
     // DNS host labels cannot contain underscores. Keep the AP SSID unchanged.
     char hostname[32];
-    snprintf(hostname, sizeof(hostname), "t-lite-%02x%02x", macaddr[4], macaddr[5]);
+    snprintf(hostname, sizeof(hostname), "t-lite-%02x%02x", macaddr[4],
+             macaddr[5]);
     draw_param.net_hostname = hostname;
 
     char cbuf[32];
@@ -3608,7 +3608,8 @@ void setup(void) {
     // snprintf(cbuf, sizeof(cbuf), "http://%s/",
     // draw_param.net_apmode_ipaddr.toString().c_str()); draw_param.net_ap_url =
     // cbuf;
-    draw_param.net_ap_url = "http://" +
+    draw_param.net_ap_url =
+        "http://" +
         std::string(draw_param.net_apmode_ipaddr.toString().c_str()) + "/wifi";
 
     snprintf(cbuf, sizeof(cbuf), "%02x%02x%02x%02x%02x%02x", macaddr[0],

src/webserverTask.cpp

@@ -723,7 +723,8 @@ static bool response_wifi(draw_param_t* draw_param, connection_t* conn) {
             client->print(HTTP_200_html);
             client->print(
                 "<!DOCTYPE html><html><head><meta charset='UTF-8'>"
-                "<meta name='viewport' content='width=device-width,initial-scale=1'>"
+                "<meta name='viewport' "
+                "content='width=device-width,initial-scale=1'>"
                 "<title>T-Lite WiFi setup</title></head><body>"
                 "<h1>WiFi settings saved</h1>"
                 "<p>T-Lite is connecting to the selected network.</p>"
@@ -822,7 +823,7 @@ static bool response_wifi(draw_param_t* draw_param, connection_t* conn) {
         WiFi.scanDelete();
         WiFi.scanNetworks(true);
     }
-    int count = WiFi.scanComplete();
+    int count         = WiFi.scanComplete();
     bool scan_running = count == WIFI_SCAN_RUNNING;
     if (count == WIFI_SCAN_FAILED) {
         WiFi.scanNetworks(true);
@@ -868,7 +869,8 @@ static bool response_wifi(draw_param_t* draw_param, connection_t* conn) {
                 escaped.c_str());
         }
     }
-    client->print("<a href='javascript:void(0);' onclick='r()'>Refresh networks</a>");
+    client->print(
+        "<a href='javascript:void(0);' onclick='r()'>Refresh networks</a>");
     client->print("<datalist id='ssid-list'>");
     for (int i = 0; i < count; ++i) {
         const String ssid = WiFi.SSID(i);
@@ -904,17 +906,17 @@ static bool response_health(draw_param_t* draw_param, connection_t* conn) {
     const size_t heap_largest_dma =
         heap_caps_get_largest_free_block(MALLOC_CAP_DMA);
 
-    const TaskHandle_t wifi_task = xTaskGetHandle("wifiTask");
+    const TaskHandle_t wifi_task   = xTaskGetHandle("wifiTask");
     const TaskHandle_t stream_task = xTaskGetHandle("stream");
-    const UBaseType_t web_stack = uxTaskGetStackHighWaterMark(nullptr);
+    const UBaseType_t web_stack    = uxTaskGetStackHighWaterMark(nullptr);
     const UBaseType_t wifi_stack =
         wifi_task ? uxTaskGetStackHighWaterMark(wifi_task) : 0;
     const UBaseType_t stream_stack =
         stream_task ? uxTaskGetStackHighWaterMark(stream_task) : 0;
 
-    const wifi_mode_t wifi_mode = WiFi.getMode();
+    const wifi_mode_t wifi_mode   = WiFi.getMode();
     const wl_status_t wifi_status = WiFi.status();
-    const bool sta_connected = wifi_status == WL_CONNECTED;
+    const bool sta_connected      = wifi_status == WL_CONNECTED;
     const IPAddress sta_ip = sta_connected ? WiFi.localIP() : IPAddress();
     const IPAddress ap_ip =
         (wifi_mode & WIFI_AP) ? WiFi.softAPIP() : IPAddress();
@@ -1103,9 +1105,9 @@ void webserverTask(void* arg) {
     uint32_t conn_idx         = 0;
     bool prev_connected       = false;
     bool mdns_started         = false;
-    uint32_t mdns_retry_at     = 0;
-    uint32_t prev_sta_ip       = 0;
-    uint32_t prev_ap_ip        = 0;
+    uint32_t mdns_retry_at    = 0;
+    uint32_t prev_sta_ip      = 0;
+    uint32_t prev_ap_ip       = 0;
     uint8_t restart_countdown = 0;
     uint8_t prev_active_count = 0;
     uint8_t active_count      = 0;
@@ -1146,25 +1148,26 @@ void webserverTask(void* arg) {
             }
         }
         // AP and STA may change without the HTTP server becoming disconnected.
-        const uint32_t sta_ip = WiFi.isConnected() ? uint32_t(WiFi.localIP()) : 0;
-        const uint32_t ap_ip = (WiFi.getMode() & WIFI_MODE_AP)
-                                   ? uint32_t(WiFi.softAPIP()) : 0;
+        const uint32_t sta_ip =
+            WiFi.isConnected() ? uint32_t(WiFi.localIP()) : 0;
+        const uint32_t ap_ip =
+            (WiFi.getMode() & WIFI_MODE_AP) ? uint32_t(WiFi.softAPIP()) : 0;
         if (!sta_ip || sta_ip != prev_sta_ip || ap_ip != prev_ap_ip) {
             if (mdns_started) MDNS.end();
-            mdns_started = false;
+            mdns_started  = false;
             mdns_retry_at = millis();
-            prev_sta_ip = sta_ip;
-            prev_ap_ip = ap_ip;
+            prev_sta_ip   = sta_ip;
+            prev_ap_ip    = ap_ip;
         }
-        if (sta_ip && !mdns_started &&
-            int32_t(millis() - mdns_retry_at) >= 0) {
+        if (sta_ip && !mdns_started && int32_t(millis() - mdns_retry_at) >= 0) {
             mdns_started = MDNS.begin(draw_param->net_hostname.c_str());
             if (mdns_started) {
                 MDNS.addService("http", "tcp", 80);
             } else {
                 // begin() may fail after allocating the responder.
                 MDNS.end();
-                ESP_LOGW("mDNS", "Responder startup failed; retrying in 5 seconds");
+                ESP_LOGW("mDNS",
+                         "Responder startup failed; retrying in 5 seconds");
                 mdns_retry_at = millis() + 5000;
             }
         }