From 29dddeff4fb83f6074d97011a78b7b9aa847a676c52adfe8c9d1e63e50379fca Mon Sep 17 00:00:00 2001 From: AidarKC Date: Tue, 23 Jun 2026 19:03:32 +0400 Subject: [PATCH] =?UTF-8?q?ESP32:=20=D1=83=D0=B1=D1=80=D0=B0=D1=82=D1=8C?= =?UTF-8?q?=20=D0=B2=D1=80=D0=B5=D0=BC=D0=B5=D0=BD=D0=BD=D1=8B=D0=B9=20?= =?UTF-8?q?=D0=B0=D0=B2=D1=82=D0=BE=D0=B7=D0=B0=D0=BF=D1=83=D1=81=D0=BA=20?= =?UTF-8?q?homeserver?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../shine_homeserver_main.ino | 34 ------------------- VERSION.properties | 4 +-- 2 files changed, 2 insertions(+), 36 deletions(-) diff --git a/ESP32/esp32/ESP32-S3-Touch-AMOLED-2.16/main-device/shine_homeserver_main/shine_homeserver_main.ino b/ESP32/esp32/ESP32-S3-Touch-AMOLED-2.16/main-device/shine_homeserver_main/shine_homeserver_main.ino index 2d2d06c..7619b88 100644 --- a/ESP32/esp32/ESP32-S3-Touch-AMOLED-2.16/main-device/shine_homeserver_main/shine_homeserver_main.ino +++ b/ESP32/esp32/ESP32-S3-Touch-AMOLED-2.16/main-device/shine_homeserver_main/shine_homeserver_main.ino @@ -363,9 +363,6 @@ static String gRegisterConfirmBalanceLine; static String gRegisterConfirmPdaLine; static String gRegisterConfirmHomeserverLine; static bool gRegisterConfirmCanSubmit = false; -static bool gAutoHomeserverDebugPending = true; -static bool gAutoHomeserverDebugRunning = false; -static bool gAutoHomeserverDebugDone = false; static String gRegisterResultMessage; static String gRegisterResultDetails; static bool gRegisterResultSuccess = false; @@ -631,7 +628,6 @@ static bool awaitTransactionConfirmation(const String &signatureB58, String &mes static bool registerHomeserverOnSolana(String &messageOut); static void executeRegisterAccountFlow(const char *triggerSource, bool showResultScreen); static bool updateHomeserverSessionOnSolana(bool requireExisting, String &messageOut); -static void maybeAutoRunHomeserverAddDebug(); static void loadRegisterDiagDetailsFromPrefs(); static void saveRegisterDiagDetailsToPrefs(const String &details); static void clearRegisterDiagDetailsFromPrefs(); @@ -1496,7 +1492,6 @@ static void markAccountStateDirty() { gRegisterResultMessage = ""; gRegisterResultDetails = ""; gRegisterResultSuccess = false; - gAutoHomeserverDebugPending = true; clearShineSessionState(true); gShineStatusLine = "SHiNE: account not configured"; } @@ -3433,34 +3428,6 @@ static bool updateHomeserverSessionOnSolana(bool requireExisting, String &messag return true; } -static void maybeAutoRunHomeserverAddDebug() { - if (!gAutoHomeserverDebugPending || gAutoHomeserverDebugRunning || gAutoHomeserverDebugDone) { - return; - } - if (WiFi.status() != WL_CONNECTED) { - return; - } - if (!gSecretConfigured || !gHomeserverPdaCanAdd || !gShowHomeserverPdaActionButton) { - return; - } - - gAutoHomeserverDebugPending = false; - gAutoHomeserverDebugRunning = true; - gAutoHomeserverDebugDone = true; - gRegisterTriggerSource = "auto-boot-homeserver-add"; - - Serial.println("AUTO_HOMESERVER_ADD_BEGIN"); - String updateMessage; - bool ok = updateHomeserverSessionOnSolana(false, updateMessage); - if (ok) { - Serial.println("AUTO_HOMESERVER_ADD_OK"); - } else { - Serial.print("AUTO_HOMESERVER_ADD_FAIL: "); - Serial.println(updateMessage); - } - gAutoHomeserverDebugRunning = false; -} - static bool parseShineUserPdaBytes(const std::vector &bytes, ShinePdaUserState &outState, String &errorOut) { outState = ShinePdaUserState{}; errorOut = ""; @@ -7203,7 +7170,6 @@ void loop() { } manageWifiReconnect(); manageAccountPdaRefresh(); - maybeAutoRunHomeserverAddDebug(); manageShineConnection(); if (gBalanceAutoRefreshPending && gSecretConfigured && WiFi.status() == WL_CONNECTED) { diff --git a/VERSION.properties b/VERSION.properties index 605c001..f526657 100644 --- a/VERSION.properties +++ b/VERSION.properties @@ -1,2 +1,2 @@ -client.version=1.2.250 -server.version=1.2.235 +client.version=1.2.251 +server.version=1.2.236