snark13/Xteink-X4-crosspoint-reader
1
0
Fork 0
mirror of https://github.com/daveallie/crosspoint-reader.git synced 2026-02-04 22:57:50 +03:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

format files

Browse Source
This commit is contained in:
Eliz Kilic 2026-02-01 20:59:25 +00:00
parent d4c8e13698
commit cb7f3313f0
5 changed files with 77 additions and 84 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

108
src/activities/network/AutoConnectingActivity.cpp
View File

@ -1,81 +1,75 @@
#include "AutoConnectingActivity.h" #include "AutoConnectingActivity.h"
#include <string>
#include <WiFi.h>
#include <GfxRenderer.h> #include <GfxRenderer.h>
#include "MappedInputManager.h" #include <WiFi.h>
#include "fontIds.h"
#include "CrossPointSettings.h"
#include "WifiCredentialStore.h"
AutoConnectingActivity::AutoConnectingActivity( #include <string>
GfxRenderer& renderer,
MappedInputManager& mappedInput, #include "CrossPointSettings.h"
const std::function<void()>& on_success, #include "MappedInputManager.h"
const std::function<void()>& on_failure #include "WifiCredentialStore.h"
) : Activity("AutoConnecting", renderer, mappedInput), #include "fontIds.h"
on_success(on_success),
on_failure(on_failure) {} AutoConnectingActivity::AutoConnectingActivity(GfxRenderer& renderer, MappedInputManager& mappedInput,
const std::function<void()>& on_success,
const std::function<void()>& on_failure)
: Activity("AutoConnecting", renderer, mappedInput), on_success(on_success), on_failure(on_failure) {}
void AutoConnectingActivity::onEnter() { void AutoConnectingActivity::onEnter() {
Activity::onEnter(); Activity::onEnter();
render(); render();
attemptConnection(); attemptConnection();
} }
void AutoConnectingActivity::onExit() { void AutoConnectingActivity::onExit() { Activity::onExit(); }
Activity::onExit();
}
void AutoConnectingActivity::loop() { void AutoConnectingActivity::loop() { checkConnectionStatus(); }
checkConnectionStatus();
}
void AutoConnectingActivity::attemptConnection() { void AutoConnectingActivity::attemptConnection() {
connectionStartTime = millis(); connectionStartTime = millis();
std::string ssid = SETTINGS.lastConnectedSSID; std::string ssid = SETTINGS.lastConnectedSSID;
const auto* cred = WIFI_STORE.findCredential(ssid); const auto* cred = WIFI_STORE.findCredential(ssid);
if (!cred) { if (!cred) {
on_failure(); on_failure();
return; return;
} }
WiFi.mode(WIFI_STA); WiFi.mode(WIFI_STA);
WiFi.begin(ssid.c_str(), cred->password.c_str()); WiFi.begin(ssid.c_str(), cred->password.c_str());
} }
void AutoConnectingActivity::checkConnectionStatus() { void AutoConnectingActivity::checkConnectionStatus() {
const wl_status_t status = WiFi.status(); const wl_status_t status = WiFi.status();
if (status == WL_CONNECTED) { if (status == WL_CONNECTED) {
on_success(); on_success();
return; return;
} }
if (status == WL_CONNECT_FAILED || status == WL_NO_SSID_AVAIL) { if (status == WL_CONNECT_FAILED || status == WL_NO_SSID_AVAIL) {
on_failure(); on_failure();
return; return;
} }
if (millis() - connectionStartTime > CONNECTION_TIMEOUT_MS) { if (millis() - connectionStartTime > CONNECTION_TIMEOUT_MS) {
WiFi.disconnect(); WiFi.disconnect();
on_failure(); on_failure();
return; return;
} }
} }
void AutoConnectingActivity::render() const { void AutoConnectingActivity::render() const {
renderer.clearScreen(); renderer.clearScreen();
const auto pageHeight = renderer.getScreenHeight(); const auto pageHeight = renderer.getScreenHeight();
const auto height = renderer.getLineHeight(UI_10_FONT_ID); const auto height = renderer.getLineHeight(UI_10_FONT_ID);
const auto top = (pageHeight - height) / 2; const auto top = (pageHeight - height) / 2;
renderer.drawCenteredText(UI_12_FONT_ID, top - 40, "Connecting...", true, EpdFontFamily::BOLD); renderer.drawCenteredText(UI_12_FONT_ID, top - 40, "Connecting...", true, EpdFontFamily::BOLD);
std::string ssidInfo = "to " + std::string(SETTINGS.lastConnectedSSID); std::string ssidInfo = "to " + std::string(SETTINGS.lastConnectedSSID);
if (ssidInfo.length() > 25) { if (ssidInfo.length() > 25) {
ssidInfo.replace(22, ssidInfo.length() - 22, "..."); ssidInfo.replace(22, ssidInfo.length() - 22, "...");
} }
renderer.drawCenteredText(UI_10_FONT_ID, top, ssidInfo.c_str()); renderer.drawCenteredText(UI_10_FONT_ID, top, ssidInfo.c_str());
renderer.displayBuffer(); renderer.displayBuffer();
} }

35
src/activities/network/AutoConnectingActivity.h
View File

@ -1,29 +1,26 @@
#pragma once #pragma once
#include "activities/Activity.h"
#include <functional> #include <functional>
#include "activities/Activity.h"
class AutoConnectingActivity final : public Activity { class AutoConnectingActivity final : public Activity {
public: public:
AutoConnectingActivity( AutoConnectingActivity(GfxRenderer& renderer, MappedInputManager& mappedInput,
GfxRenderer& renderer, const std::function<void()>& on_success, const std::function<void()>& on_failure);
MappedInputManager& mappedInput,
const std::function<void()>& on_success,
const std::function<void()>& on_failure
);
void onEnter() override; void onEnter() override;
void onExit() override; void onExit() override;
void loop() override; void loop() override;
private: private:
void render() const; void render() const;
void attemptConnection(); void attemptConnection();
void checkConnectionStatus(); void checkConnectionStatus();
const std::function<void()> on_success; const std::function<void()> on_success;
const std::function<void()> on_failure; const std::function<void()> on_failure;
unsigned long connectionStartTime = 0; unsigned long connectionStartTime = 0;
static constexpr unsigned long CONNECTION_TIMEOUT_MS = 15000; static constexpr unsigned long CONNECTION_TIMEOUT_MS = 15000;
}; };

4
src/activities/network/WifiSelectionActivity.cpp
View File

@ -6,11 +6,11 @@
#include <algorithm> #include <algorithm>
#include <map> #include <map>
#include "CrossPointSettings.h"
#include "MappedInputManager.h" #include "MappedInputManager.h"
#include "WifiCredentialStore.h" #include "WifiCredentialStore.h"
#include "activities/util/KeyboardEntryActivity.h" #include "activities/util/KeyboardEntryActivity.h"
#include "fontIds.h" #include "fontIds.h"
#include "CrossPointSettings.h"
void WifiSelectionActivity::taskTrampoline(void* param) { void WifiSelectionActivity::taskTrampoline(void* param) {
auto* self = static_cast<WifiSelectionActivity*>(param); auto* self = static_cast<WifiSelectionActivity*>(param);
@ -364,7 +364,7 @@ void WifiSelectionActivity::loop() {
xSemaphoreGive(renderingMutex); xSemaphoreGive(renderingMutex);
// Update the network list to reflect the change // Update the network list to reflect the change
const auto network = std::find_if(networks.begin(), networks.end(), const auto network = std::find_if(networks.begin(), networks.end(),
[this](const WifiNetworkInfo& net) { return net.ssid == selectedSSID; }); [this](const WifiNetworkInfo& net) { return net.ssid == selectedSSID; });
if (network != networks.end()) { if (network != networks.end()) {
network->hasSavedPassword = false; network->hasSavedPassword = false;
} }

4
src/activities/settings/SettingsActivity.cpp
View File

@ -53,7 +53,9 @@ const SettingInfo systemSettings[systemSettingsCount] = {
SettingInfo::Enum("Time to Sleep", &CrossPointSettings::sleepTimeout, SettingInfo::Enum("Time to Sleep", &CrossPointSettings::sleepTimeout,
{"1 min", "5 min", "10 min", "15 min", "30 min"}), {"1 min", "5 min", "10 min", "15 min", "30 min"}),
SettingInfo::Action("Network"), SettingInfo::Action("Network"),
SettingInfo::Action("KOReader Sync"), SettingInfo::Action("OPDS Browser"), SettingInfo::Action("Clear Cache"), SettingInfo::Action("KOReader Sync"),
SettingInfo::Action("OPDS Browser"),
SettingInfo::Action("Clear Cache"),
SettingInfo::Action("Check for updates")}; SettingInfo::Action("Check for updates")};
} // namespace } // namespace

8
src/main.cpp
View File

@ -5,6 +5,7 @@
#include <HalGPIO.h> #include <HalGPIO.h>
#include <SDCardManager.h> #include <SDCardManager.h>
#include <SPI.h> #include <SPI.h>
#include <WiFi.h>
#include <builtinFonts/all.h> #include <builtinFonts/all.h>
#include <cstring> #include <cstring>
@ -20,14 +21,13 @@
#include "activities/browser/OpdsBookBrowserActivity.h" #include "activities/browser/OpdsBookBrowserActivity.h"
#include "activities/home/HomeActivity.h" #include "activities/home/HomeActivity.h"
#include "activities/home/MyLibraryActivity.h" #include "activities/home/MyLibraryActivity.h"
#include "activities/network/AutoConnectingActivity.h"
#include "activities/network/CrossPointWebServerActivity.h" #include "activities/network/CrossPointWebServerActivity.h"
#include "activities/network/WifiSelectionActivity.h"
#include "activities/reader/ReaderActivity.h" #include "activities/reader/ReaderActivity.h"
#include "activities/settings/SettingsActivity.h" #include "activities/settings/SettingsActivity.h"
#include "activities/util/FullScreenMessageActivity.h" #include "activities/util/FullScreenMessageActivity.h"
#include "activities/network/AutoConnectingActivity.h"
#include "activities/network/WifiSelectionActivity.h"
#include "fontIds.h" #include "fontIds.h"
#include <WiFi.h>
HalDisplay display; HalDisplay display;
HalGPIO gpio; HalGPIO gpio;
@ -214,7 +214,7 @@ void onGoToReader(const std::string& initialEpubPath, MyLibraryActivity::Tab fro
} }
void onContinueReading() { onGoToReader(APP_STATE.openEpubPath, MyLibraryActivity::Tab::Recent); } void onContinueReading() { onGoToReader(APP_STATE.openEpubPath, MyLibraryActivity::Tab::Recent); }
void onGoHome(); // forward declaration void onGoHome(); // forward declaration
void withWifi(std::function<void()> on_success) { void withWifi(std::function<void()> on_success) {
if (WiFi.isConnected()) { if (WiFi.isConnected()) {