Improvements and bugfixes

src/epdgui/epdgui.cpp

@@ -68,7 +68,7 @@ void EPDGUI_Run(Frame_Base* frame) {
         frame_switch_count++;
     }
 
-    while (1) {
+    while (true) {
         if ((frame->isRun() == 0) || (frame->run() == 0)) {
             frame->exit();
             // M5.EPD.Clear();

src/frame/frame.h

@@ -3,11 +3,11 @@
 
 #include "frame_main.h"
 #include "frame_settings.h"
-#include "frame_setting_wallpaper.h"
+#include "frame_settings_wifi.h"
+#include "frame_settings_wallpaper.h"
 #include "frame_keyboard.h"
 #include "frame_factorytest.h"
-#include "frame_wifiscan.h"
+#include "frame_settings_wifi_password.h"
-#include "frame_wifipassword.h"
 #include "frame_lifegame.h"
 #include "frame_fileindex.h"
 #include "frame_txtreader.h"
@@ -15,4 +15,4 @@
 #include "frame_pictureviewer.h"
 #include "frame_home.h"
 
-#endif
+#endif // _FRAME_H_

src/frame/frame_factorytest.cpp

@@ -157,7 +157,7 @@ void Frame_FactoryTest::scan(String *ssid, int32_t *rssi) {
     WiFi.scanNetworks(true);
 
     int wifi_num;
-    while (1) {
+    while (true) {
         wifi_num = WiFi.scanComplete();
         if (wifi_num >= 0) {
             break;

src/frame/frame_main.cpp

@@ -2,11 +2,11 @@
 #include "frame_settings.h"
 #include "frame_keyboard.h"
 #include "frame_factorytest.h"
-#include "frame_wifiscan.h"
 #include "frame_lifegame.h"
 #include "frame_fileindex.h"
 #include "frame_compare.h"
 #include "frame_home.h"
+#include <WiFi.h>
 
 enum {
     kKeyFactoryTest = 0,
@@ -52,15 +52,15 @@ void key_factorytest_cb(epdgui_args_vector_t &args) {
     *((int*)(args[0])) = 0;
 }
 
-void key_wifiscan_cb(epdgui_args_vector_t &args) {
+// void key_wifiscan_cb(epdgui_args_vector_t &args) {
-    Frame_Base *frame = EPDGUI_GetFrame("Frame_WifiScan");
+//     Frame_Base *frame = EPDGUI_GetFrame("Frame_WifiScan");
-    if(frame == NULL) {
+//     if (frame == NULL) {
-        frame = new Frame_WifiScan();
+//         frame = new Frame_WifiScan();
-        EPDGUI_AddFrame("Frame_WifiScan", frame);
+//         EPDGUI_AddFrame("Frame_WifiScan", frame);
-    }
+//     }
-    EPDGUI_PushFrame(frame);
+//     EPDGUI_PushFrame(frame);
-    *((int*)(args[0])) = 0;
+//     *((int*)(args[0])) = 0;
-}
+// }
 
 void key_lifegame_cb(epdgui_args_vector_t &args) {
     Frame_Base *frame = EPDGUI_GetFrame("Frame_Lifegame");
@@ -137,11 +137,11 @@ Frame_Main::Frame_Main(void): Frame_Base(false) {
     _key[kKeyFactoryTest]->AddArgs(EPDGUI_Button::EVENT_RELEASED, 0, (void*)(&_is_run));
     _key[kKeyFactoryTest]->Bind(EPDGUI_Button::EVENT_RELEASED, key_factorytest_cb);
 
-    _key[kKeyWifiScan]->CanvasNormal()->pushImage(0, 0, 92, 92, ImageResource_main_icon_wifi_92x92);
+    // _key[kKeyWifiScan]->CanvasNormal()->pushImage(0, 0, 92, 92, ImageResource_main_icon_wifi_92x92);
-    *(_key[kKeyWifiScan]->CanvasPressed()) = *(_key[kKeyWifiScan]->CanvasNormal());
+    // *(_key[kKeyWifiScan]->CanvasPressed()) = *(_key[kKeyWifiScan]->CanvasNormal());
-    _key[kKeyWifiScan]->CanvasPressed()->ReverseColor();
+    // _key[kKeyWifiScan]->CanvasPressed()->ReverseColor();
-    _key[kKeyWifiScan]->AddArgs(EPDGUI_Button::EVENT_RELEASED, 0, (void*)(&_is_run));
+    // _key[kKeyWifiScan]->AddArgs(EPDGUI_Button::EVENT_RELEASED, 0, (void*)(&_is_run));
-    _key[kKeyWifiScan]->Bind(EPDGUI_Button::EVENT_RELEASED, key_wifiscan_cb);
+    // _key[kKeyWifiScan]->Bind(EPDGUI_Button::EVENT_RELEASED, key_wifiscan_cb);
 
     _key[kKeyLifeGame]->CanvasNormal()->pushImage(0, 0, 92, 92, ImageResource_main_icon_lifegame_92x92);
     *(_key[kKeyLifeGame]->CanvasPressed()) = *(_key[kKeyLifeGame]->CanvasNormal());
@@ -185,10 +185,10 @@ void Frame_Main::AppName(m5epd_update_mode_t mode) {
     _names->setTextSize(20);
     _names->fillCanvas(0);
 
-    _names->drawString("Wi-Fi", 20 + 46 + 3 * 136, 16);
     _names->drawString("Test", 20 + 46, 16);
     _names->drawString("Settings", 20 + 46 + 136, 16);
     _names->drawString("Keyboard", 20 + 46 + 2 * 136, 16);
+    _names->drawString("Wi-Fi", 20 + 46 + 3 * 136, 16);
     _names->pushCanvas(0, 186, mode);
     
     _names->fillCanvas(0);
@@ -209,6 +209,26 @@ void Frame_Main::StatusBar(m5epd_update_mode_t mode) {
     _bar->setTextDatum(CL_DATUM);
     _bar->drawString("M5Paper", 10, 27);
 
+    // Wi-Fi
+    const uint8_t *kIMGWifiLevel[4] = {
+        NULL,
+        ImageResource_item_icon_wifi_1_32x32,
+        ImageResource_item_icon_wifi_2_32x32,
+        ImageResource_item_icon_wifi_3_32x32
+    };
+    if (WiFi.status() == WL_CONNECTED) {
+        int rssi = WiFi.RSSI();
+        int level = 0;
+        if (rssi > -55) {
+            level = 3;
+        } else if (rssi > -88) {
+            level = 2;
+        } else {
+            level = 1;
+        }
+        _bar->pushImage(134, 8, 32, 32, kIMGWifiLevel[level]);
+    }
+
     // Battery
     _bar->setTextDatum(CR_DATUM);
     _bar->pushImage(498, 8, 32, 32, ImageResource_status_bar_battery_32x32);

src/frame/frame_settings.cpp

@@ -1,10 +1,11 @@
 #include "frame_settings.h"
-#include "frame_setting_wallpaper.h"
+#include "frame_settings_wifi.h"
+#include "frame_settings_wallpaper.h"
 #include "WiFi.h"
 
 #define KEY_W 92
 #define KEY_H 92
-const uint16_t kTimeZoneY = 460;
+const uint16_t kTimeZoneY = 500;
 
 void key_shutdown_cb(epdgui_args_vector_t &args) {
     M5.EPD.WriteFullGram4bpp(GetWallpaper());
@@ -16,7 +17,7 @@ void key_shutdown_cb(epdgui_args_vector_t &args) {
     M5.disableEXTPower();
     M5.disableMainPower();
     esp_deep_sleep_start();
-    while(1);
+    while (true);
 }
 
 void key_restart_cb(epdgui_args_vector_t &args) {
@@ -26,6 +27,16 @@ void key_restart_cb(epdgui_args_vector_t &args) {
     esp_restart();
 }
 
+void key_wifi2_cb(epdgui_args_vector_t &args) {
+    Frame_Base *frame = EPDGUI_GetFrame("Frame_Settings_Wifi");
+    if (frame == NULL) {
+        frame = new Frame_Settings_Wifi();
+        EPDGUI_AddFrame("Frame_Settings_Wifi", frame);
+    }
+    EPDGUI_PushFrame(frame);
+    *((int*)(args[0])) = 0;
+}
+
 void key_wallpaper_cb(epdgui_args_vector_t &args) {
     Frame_Base *frame = EPDGUI_GetFrame("Frame_Settings_Wallpaper");
     if (frame == NULL) {
@@ -37,7 +48,7 @@ void key_wallpaper_cb(epdgui_args_vector_t &args) {
 }
 
 void key_synctime_cb(epdgui_args_vector_t &args) {
-    SaveSetting();
+    // SaveSetting();
     M5EPD_Canvas info(&M5.EPD);
     M5EPD_Canvas *title = (M5EPD_Canvas*)(args[0]);
     M5EPD_Canvas *tzone = (M5EPD_Canvas*)(args[1]);
@@ -124,10 +135,11 @@ Frame_Settings::Frame_Settings(void) {
     _timezone_canvas->setTextColor(15);
     _timezone_canvas->setTextDatum(CL_DATUM);
  
-    _key_wallpaper = new EPDGUI_Button(4, 100, 532, 61);
+    _key_wifi = new EPDGUI_Button(4, 100, 532, 61);
-    _key_syncntp = new EPDGUI_Button(4, 160, 532, 61);
+    _key_wallpaper = new EPDGUI_Button(4, 160, 532, 61);
-    _key_restart = new EPDGUI_Button(4, 280, 532, 61);
+    _key_syncntp = new EPDGUI_Button(4, 220, 532, 61);
-    _key_shutdown = new EPDGUI_Button(4, 340, 532, 61);
+    _key_restart = new EPDGUI_Button(4, 320, 532, 61);
+    _key_shutdown = new EPDGUI_Button(4, 380, 532, 61);
 
     key_timezone_plus = new EPDGUI_Button("+", 448, kTimeZoneY, 88, 52);
     String str = String(GetTimeZone());
@@ -149,17 +161,21 @@ Frame_Settings::Frame_Settings(void) {
     key_timezone_minus->AddArgs(EPDGUI_Button::EVENT_RELEASED, 1, key_timezone_reset);
     key_timezone_minus->Bind(EPDGUI_Button::EVENT_RELEASED, key_timezone_minus_cb);
 
+    _key_wifi->setBMPButton("  Wi-Fi", "\u25B6", ImageResource_item_icon_wifi_3_32x32);
     _key_wallpaper->setBMPButton("  Wallpaper", "\u25B6", ImageResource_item_icon_wallpaper_32x32);
     _key_syncntp->setBMPButton("  Sync Time", "", ImageResource_item_icon_ntptime_32x32);
     _key_restart->setBMPButton("  Restart", "", ImageResource_item_icon_restart_32x32);
     _key_shutdown->setBMPButton("  Shutdown", "", ImageResource_item_icon_shutdown_32x32);
     _timezone_canvas->drawString("Time zone (UTC)", 15, 35);
     exitbtn("Home");
-    _canvas_title->drawString("Setting", 270, 34);
+    _canvas_title->drawString("Settings", 270, 34);
 
     _key_exit->AddArgs(EPDGUI_Button::EVENT_RELEASED, 0, (void*)(&_is_run));
     _key_exit->Bind(EPDGUI_Button::EVENT_RELEASED, &Frame_Base::exit_cb);
 
+    _key_wifi->AddArgs(EPDGUI_Button::EVENT_RELEASED, 0, (void*)(&_is_run));
+    _key_wifi->Bind(EPDGUI_Button::EVENT_RELEASED, &key_wifi2_cb);
+
     _key_wallpaper->AddArgs(EPDGUI_Button::EVENT_RELEASED, 0, (void*)(&_is_run));
     _key_wallpaper->Bind(EPDGUI_Button::EVENT_RELEASED, &key_wallpaper_cb);
 
@@ -173,6 +189,7 @@ Frame_Settings::Frame_Settings(void) {
 }
 
 Frame_Settings::~Frame_Settings(void) {
+    delete _key_wifi;
     delete _key_wallpaper;
     delete _key_shutdown;
     delete _key_restart;
@@ -184,6 +201,7 @@ int Frame_Settings::init(epdgui_args_vector_t &args) {
     M5.EPD.WriteFullGram4bpp(GetWallpaper());
     _canvas_title->pushCanvas(0, 8, UPDATE_MODE_NONE);
     _timezone_canvas->pushCanvas(0, kTimeZoneY, UPDATE_MODE_NONE);
+    EPDGUI_AddObject(_key_wifi);
     EPDGUI_AddObject(_key_wallpaper);
     EPDGUI_AddObject(_key_shutdown);
     EPDGUI_AddObject(_key_restart);

src/frame/frame_settings.h

@@ -12,6 +12,7 @@ public:
 
 
 private:
+    EPDGUI_Button *_key_wifi;
     EPDGUI_Button *_key_wallpaper;
     EPDGUI_Button *_key_shutdown;
     EPDGUI_Button *_key_restart;

src/frame/frame_settings_wallpaper.cpp

@@ -1,4 +1,4 @@
-#include "frame_setting_wallpaper.h"
+#include "frame_settings_wallpaper.h"
 
 void sw_wallpapers_cb(epdgui_args_vector_t &args) {
     SetWallpaper(*((uint32_t*)(args[0])));
@@ -21,7 +21,7 @@ Frame_Settings_Wallpaper::Frame_Settings_Wallpaper(void) {
     }
     _sw_wallpapers[GetWallpaperID()]->setState(1);
 
-    exitbtn("Setting");
+    exitbtn("Settings");
     _canvas_title->drawString("Wallpaper", 270, 34);
     
     _key_exit->AddArgs(EPDGUI_Button::EVENT_RELEASED, 0, (void*)(&_is_run));

src/frame/frame_settings_wifi.cpp

@@ -1,5 +1,5 @@
-#include "frame_wifiscan.h"
+#include "frame_settings_wifi.h"
-#include "frame_wifipassword.h"
+#include "frame_settings_wifi_password.h"
 #include <WiFi.h>
 
 #define MAX_BTN_NUM     14
@@ -7,31 +7,23 @@
 bool _update_flag = false;
 EPDGUI_Button *_connect_key = NULL;
 
-const uint8_t *kIMGWifiLevel[4] = {
-    NULL,
-    ImageResource_item_icon_wifi_1_32x32,
-    ImageResource_item_icon_wifi_2_32x32,
-    ImageResource_item_icon_wifi_3_32x32
-};
-
 void key_wifi_cb(epdgui_args_vector_t &args) {
     if (((EPDGUI_Button*)(args[0]))->GetCustomString() == "_$refresh$_") {
         _update_flag = true;
      } else {
         _connect_key = (EPDGUI_Button*)(args[0]);
-        Frame_Base *frame = EPDGUI_GetFrame("Frame_WifiPassword");
+        Frame_Base *frame = EPDGUI_GetFrame("Frame_Settings_Wifi_Password");
         if (frame == NULL) {
-            frame = new Frame_WifiPassword();
+            frame = new Frame_Settings_Wifi_Password();
-            EPDGUI_AddFrame("Frame_WifiPassword", frame);
+            EPDGUI_AddFrame("Frame_Settings_Wifi_Password", frame);
         }
         EPDGUI_PushFrame(frame);
         *((int*)(args[1])) = 0;
     }
 }
 
-
+Frame_Settings_Wifi::Frame_Settings_Wifi(void) {
-Frame_WifiScan::Frame_WifiScan(void) {
+    _frame_name = "Frame_Settings_Wifi";
-    _frame_name = "Frame_WifiScan";
 
     for (int i = 0; i < MAX_BTN_NUM; i++) {
         _key_wifi[i] = new EPDGUI_Button(4, 100 + i * 60, 532, 61);
@@ -44,7 +36,7 @@ Frame_WifiScan::Frame_WifiScan(void) {
         _key_wifi[i]->Bind(EPDGUI_Button::EVENT_RELEASED, key_wifi_cb);
     }
 
-    exitbtn("Home");
+    exitbtn("Settings");
     _canvas_title->drawString("Wi-Fi", 270, 34);
     
     _key_exit->AddArgs(EPDGUI_Button::EVENT_RELEASED, 0, (void*)(&_is_run));
@@ -54,13 +46,19 @@ Frame_WifiScan::Frame_WifiScan(void) {
     _connected = 0;
 }
 
-Frame_WifiScan::~Frame_WifiScan(void) {
+Frame_Settings_Wifi::~Frame_Settings_Wifi(void) {
     for (int i = 0; i < MAX_BTN_NUM; i++) {
         delete _key_wifi[i];
     }
 }
 
-void Frame_WifiScan::DrawItem(EPDGUI_Button *btn, String ssid, int rssi) {
+void Frame_Settings_Wifi::DrawItem(EPDGUI_Button *btn, String ssid, int rssi) {
+    const uint8_t *kIMGWifiLevel[4] = {
+        NULL,
+        ImageResource_item_icon_wifi_1_32x32,
+        ImageResource_item_icon_wifi_2_32x32,
+        ImageResource_item_icon_wifi_3_32x32
+    };
     int level = 0;
     if (rssi > -55) {
         level = 3;
@@ -82,7 +80,7 @@ void Frame_WifiScan::DrawItem(EPDGUI_Button *btn, String ssid, int rssi) {
     btn->CanvasPressed()->ReverseColor();
 }
 
-int Frame_WifiScan::run() {
+int Frame_Settings_Wifi::run() {
     if (_connect) {
         _connect = false;
         Connect();
@@ -94,7 +92,7 @@ int Frame_WifiScan::run() {
     return 1;
 }
 
-int Frame_WifiScan::scan() {
+int Frame_Settings_Wifi::scan() {
     WiFi.mode(WIFI_STA);
     // WiFi.disconnect();
     WiFi.scanNetworks(true);
@@ -108,7 +106,7 @@ int Frame_WifiScan::scan() {
     _scan_count++;
     
     int wifi_num;
-    while(1) {
+    while (true) {
         wifi_num = WiFi.scanComplete();
         if (wifi_num >= 0) {
             break;
@@ -150,7 +148,7 @@ int Frame_WifiScan::scan() {
     }
 
     int idx = 0, cnt = _connected;
-    while(1) {
+    while (true) {
         if (idx == connect_wifi_idx) {
             idx++;
             continue;
@@ -186,7 +184,7 @@ int Frame_WifiScan::scan() {
     return 0;
 }
 
-void Frame_WifiScan::Connect() {
+void Frame_Settings_Wifi::Connect() {
     int anime_cnt = 0;
     int x = 532 - 15 - 32;
     int y = _connect_key->getY() + 14;
@@ -239,11 +237,12 @@ void Frame_WifiScan::Connect() {
     _connected = 1;
 
     SetWifi(_connect_ssid, _connect_password);
+    log_d("Saved Wifi Network");
     SyncNTPTime();
     scan();
 }
 
-void Frame_WifiScan::SetConnected(String ssid, int rssi) {
+void Frame_Settings_Wifi::SetConnected(String ssid, int rssi) {
     _connect_ssid = ssid;
     DrawItem(_key_wifi[0], ssid, rssi);
     for (int i = 1; i < MAX_BTN_NUM; i++) {
@@ -254,9 +253,8 @@ void Frame_WifiScan::SetConnected(String ssid, int rssi) {
     _connected = 1;
 }
 
-int Frame_WifiScan::init(epdgui_args_vector_t &args) {
+int Frame_Settings_Wifi::init(epdgui_args_vector_t &args) {
     _is_run = 1;
-    _connect = false;
     M5.EPD.WriteFullGram4bpp(GetWallpaper());
     _canvas_title->pushCanvas(0, 8, UPDATE_MODE_NONE);
     if (args.size() > 0) {
@@ -283,6 +281,5 @@ int Frame_WifiScan::init(epdgui_args_vector_t &args) {
         _connect = false;
     }
     EPDGUI_AddObject(_key_exit);
-    
+    return 2;
-    return 3;
 }

src/frame/frame_settings_wifi.h

@@ -1,13 +1,13 @@
-#ifndef _FRAME_WIFISCAN_H_
+#ifndef _FRAME_SETTINGS_WIFI_H_
-#define _FRAME_WIFISCAN_H_
+#define _FRAME_SETTINGS_WIFI_H_
 
 #include "frame_base.h"
 #include "../epdgui/epdgui.h"
 
-class Frame_WifiScan : public Frame_Base {
+class Frame_Settings_Wifi : public Frame_Base {
 public:
-    Frame_WifiScan();
+    Frame_Settings_Wifi();
-    ~Frame_WifiScan();
+    ~Frame_Settings_Wifi();
     int init(epdgui_args_vector_t &args);
     int scan();
     int run();
@@ -24,4 +24,4 @@ private:
     String _connect_password;
 };
 
-#endif //_FRAME_SETTINGS_H_
+#endif //_FRAME_SETTINGS_WIFI_H_

src/frame/frame_settings_wifi_password.cpp

@@ -1,13 +1,12 @@
-#include "frame_wifipassword.h"
+#include "frame_settings_wifi_password.h"
 
 
 void key_passwordclear_cb(epdgui_args_vector_t &args) {
     ((EPDGUI_Textbox*)(args[0]))->SetText("");
 }
 
-
+Frame_Settings_Wifi_Password::Frame_Settings_Wifi_Password() : Frame_Base() {
-Frame_WifiPassword::Frame_WifiPassword() : Frame_Base() {
+    _frame_name = "Frame_Settings_Wifi_Password";
-    _frame_name = "Frame_WifiPassword";
     const uint16_t kKeyBaseY = 176;
     inputbox = new EPDGUI_Textbox(4, 100, 532, 60);
     key_textclear = new EPDGUI_Button("CLR", 4, kKeyBaseY, 260, 52);
@@ -27,13 +26,13 @@ Frame_WifiPassword::Frame_WifiPassword() : Frame_Base() {
     _key_exit->Bind(EPDGUI_Button::EVENT_RELEASED, &Frame_Base::exit_cb);
 }
 
-Frame_WifiPassword::~Frame_WifiPassword() {
+Frame_Settings_Wifi_Password::~Frame_Settings_Wifi_Password() {
     delete inputbox;
     delete keyboard;
     delete key_textclear;
 }
 
-int Frame_WifiPassword::init(epdgui_args_vector_t &args) {
+int Frame_Settings_Wifi_Password::init(epdgui_args_vector_t &args) {
     _is_run = 1;
     M5.EPD.Clear();
     _canvas_title->pushCanvas(0, 8, UPDATE_MODE_NONE);
@@ -44,11 +43,11 @@ int Frame_WifiPassword::init(epdgui_args_vector_t &args) {
     return 6;
 }
 
-int Frame_WifiPassword::run(void) {
+int Frame_Settings_Wifi_Password::run(void) {
     String data = keyboard->getData();
     if (data.indexOf("\n") >= 0) {
         String *pswd = new String(inputbox->GetText());
-        EPDGUI_AddFrameArg("Frame_WifiScan", 0, pswd);        
+        EPDGUI_AddFrameArg("Frame_Settings_Wifi", 0, pswd);        
         inputbox->SetText("");
         EPDGUI_PopFrame();
         _is_run = 0;

src/frame/frame_settings_wifi_password.h

@@ -0,0 +1,20 @@
+#ifndef _FRAME_SETTINGS_WIFI_PASSWORD_H_
+#define _FRAME_SETTINGS_WIFI_PASSWORD_H_
+
+#include "frame_base.h"
+#include "../epdgui/epdgui.h"
+
+class Frame_Settings_Wifi_Password : public Frame_Base {
+public:
+    Frame_Settings_Wifi_Password();
+    ~Frame_Settings_Wifi_Password();
+    int run();
+    int init(epdgui_args_vector_t &args);
+
+private:
+    EPDGUI_Textbox *inputbox;
+    EPDGUI_Keyboard *keyboard;
+    EPDGUI_Button *key_textclear;
+};
+
+#endif //_FRAME_SETTINGS_WIFI_PASSWORD_H_

src/frame/frame_wifipassword.h

@@ -1,20 +0,0 @@
-#ifndef _FRAME_WIFIPASSWORD_H_
-#define _FRAME_WIFIPASSWORD_H_
-
-#include "frame_base.h"
-#include "../epdgui/epdgui.h"
-
-class Frame_WifiPassword : public Frame_Base {
-public:
-    Frame_WifiPassword();
-    ~Frame_WifiPassword();
-    int run();
-    int init(epdgui_args_vector_t &args);
-
-private:
-    EPDGUI_Textbox *inputbox;
-    EPDGUI_Keyboard *keyboard;
-    EPDGUI_Button *key_textclear;
-};
-
-#endif //_FRAME_WIFIPASSWORD_H_

src/global_setting.cpp

@@ -110,9 +110,9 @@ const char *GetWallpaperName(uint16_t wallpaper_id) {
 
 esp_err_t LoadSetting(void) {
     nvs_handle nvs_arg;
-    NVS_CHECK(nvs_open("Setting", NVS_READONLY, &nvs_arg));
+    NVS_CHECK(nvs_open("settings", NVS_READONLY, &nvs_arg));
-    NVS_CHECK(nvs_get_u16(nvs_arg, "Wallpaper", &global_wallpaper));
+    NVS_CHECK(nvs_get_u16(nvs_arg, "wallpaper", &global_wallpaper));
-    NVS_CHECK(nvs_get_u8(nvs_arg, "Timesync", &global_time_synced));
+    NVS_CHECK(nvs_get_u8(nvs_arg, "time_synced", &global_time_synced));
     nvs_get_i8(nvs_arg, "timezone", &global_timezone);
 
     if (global_wallpaper >= WALLPAPER_NUM) {
@@ -126,6 +126,7 @@ esp_err_t LoadSetting(void) {
     length = 128;
     NVS_CHECK(nvs_get_str(nvs_arg, "pswd", buf, &length));
     global_wifi_password = String(buf);
+    if (!global_wifi_ssid.isEmpty() && !global_wifi_password.isEmpty())
         global_wifi_configed = true;
     nvs_close(nvs_arg);
     return ESP_OK;
@@ -133,9 +134,9 @@ esp_err_t LoadSetting(void) {
 
 esp_err_t SaveSetting(void) {
     nvs_handle nvs_arg;
-    NVS_CHECK(nvs_open("Setting", NVS_READWRITE, &nvs_arg));
+    NVS_CHECK(nvs_open("settings", NVS_READWRITE, &nvs_arg));
-    NVS_CHECK(nvs_set_u16(nvs_arg, "Wallpaper", global_wallpaper));
+    NVS_CHECK(nvs_set_u16(nvs_arg, "wallpaper", global_wallpaper));
-    NVS_CHECK(nvs_set_u8(nvs_arg, "Timesync", global_time_synced));
+    NVS_CHECK(nvs_set_u8(nvs_arg, "time_synced", global_time_synced));
     NVS_CHECK(nvs_set_i8(nvs_arg, "timezone", global_timezone));
     NVS_CHECK(nvs_set_str(nvs_arg, "ssid", global_wifi_ssid.c_str()));
     NVS_CHECK(nvs_set_str(nvs_arg, "pswd", global_wifi_password.c_str()));
@@ -209,7 +210,7 @@ void __LoadingAnime_32x32(void *pargs) {
     loading.pushCanvas(x, y, UPDATE_MODE_GL16);
     int anime_cnt = 0;
     uint32_t time = 0;
-    while (1) {
+    while (true) {
         if (millis() - time > 200) {
             time = millis();
             loading.pushImage(0, 0, 32, 32, GetLoadingIMG_32x32(anime_cnt));

src/resources/ImageResource.h

@@ -1,5 +1,5 @@
-#ifndef IMAGERESOURCE_H
+#ifndef _IMAGERESOURCE_H
-#define IMAGERESOURCE_H
+#define _IMAGERESOURCE_H
 
 // ----- ImageResource Overview -----
 // Name, Width x Height
@@ -3687,7 +3687,8 @@ const unsigned char ImageResource_backspace_32x32[512] = {
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, };
+	0x00, 0x00
+};
 
 const unsigned char ImageResource_factory_pass_h_100x40[2000] = {
 	0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 
@@ -3823,7 +3824,8 @@ const unsigned char ImageResource_factory_pass_h_100x40[2000] = {
 	0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 
 	0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 
 	0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 
-	0xFF, 0xFF, 0xFF, 0xFF, 0xFF, };
+	0xFF, 0xFF, 0xFF, 0xFF, 0xFF
+};
 
 const unsigned char ImageResource_factory_pass_v_40x100[2000] = {
 	0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 
@@ -3959,7 +3961,8 @@ const unsigned char ImageResource_factory_pass_v_40x100[2000] = {
 	0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 
 	0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 
 	0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 
-	0xFF, 0xFF, 0xFF, 0xFF, 0xFF, };
+	0xFF, 0xFF, 0xFF, 0xFF, 0xFF
+};
 
 const unsigned char ImageResource_factory_port_a_100x40[2000] = {
 	0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 
@@ -4095,7 +4098,8 @@ const unsigned char ImageResource_factory_port_a_100x40[2000] = {
 	0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 
 	0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 
 	0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 
-	0xFF, 0xFF, 0xFF, 0xFF, 0xFF, };
+	0xFF, 0xFF, 0xFF, 0xFF, 0xFF
+};
 
 const unsigned char ImageResource_factory_port_b_40x100[2000] = {
 	0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 
@@ -4231,7 +4235,8 @@ const unsigned char ImageResource_factory_port_b_40x100[2000] = {
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0F, 0xF0, 0x00, 0x00, 0x00, 0x00, 
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0F, 
 	0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 
-	0xFF, 0xFF, 0xFF, 0xFF, 0xFF, };
+	0xFF, 0xFF, 0xFF, 0xFF, 0xFF
+};
 
 const unsigned char ImageResource_factory_port_c_40x100[2000] = {
 	0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 
@@ -4367,7 +4372,8 @@ const unsigned char ImageResource_factory_port_c_40x100[2000] = {
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0F, 0xF0, 0x00, 0x00, 0x00, 0x00, 
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0F, 
 	0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 
-	0xFF, 0xFF, 0xFF, 0xFF, 0xFF, };
+	0xFF, 0xFF, 0xFF, 0xFF, 0xFF
+};
 
 const unsigned char ImageResource_home_air_background_228x184[20976] = {
 	0x00, 0x00, 0x00, 0x5A, 0xDF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 
@@ -5768,7 +5774,8 @@ const unsigned char ImageResource_home_air_background_228x184[20976] = {
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x0F, 0xFF, };
+	0x00, 0x00, 0x00, 0x00, 0x0F, 0xFF
+};
 
 const unsigned char ImageResource_home_air_background_l_116x44[2552] = {
 	0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 
@@ -5941,7 +5948,8 @@ const unsigned char ImageResource_home_air_background_l_116x44[2552] = {
 	0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 
 	0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 
 	0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 
-	0xFF, 0xFF, };
+	0xFF, 0xFF
+};
 
 const unsigned char ImageResource_home_air_background_r_112x44[2464] = {
 	0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 
@@ -6108,7 +6116,8 @@ const unsigned char ImageResource_home_air_background_r_112x44[2464] = {
 	0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 
 	0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 
 	0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFD, 
-	0xA5, 0x00, 0x00, 0x00, };
+	0xA5, 0x00, 0x00, 0x00
+};
 
 const unsigned char ImageResource_home_button_background_228x228[25992] = {
 	0x00, 0x00, 0x00, 0x5A, 0xDF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 
@@ -7843,7 +7852,8 @@ const unsigned char ImageResource_home_button_background_228x228[25992] = {
 	0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 
 	0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 
 	0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 
-	0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFD, 0xA5, 0x00, 0x00, 0x00, };
+	0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFD, 0xA5, 0x00, 0x00, 0x00
+};
 
 const unsigned char ImageResource_home_icon_conditioner_off_92x92[4232] = {
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
@@ -8128,7 +8138,8 @@ const unsigned char ImageResource_home_icon_conditioner_off_92x92[4232] = {
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, };
+	0x00, 0x00
+};
 
 const unsigned char ImageResource_home_icon_conditioner_on_92x92[4232] = {
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
@@ -8413,7 +8424,8 @@ const unsigned char ImageResource_home_icon_conditioner_on_92x92[4232] = {
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, };
+	0x00, 0x00
+};
 
 const unsigned char ImageResource_home_icon_light_off_92x92[4232] = {
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
@@ -8698,7 +8710,8 @@ const unsigned char ImageResource_home_icon_light_off_92x92[4232] = {
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, };
+	0x00, 0x00
+};
 
 const unsigned char ImageResource_home_icon_light_on_92x92[4232] = {
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
@@ -8983,7 +8996,8 @@ const unsigned char ImageResource_home_icon_light_on_92x92[4232] = {
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, };
+	0x00, 0x00
+};
 
 const unsigned char ImageResource_home_icon_socket_off_92x92[4232] = {
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
@@ -9268,7 +9282,8 @@ const unsigned char ImageResource_home_icon_socket_off_92x92[4232] = {
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, };
+	0x00, 0x00
+};
 
 const unsigned char ImageResource_home_icon_socket_on_92x92[4232] = {
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
@@ -9553,7 +9568,8 @@ const unsigned char ImageResource_home_icon_socket_on_92x92[4232] = {
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, };
+	0x00, 0x00
+};
 
 const unsigned char ImageResource_item_icon_arrow_l_32x32[512] = {
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
@@ -9590,7 +9606,8 @@ const unsigned char ImageResource_item_icon_arrow_l_32x32[512] = {
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, };
+	0x00, 0x00
+};
 
 const unsigned char ImageResource_item_icon_arrow_r_32x32[512] = {
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
@@ -9627,7 +9644,8 @@ const unsigned char ImageResource_item_icon_arrow_r_32x32[512] = {
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, };
+	0x00, 0x00
+};
 
 const unsigned char ImageResource_item_icon_file_floder_32x32[512] = {
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
@@ -9664,7 +9682,8 @@ const unsigned char ImageResource_item_icon_file_floder_32x32[512] = {
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, };
+	0x00, 0x00
+};
 
 const unsigned char ImageResource_item_icon_file_image_32x32[512] = {
 	0x00, 0x00, 0x07, 0xDF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xC5, 0x00, 0x00, 0x00, 0x00, 
@@ -9701,7 +9720,8 @@ const unsigned char ImageResource_item_icon_file_image_32x32[512] = {
 	0x00, 0xDF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFD, 0x00, 0x00, 
 	0x00, 0x00, 0x7F, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xF7, 0x00, 
 	0x00, 0x00, 0x00, 0x07, 0xEF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFE, 0x70, 
-	0x00, 0x00, };
+	0x00, 0x00
+};
 
 const unsigned char ImageResource_item_icon_file_text_32x32[512] = {
 	0x00, 0x00, 0x07, 0xDF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xC6, 0x00, 0x00, 0x00, 0x00, 
@@ -9738,7 +9758,8 @@ const unsigned char ImageResource_item_icon_file_text_32x32[512] = {
 	0x00, 0xDF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFD, 0x00, 0x00, 
 	0x00, 0x00, 0x7F, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xF7, 0x00, 
 	0x00, 0x00, 0x00, 0x07, 0xEF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFE, 0x70, 
-	0x00, 0x00, };
+	0x00, 0x00
+};
 
 const unsigned char ImageResource_item_icon_file_unknow_32x32[512] = {
 	0x00, 0x00, 0x07, 0xDF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xC5, 0x00, 0x00, 0x00, 0x00, 
@@ -9775,7 +9796,8 @@ const unsigned char ImageResource_item_icon_file_unknow_32x32[512] = {
 	0x00, 0xDF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFD, 0x00, 0x00, 
 	0x00, 0x00, 0x7F, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xF7, 0x00, 
 	0x00, 0x00, 0x00, 0x07, 0xEF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFE, 0x70, 
-	0x00, 0x00, };
+	0x00, 0x00
+};
 
 const unsigned char ImageResource_item_icon_ntptime_32x32[512] = {
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
@@ -9812,7 +9834,8 @@ const unsigned char ImageResource_item_icon_ntptime_32x32[512] = {
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, };
+	0x00, 0x00
+};
 
 const unsigned char ImageResource_item_icon_refresh_32x32[512] = {
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
@@ -9849,7 +9872,8 @@ const unsigned char ImageResource_item_icon_refresh_32x32[512] = {
 	0x00, 0x00, 0x00, 0x00, 0x02, 0x6A, 0xCE, 0xFE, 0xDA, 0x72, 0x00, 0x00, 0x00, 0x00, 0x00, 
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, };
+	0x00, 0x00
+};
 
 const unsigned char ImageResource_item_icon_restart_32x32[512] = {
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
@@ -9886,7 +9910,8 @@ const unsigned char ImageResource_item_icon_restart_32x32[512] = {
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x59, 0xCD, 0xFF, 0xC9, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, };
+	0x00, 0x00
+};
 
 const unsigned char ImageResource_item_icon_shutdown_32x32[512] = {
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
@@ -9923,7 +9948,8 @@ const unsigned char ImageResource_item_icon_shutdown_32x32[512] = {
 	0x00, 0x00, 0x00, 0x04, 0xAD, 0xEF, 0xFF, 0xFF, 0xFE, 0xDA, 0x40, 0x00, 0x00, 0x00, 0x00, 
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x14, 0x8B, 0xDE, 0xED, 0xB7, 0x41, 0x00, 0x00, 0x00, 0x00, 
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, };
+	0x00, 0x00
+};
 
 const unsigned char ImageResource_item_icon_success_32x32[512] = {
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
@@ -9960,7 +9986,8 @@ const unsigned char ImageResource_item_icon_success_32x32[512] = {
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, };
+	0x00, 0x00
+};
 
 const unsigned char ImageResource_item_icon_wallpaper_32x32[512] = {
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
@@ -9997,7 +10024,8 @@ const unsigned char ImageResource_item_icon_wallpaper_32x32[512] = {
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, };
+	0x00, 0x00
+};
 
 const unsigned char ImageResource_item_icon_wifi_1_32x32[512] = {
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
@@ -10034,7 +10062,8 @@ const unsigned char ImageResource_item_icon_wifi_1_32x32[512] = {
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, };
+	0x00, 0x00
+};
 
 const unsigned char ImageResource_item_icon_wifi_2_32x32[512] = {
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
@@ -10071,7 +10100,8 @@ const unsigned char ImageResource_item_icon_wifi_2_32x32[512] = {
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, };
+	0x00, 0x00
+};
 
 const unsigned char ImageResource_item_icon_wifi_3_32x32[512] = {
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
@@ -10108,7 +10138,8 @@ const unsigned char ImageResource_item_icon_wifi_3_32x32[512] = {
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, };
+	0x00, 0x00
+};
 
 const unsigned char ImageResource_item_loading_01_32x32[512] = {
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
@@ -10145,7 +10176,8 @@ const unsigned char ImageResource_item_loading_01_32x32[512] = {
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, };
+	0x00, 0x00
+};
 
 const unsigned char ImageResource_item_loading_02_32x32[512] = {
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
@@ -10182,7 +10214,8 @@ const unsigned char ImageResource_item_loading_02_32x32[512] = {
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, };
+	0x00, 0x00
+};
 
 const unsigned char ImageResource_item_loading_03_32x32[512] = {
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
@@ -10219,7 +10252,8 @@ const unsigned char ImageResource_item_loading_03_32x32[512] = {
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, };
+	0x00, 0x00
+};
 
 const unsigned char ImageResource_item_loading_04_32x32[512] = {
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
@@ -10256,7 +10290,8 @@ const unsigned char ImageResource_item_loading_04_32x32[512] = {
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xBF, 0xFB, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x34, 0x43, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, };
+	0x00, 0x00
+};
 
 const unsigned char ImageResource_item_loading_05_32x32[512] = {
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
@@ -10293,7 +10328,8 @@ const unsigned char ImageResource_item_loading_05_32x32[512] = {
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xBF, 0xFB, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x34, 0x43, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, };
+	0x00, 0x00
+};
 
 const unsigned char ImageResource_item_loading_06_32x32[512] = {
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
@@ -10330,7 +10366,8 @@ const unsigned char ImageResource_item_loading_06_32x32[512] = {
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xBF, 0xFB, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x34, 0x43, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, };
+	0x00, 0x00
+};
 
 const unsigned char ImageResource_item_loading_07_32x32[512] = {
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
@@ -10367,7 +10404,8 @@ const unsigned char ImageResource_item_loading_07_32x32[512] = {
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xBF, 0xFB, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x34, 0x43, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, };
+	0x00, 0x00
+};
 
 const unsigned char ImageResource_item_loading_08_32x32[512] = {
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
@@ -10404,7 +10442,8 @@ const unsigned char ImageResource_item_loading_08_32x32[512] = {
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xBF, 0xFB, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x34, 0x43, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, };
+	0x00, 0x00
+};
 
 const unsigned char ImageResource_item_loading_09_32x32[512] = {
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
@@ -10441,7 +10480,8 @@ const unsigned char ImageResource_item_loading_09_32x32[512] = {
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xBF, 0xFB, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x34, 0x43, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, };
+	0x00, 0x00
+};
 
 const unsigned char ImageResource_item_loading_10_32x32[512] = {
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
@@ -10478,7 +10518,8 @@ const unsigned char ImageResource_item_loading_10_32x32[512] = {
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xBF, 0xFB, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x34, 0x43, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, };
+	0x00, 0x00
+};
 
 const unsigned char ImageResource_item_loading_11_32x32[512] = {
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
@@ -10515,7 +10556,8 @@ const unsigned char ImageResource_item_loading_11_32x32[512] = {
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xBF, 0xFB, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x34, 0x43, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, };
+	0x00, 0x00
+};
 
 const unsigned char ImageResource_item_loading_12_32x32[512] = {
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
@@ -10552,7 +10594,8 @@ const unsigned char ImageResource_item_loading_12_32x32[512] = {
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, };
+	0x00, 0x00
+};
 
 const unsigned char ImageResource_item_loading_13_32x32[512] = {
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
@@ -10589,7 +10632,8 @@ const unsigned char ImageResource_item_loading_13_32x32[512] = {
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, };
+	0x00, 0x00
+};
 
 const unsigned char ImageResource_item_loading_14_32x32[512] = {
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
@@ -10626,7 +10670,8 @@ const unsigned char ImageResource_item_loading_14_32x32[512] = {
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, };
+	0x00, 0x00
+};
 
 const unsigned char ImageResource_item_loading_15_32x32[512] = {
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
@@ -10663,7 +10708,8 @@ const unsigned char ImageResource_item_loading_15_32x32[512] = {
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, };
+	0x00, 0x00
+};
 
 const unsigned char ImageResource_item_loading_16_32x32[512] = {
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
@@ -10700,7 +10746,8 @@ const unsigned char ImageResource_item_loading_16_32x32[512] = {
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, };
+	0x00, 0x00
+};
 
 const unsigned char ImageResource_lifegame_seeder_132x120[7920] = {
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
@@ -11541,7 +11588,8 @@ const unsigned char ImageResource_loading_01_96x96[4608] = {
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, };
+	0x00, 0x00, 0x00
+};
 
 const unsigned char ImageResource_loading_02_96x96[4608] = {
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
@@ -11851,7 +11899,8 @@ const unsigned char ImageResource_loading_02_96x96[4608] = {
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, };
+	0x00, 0x00, 0x00
+};
 
 const unsigned char ImageResource_loading_03_96x96[4608] = {
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
@@ -12161,7 +12210,8 @@ const unsigned char ImageResource_loading_03_96x96[4608] = {
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, };
+	0x00, 0x00, 0x00
+};
 
 const unsigned char ImageResource_loading_04_96x96[4608] = {
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
@@ -12471,7 +12521,8 @@ const unsigned char ImageResource_loading_04_96x96[4608] = {
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, };
+	0x00, 0x00, 0x00
+};
 
 const unsigned char ImageResource_loading_05_96x96[4608] = {
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
@@ -12781,7 +12832,8 @@ const unsigned char ImageResource_loading_05_96x96[4608] = {
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, };
+	0x00, 0x00, 0x00
+};
 
 const unsigned char ImageResource_loading_06_96x96[4608] = {
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
@@ -13091,7 +13143,8 @@ const unsigned char ImageResource_loading_06_96x96[4608] = {
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, };
+	0x00, 0x00, 0x00
+};
 
 const unsigned char ImageResource_loading_07_96x96[4608] = {
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
@@ -13401,7 +13454,8 @@ const unsigned char ImageResource_loading_07_96x96[4608] = {
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, };
+	0x00, 0x00, 0x00
+};
 
 const unsigned char ImageResource_loading_08_96x96[4608] = {
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
@@ -13711,7 +13765,8 @@ const unsigned char ImageResource_loading_08_96x96[4608] = {
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, };
+	0x00, 0x00, 0x00
+};
 
 const unsigned char ImageResource_loading_09_96x96[4608] = {
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
@@ -14021,7 +14076,8 @@ const unsigned char ImageResource_loading_09_96x96[4608] = {
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, };
+	0x00, 0x00, 0x00
+};
 
 const unsigned char ImageResource_loading_10_96x96[4608] = {
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
@@ -14331,7 +14387,8 @@ const unsigned char ImageResource_loading_10_96x96[4608] = {
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, };
+	0x00, 0x00, 0x00
+};
 
 const unsigned char ImageResource_loading_11_96x96[4608] = {
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
@@ -14641,7 +14698,8 @@ const unsigned char ImageResource_loading_11_96x96[4608] = {
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, };
+	0x00, 0x00, 0x00
+};
 
 const unsigned char ImageResource_loading_12_96x96[4608] = {
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
@@ -14951,7 +15009,8 @@ const unsigned char ImageResource_loading_12_96x96[4608] = {
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, };
+	0x00, 0x00, 0x00
+};
 
 const unsigned char ImageResource_loading_13_96x96[4608] = {
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
@@ -15261,7 +15320,8 @@ const unsigned char ImageResource_loading_13_96x96[4608] = {
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, };
+	0x00, 0x00, 0x00
+};
 
 const unsigned char ImageResource_loading_14_96x96[4608] = {
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
@@ -15571,7 +15631,8 @@ const unsigned char ImageResource_loading_14_96x96[4608] = {
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, };
+	0x00, 0x00, 0x00
+};
 
 const unsigned char ImageResource_loading_15_96x96[4608] = {
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
@@ -15881,7 +15942,8 @@ const unsigned char ImageResource_loading_15_96x96[4608] = {
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, };
+	0x00, 0x00, 0x00
+};
 
 const unsigned char ImageResource_loading_16_96x96[4608] = {
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
@@ -16191,7 +16253,8 @@ const unsigned char ImageResource_loading_16_96x96[4608] = {
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, };
+	0x00, 0x00, 0x00
+};
 
 const unsigned char ImageResource_loading_error_96x96[4608] = {
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
@@ -16501,7 +16564,8 @@ const unsigned char ImageResource_loading_error_96x96[4608] = {
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, };
+	0x00, 0x00, 0x00
+};
 
 const unsigned char ImageResource_loading_success_96x96[4608] = {
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
@@ -16811,7 +16875,8 @@ const unsigned char ImageResource_loading_success_96x96[4608] = {
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, };
+	0x00, 0x00, 0x00
+};
 
 const unsigned char ImageResource_main_icon_compare_92x92[4232] = {
 	0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 
@@ -17096,7 +17161,8 @@ const unsigned char ImageResource_main_icon_compare_92x92[4232] = {
 	0x0F, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 
 	0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 
 	0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 
-	0xFF, 0xFF, };
+	0xFF, 0xFF
+};
 
 const unsigned char ImageResource_main_icon_factorytest_92x92[4232] = {
 	0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 
@@ -17381,7 +17447,8 @@ const unsigned char ImageResource_main_icon_factorytest_92x92[4232] = {
 	0x0F, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 
 	0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 
 	0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 
-	0xFF, 0xFF, };
+	0xFF, 0xFF
+};
 
 const unsigned char ImageResource_main_icon_home_92x92[4232] = {
 	0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 
@@ -17666,7 +17733,8 @@ const unsigned char ImageResource_main_icon_home_92x92[4232] = {
 	0x0F, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 
 	0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 
 	0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 
-	0xFF, 0xFF, };
+	0xFF, 0xFF
+};
 
 const unsigned char ImageResource_main_icon_keyboard_92x92[4232] = {
 	0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 
@@ -17951,7 +18019,8 @@ const unsigned char ImageResource_main_icon_keyboard_92x92[4232] = {
 	0x0F, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 
 	0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 
 	0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 
-	0xFF, 0xFF, };
+	0xFF, 0xFF
+};
 
 const unsigned char ImageResource_main_icon_lifegame_92x92[4232] = {
 	0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 
@@ -18236,7 +18305,8 @@ const unsigned char ImageResource_main_icon_lifegame_92x92[4232] = {
 	0x0F, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 
 	0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 
 	0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 
-	0xFF, 0xFF, };
+	0xFF, 0xFF
+};
 
 const unsigned char ImageResource_main_icon_restart_92x92[4232] = {
 	0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 
@@ -18521,7 +18591,8 @@ const unsigned char ImageResource_main_icon_restart_92x92[4232] = {
 	0x0F, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 
 	0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 
 	0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 
-	0xFF, 0xFF, };
+	0xFF, 0xFF
+};
 
 const unsigned char ImageResource_main_icon_sdcard_92x92[4232] = {
 	0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 
@@ -18806,7 +18877,8 @@ const unsigned char ImageResource_main_icon_sdcard_92x92[4232] = {
 	0x0F, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 
 	0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 
 	0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 
-	0xFF, 0xFF, };
+	0xFF, 0xFF
+};
 
 const unsigned char ImageResource_main_icon_setting_92x92[4232] = {
 	0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 
@@ -19091,7 +19163,8 @@ const unsigned char ImageResource_main_icon_setting_92x92[4232] = {
 	0x0F, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 
 	0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 
 	0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 
-	0xFF, 0xFF, };
+	0xFF, 0xFF
+};
 
 const unsigned char ImageResource_main_icon_shutdown_92x92[4232] = {
 	0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 
@@ -19376,7 +19449,8 @@ const unsigned char ImageResource_main_icon_shutdown_92x92[4232] = {
 	0x0F, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 
 	0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 
 	0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 
-	0xFF, 0xFF, };
+	0xFF, 0xFF
+};
 
 const unsigned char ImageResource_main_icon_todo_92x92[4232] = {
 	0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 
@@ -19661,7 +19735,8 @@ const unsigned char ImageResource_main_icon_todo_92x92[4232] = {
 	0x0F, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 
 	0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 
 	0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 
-	0xFF, 0xFF, };
+	0xFF, 0xFF
+};
 
 const unsigned char ImageResource_main_icon_wifi_92x92[4232] = {
 	0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 
@@ -19946,7 +20021,8 @@ const unsigned char ImageResource_main_icon_wifi_92x92[4232] = {
 	0x0F, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 
 	0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 
 	0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 
-	0xFF, 0xFF, };
+	0xFF, 0xFF
+};
 
 const unsigned char ImageResource_status_bar_battery_32x32[512] = {
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
@@ -19983,7 +20059,8 @@ const unsigned char ImageResource_status_bar_battery_32x32[512] = {
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, };
+	0x00, 0x00
+};
 
 const unsigned char ImageResource_status_bar_battery_charging_32x32[512] = {
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
@@ -20020,7 +20097,8 @@ const unsigned char ImageResource_status_bar_battery_charging_32x32[512] = {
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, };
+	0x00, 0x00
+};
 
 const unsigned char ImageResource_upper_32x32[512] = {
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
@@ -20057,7 +20135,8 @@ const unsigned char ImageResource_upper_32x32[512] = {
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, };
+	0x00, 0x00
+};
 
 const unsigned char ImageResource_wallpaper_engine_540x960[259200] = {
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
@@ -71908,7 +71987,4 @@ const unsigned char ImageResource_wallpaper_penrose_triangle_540x960[259200] = {
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 };
 
-
+#endif // _IMAGERESOURCE_H
-
-#endif
-

src/resources/binaryttf.h

@@ -75711,4 +75711,4 @@ const unsigned char binaryttf[757076] = {
 0x2B, 0x2B, 0x2B, 0x2B, 0x2B, 0x2B, 0x2B, 0x2B, 0x2B, 0x2B, 
 0x2B, 0x2B, 0x2B, 0x2B, 0x2B, 0x1D, };
 
-#endif
+#endif // _BINARYTTF_H_

src/systeminit.cpp

@@ -10,7 +10,7 @@ QueueHandle_t xQueue_Info = xQueueCreate(20, sizeof(uint32_t));
 
 void WaitForUser(void) {
     SysInit_UpdateInfo("$ERR");
-    while(1) {
+    while (true) {
         M5.update();
         if (M5.BtnP.wasReleased()) {
             SysInit_UpdateInfo("$RESUME");
@@ -46,18 +46,14 @@ void SysInit_Start(void) {
 
     disableCore0WDT();
     xTaskCreatePinnedToCore(SysInit_Loading, "SysInit_Loading", 4096, NULL, 1, NULL, 0);
-    // SysInit_UpdateInfo("Initializing SD card...");
+    SysInit_UpdateInfo("Initializing SD card...");
-    bool is_factory_test;
     SPI.begin(14, 13, 12, 4);
     ret = SD.begin(4, SPI, 20000000);
     if (ret == false) {
-        is_factory_test = true;
         SetInitStatus(0, 0);
-        // log_e("Failed to initialize SD card.");
+        log_e("Failed to initialize SD card.");
         // SysInit_UpdateInfo("[ERROR] Failed to initialize SD card.");
         // WaitForUser();
-     } else {
-        is_factory_test = SD.exists("/__factory_test_flag__");
     }
 
     SysInit_UpdateInfo("Initializing Touch pad...");
@@ -72,73 +68,48 @@ void SysInit_Start(void) {
     LoadSetting();
     
     M5EPD_Canvas _initcanvas(&M5.EPD);
-    if((!is_factory_test) && SD.exists("/font.ttf")) {
+    if (SD.exists("/font.ttf")) {
         _initcanvas.loadFont("/font.ttf", SD);
         SetTTFLoaded(true);
     } else {
         _initcanvas.loadFont(binaryttf, sizeof(binaryttf));
         SetTTFLoaded(false);
-        is_factory_test = true;
     }
 
-    if(is_factory_test) {
-        SysInit_UpdateInfo("$OK");
-     } else {
     SysInit_UpdateInfo("Initializing system...");
-    }
 
     _initcanvas.createRender(26, 128);
 
     Frame_Main *frame_main = new Frame_Main();
     EPDGUI_PushFrame(frame_main);
-    Frame_FactoryTest *frame_factorytest = new Frame_FactoryTest();
+
-    EPDGUI_AddFrame("Frame_FactoryTest", frame_factorytest);
+    Frame_Settings_Wifi *frame_settings_wifi = new Frame_Settings_Wifi();
-    if(!is_factory_test) {
-        Frame_Settings *frame_setting = new Frame_Settings();
-        EPDGUI_AddFrame("Frame_Settings", frame_setting);
-        Frame_Settings_Wallpaper *frame_wallpaper = new Frame_Settings_Wallpaper();
-        EPDGUI_AddFrame("Frame_Settings_Wallpaper", frame_wallpaper);
-        Frame_Keyboard *frame_keyboard = new Frame_Keyboard();
-        EPDGUI_AddFrame("Frame_Keyboard", frame_keyboard);
-        Frame_WifiScan *frame_wifiscan = new Frame_WifiScan();
-        EPDGUI_AddFrame("Frame_WifiScan", frame_wifiscan);
-        Frame_WifiPassword *frame_wifipassword = new Frame_WifiPassword();
-        EPDGUI_AddFrame("Frame_WifiPassword", frame_wifipassword);
-        Frame_Lifegame *frame_lifegame = new Frame_Lifegame();
-        EPDGUI_AddFrame("Frame_Lifegame", frame_lifegame);
-        Frame_Compare *frame_compare = new Frame_Compare();
-        EPDGUI_AddFrame("Frame_Compare", frame_compare);
-        Frame_Home *frame_home = new Frame_Home();
-        EPDGUI_AddFrame("Frame_Home", frame_home);
 
     if (isWiFiConfiged()) {
         SysInit_UpdateInfo("Connect to " + GetWifiSSID() + "...");
         WiFi.begin(GetWifiSSID().c_str(), GetWifiPassword().c_str());
         uint32_t t = millis();
-            while (1) {
+        while (true) {
             if (millis() - t > 8000) {
                 break;
             }
 
             if (WiFi.status() == WL_CONNECTED) {
-                    frame_wifiscan->SetConnected(GetWifiSSID(), WiFi.RSSI());
+                frame_settings_wifi->SetConnected(GetWifiSSID(), WiFi.RSSI());
                 break;
             }
         }
     }
-    }
     
     log_d("done");
 
     while (uxQueueMessagesWaiting(xQueue_Info));
     
-    if(!is_factory_test) {
     SysInit_UpdateInfo("$OK");
-    }
     
     Serial.println("OK");
 
-    delay(500);
+    delay(1000);
 }
 
 void SysInit_Loading(void *pvParameters) {
@@ -159,7 +130,8 @@ void SysInit_Loading(void *pvParameters) {
         ImageResource_loading_13_96x96,
         ImageResource_loading_14_96x96,
         ImageResource_loading_15_96x96,
-        ImageResource_loading_16_96x96};
+        ImageResource_loading_16_96x96
+    };
 
     M5EPD_Canvas LoadingIMG(&M5.EPD);
     M5EPD_Canvas Info(&M5.EPD);
@@ -176,7 +148,7 @@ void SysInit_Loading(void *pvParameters) {
     int i = 0;
     char *p;
     uint32_t time = 0;
-    while (1) {
+    while (true) {
         if (millis() - time > 250) {
             time = millis();
             LoadingIMG.pushImage(0, 0, 96, 96, kLD[i]);
@@ -198,7 +170,7 @@ void SysInit_Loading(void *pvParameters) {
                 LoadingIMG.pushImage(0, 0, 96, 96, ImageResource_loading_error_96x96);
                 LoadingIMG.pushCanvas(220, kPosy + 80, UPDATE_MODE_GL16);
                 LoadingIMG.fillCanvas(0);
-                while(1) {
+                while (true) {
                     if (xQueueReceive(xQueue_Info, &p, 0)) {
                         String str(p);
                         free(p);