diff --git a/.gitignore b/.gitignore index 25b36fb..bae255e 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ .DS_Store .vscode lib/EpdFont/fontsrc +*.generated.h diff --git a/README.md b/README.md index c6e18e0..60a2ed2 100644 --- a/README.md +++ b/README.md @@ -23,18 +23,23 @@ CrossPoint Reader aims to: This project is **not affiliated with Xteink**; it's built as a community project. -## Features +## Features & Usage - [x] EPUB parsing and rendering +- [ ] Image support within EPUB - [x] Saved reading position -- [ ] File explorer with file picker +- [x] File explorer with file picker - [x] Basic EPUB picker from root directory - [x] Support nested folders - [ ] EPUB picker with cover art -- [ ] Image support within EPUB +- [x] Custom sleep screen + - [ ] Cover sleep screen +- [x] Wifi book upload +- [ ] Wifi OTA updates - [ ] Configurable font, layout, and display options -- [ ] WiFi connectivity -- [ ] BLE connectivity +- [ ] Screen rotation + +See [the user guide](./USER_GUIDE.md) for instructions on operating CrossPoint. ## Installing @@ -59,10 +64,6 @@ back to the other partition using the "Swap boot partition" button here https:// See [Development](#development) below. -## Usage - -See [the user guide](./USER_GUIDE.md) for instructions on operating CrossPoint. - ## Development ### Prerequisites diff --git a/USER_GUIDE.md b/USER_GUIDE.md index af69b94..f5a9bd0 100644 --- a/USER_GUIDE.md +++ b/USER_GUIDE.md @@ -19,24 +19,51 @@ The device utilises the standard buttons on the Xtink X4 in the same layout: ### Power On / Off -To turn the device on or off, **press and hold the Power button for 1 full second**. +To turn the device on or off, **press and hold the Power button for half a second**. In **Settings** you can configure +the power button to trigger on a short press instead of a long one. ### First Launch -Upon turning the device on for the first time, you will be placed on the **Book Selection Screen** (File Browser). +Upon turning the device on for the first time, you will be placed on the **Home** screen. > **Note:** On subsequent restarts, the firmware will automatically reopen the last book you were reading. --- -## 3. Book Selection +## 3. Screens -The Home Screen acts as a folder and file browser. +### 3.1 Home Screen + +The Home Screen is the main entry point to the firmware. From here you can navigate to the **Book Selection** screen, +**Settings** screen, or **File Upload** screen. + +### 3.2 Book Selection (Read) + +The Book Selection acts as a folder and file browser. * **Navigate List:** Use **Left** (or **Volume Up**), or **Right** (or **Volume Down**) to move the selection cursor up and down through folders and books. * **Open Selection:** Press **Confirm** to open a folder or read a selected book. +### 3.3 Reading Screen + +See [4. Reading Mode](#4-reading-mode) below for more information. + +### 3.4 File Upload Screen + +The File Upload screen allows you to upload new e-books to the device. When you enter the screen you'll be prompted with +a WiFi selection dialog and then your X4 will start hosting a web server. + +See the [webserver docs](./docs/webserver.md) for more information on how to connect to the web server and upload files. + +### 3.5 Settings + +The Settings screen allows you to configure the device's behavior. There are a few settings you can adjust: +- **White Sleep Screen**: Whether to use the white screen or black (inverted) default sleep screen +- **Extra Paragraph Spacing**: If enabled, vertical space will be added between paragraphs in the book, if disabled, + paragraphs will not have vertical space between them, but will have first word indentation. +- **Short Power Button Click**: Whether to trigger the power button on a short press or a long press. + --- ## 4. Reading Mode @@ -76,3 +103,4 @@ are planned for future updates: * **Images:** Embedded images in e-books will not render. * **Text Formatting:** There are currently no settings to adjust font type, size, line spacing, or margins. +* **Rotation**: Different rotation options are not supported. diff --git a/docs/images/cover.jpg b/docs/images/cover.jpg index 588b548..f5d7d96 100644 Binary files a/docs/images/cover.jpg and b/docs/images/cover.jpg differ diff --git a/docs/images/wifi/webserver_files.png b/docs/images/wifi/webserver_files.png new file mode 100644 index 0000000..84835d1 Binary files /dev/null and b/docs/images/wifi/webserver_files.png differ diff --git a/docs/images/wifi/webserver_homepage.png b/docs/images/wifi/webserver_homepage.png new file mode 100644 index 0000000..368e681 Binary files /dev/null and b/docs/images/wifi/webserver_homepage.png differ diff --git a/docs/images/wifi/webserver_upload.png b/docs/images/wifi/webserver_upload.png new file mode 100644 index 0000000..d7295c5 Binary files /dev/null and b/docs/images/wifi/webserver_upload.png differ diff --git a/docs/images/wifi/wifi_connected.jpeg b/docs/images/wifi/wifi_connected.jpeg new file mode 100644 index 0000000..a9d74db Binary files /dev/null and b/docs/images/wifi/wifi_connected.jpeg differ diff --git a/docs/images/wifi/wifi_networks.jpeg b/docs/images/wifi/wifi_networks.jpeg new file mode 100644 index 0000000..9c42dc8 Binary files /dev/null and b/docs/images/wifi/wifi_networks.jpeg differ diff --git a/docs/images/wifi/wifi_password.jpeg b/docs/images/wifi/wifi_password.jpeg new file mode 100644 index 0000000..1ca2fed Binary files /dev/null and b/docs/images/wifi/wifi_password.jpeg differ diff --git a/docs/webserver.md b/docs/webserver.md new file mode 100644 index 0000000..2c96b8e --- /dev/null +++ b/docs/webserver.md @@ -0,0 +1,272 @@ +# Web Server Guide + +This guide explains how to connect your CrossPoint Reader to WiFi and use the built-in web server to upload EPUB files from your computer or phone. + +## Overview + +CrossPoint Reader includes a built-in web server that allows you to: + +- Upload EPUB files wirelessly from any device on the same WiFi network +- Browse and manage files on your device's SD card +- Create folders to organize your ebooks +- Delete files and folders + +## Prerequisites + +- Your CrossPoint Reader device +- A WiFi network +- A computer, phone, or tablet connected to the **same WiFi network** + +--- + +## Step 1: Accessing the WiFi Screen + +1. From the main menu or file browser, navigate to the **Settings** screen +2. Select the **WiFi** option +3. The device will automatically start scanning for available networks + +--- + +## Step 2: Connecting to WiFi + +### Viewing Available Networks + +Once the scan completes, you'll see a list of available WiFi networks with the following indicators: + +- **Signal strength bars** (`||||`, `|||`, `||`, `|`) - Shows connection quality +- **`*` symbol** - Indicates the network is password-protected (encrypted) +- **`+` symbol** - Indicates you have previously saved credentials for this network + + + +### Selecting a Network + +1. Use the **Left/Right** (or **Volume Up/Down**) buttons to navigate through the network list +2. Press **Confirm** to select the highlighted network + +### Entering Password (for encrypted networks) + +If the network requires a password: + +1. An on-screen keyboard will appear +2. Use the navigation buttons to select characters +3. Press **Confirm** to enter each character +4. When complete, select the **Done** option on the keyboard + + + +**Note:** If you've previously connected to this network, the saved password will be used automatically. + +### Connection Process + +The device will display "Connecting..." while establishing the connection. This typically takes 5-10 seconds. + +### Saving Credentials + +If this is a new network, you'll be prompted to save the password: + +- Select **Yes** to save credentials for automatic connection next time (NOTE: These are stored in plaintext on the device's SD card. Do not use this for sensitive networks.) +- Select **No** to connect without saving + +--- + +## Step 3: Connection Success + +Once connected, the screen will display: + +- **Network name** (SSID) +- **IP Address** (e.g., `192.168.1.102`) +- **Web server URL** (e.g., `http://192.168.1.102/`) + + + +**Important:** Make note of the IP address - you'll need this to access the web interface from your computer or phone. + +--- + +## Step 4: Accessing the Web Interface + +### From a Computer + +1. Ensure your computer is connected to the **same WiFi network** as your CrossPoint Reader +2. Open any web browser (Chrome is recommended) +3. Type the IP address shown on your device into the browser's address bar + - Example: `http://192.168.1.102/` +4. Press Enter + +### From a Phone or Tablet + +1. Ensure your phone/tablet is connected to the **same WiFi network** as your CrossPoint Reader +2. Open your mobile browser (Safari, Chrome, etc.) +3. Type the IP address into the address bar + - Example: `http://192.168.1.102/` +4. Tap Go + +--- + +## Step 5: Using the Web Interface + +### Home Page + +The home page displays: + +- Device status and version information +- WiFi connection status +- Current IP address +- Available memory + +Navigation links: + +- **Home** - Returns to the status page +- **File Manager** - Access file management features + + + +### File Manager + +Click **File Manager** to access file management features. + +#### Browsing Files + +- The file manager displays all files and folders on your SD card +- **Folders** are highlighted in yellow with a 📁 icon +- **EPUB files** are highlighted in green with a 📗 icon +- Click on a folder name to navigate into it +- Use the breadcrumb navigation at the top to go back to parent folders + + + +#### Uploading EPUB Files + +1. Click the **+ Add** button in the top-right corner +2. Select **Upload eBook** from the dropdown menu +3. Click **Choose File** and select an `.epub` file from your device +4. Click **Upload** +5. A progress bar will show the upload status +6. The page will automatically refresh when the upload is complete + +**Note:** Only `.epub` files are accepted. Other file types will be rejected. + + + +#### Creating Folders + +1. Click the **+ Add** button in the top-right corner +2. Select **New Folder** from the dropdown menu +3. Enter a folder name (letters, numbers, underscores, and hyphens only) +4. Click **Create Folder** + +This is useful for organizing your ebooks by genre, author, or series. + +#### Deleting Files and Folders + +1. Click the **🗑️** (trash) icon next to any file or folder +2. Confirm the deletion in the popup dialog +3. Click **Delete** to permanently remove the item + +**Warning:** Deletion is permanent and cannot be undone! + +**Note:** Folders must be empty before they can be deleted. + +--- + +## Troubleshooting + +### Cannot See the Device on the Network + +**Problem:** Browser shows "Cannot connect" or "Site can't be reached" + +**Solutions:** + +1. Verify both devices are on the **same WiFi network** + - Check your computer/phone WiFi settings + - Confirm the CrossPoint Reader shows "Connected" status +2. Double-check the IP address + - Make sure you typed it correctly + - Include `http://` at the beginning +3. Try disabling VPN if you're using one +4. Some networks have "client isolation" enabled - check with your network administrator + +### Connection Drops or Times Out + +**Problem:** WiFi connection is unstable + +**Solutions:** + +1. Move closer to the WiFi router +2. Check signal strength on the device (should be at least `||` or better) +3. Avoid interference from other devices +4. Try a different WiFi network if available + +### Upload Fails + +**Problem:** File upload doesn't complete or shows an error + +**Solutions:** + +1. Ensure the file is a valid `.epub` file +2. Check that the SD card has enough free space +3. Try uploading a smaller file first to test +4. Refresh the browser page and try again + +### Saved Password Not Working + +**Problem:** Device fails to connect with saved credentials + +**Solutions:** + +1. When connection fails, you'll be prompted to "Forget Network" +2. Select **Yes** to remove the saved password +3. Reconnect and enter the password again +4. Choose to save the new password + +--- + +## Security Notes + +- The web server runs on port 80 (standard HTTP) +- **No authentication is required** - anyone on the same network can access the interface +- The web server is only accessible while the WiFi screen shows "Connected" +- The web server automatically stops when you exit the WiFi screen +- For security, only use on trusted private networks + +--- + +## Technical Details + +- **Supported WiFi:** 2.4GHz networks (802.11 b/g/n) +- **Web Server Port:** 80 (HTTP) +- **Maximum Upload Size:** Limited by available SD card space +- **Supported File Format:** `.epub` only +- **Browser Compatibility:** All modern browsers (Chrome, Firefox, Safari, Edge) + +--- + +## Tips and Best Practices + +1. **Organize with folders** - Create folders before uploading to keep your library organized +2. **Check signal strength** - Stronger signals (`|||` or `||||`) provide faster, more reliable uploads +3. **Upload multiple files** - You can upload files one at a time; the page refreshes after each upload +4. **Use descriptive names** - Name your folders clearly (e.g., "SciFi", "Mystery", "Non-Fiction") +5. **Keep credentials saved** - Save your WiFi password for quick reconnection in the future +6. **Exit when done** - Press **Back** to exit the WiFi screen and save battery + +--- + +## Exiting WiFi Mode + +When you're finished uploading files: + +1. Press the **Back** button on your CrossPoint Reader +2. The web server will automatically stop +3. WiFi will disconnect to conserve battery +4. You'll return to the previous screen + +Your uploaded files will be immediately available in the file browser! + +--- + +## Related Documentation + +- [User Guide](../USER_GUIDE.md) - General device operation +- [README](../README.md) - Project overview and features diff --git a/lib/Epub/Epub.cpp b/lib/Epub/Epub.cpp index 1477d72..a3edac8 100644 --- a/lib/Epub/Epub.cpp +++ b/lib/Epub/Epub.cpp @@ -322,6 +322,11 @@ int Epub::getTocItemsCount() const { return toc.size(); } // work out the section index for a toc index int Epub::getSpineIndexForTocIndex(const int tocIndex) const { + if (tocIndex < 0 || tocIndex >= toc.size()) { + Serial.printf("[%lu] [EBP] getSpineIndexForTocIndex: tocIndex %d out of range\n", millis(), tocIndex); + return 0; + } + // the toc entry should have an href that matches the spine item // so we can find the spine index by looking for the href for (int i = 0; i < spine.size(); i++) { @@ -336,6 +341,11 @@ int Epub::getSpineIndexForTocIndex(const int tocIndex) const { } int Epub::getTocIndexForSpineIndex(const int spineIndex) const { + if (spineIndex < 0 || spineIndex >= spine.size()) { + Serial.printf("[%lu] [EBP] getTocIndexForSpineIndex: spineIndex %d out of range\n", millis(), spineIndex); + return -1; + } + // the toc entry should have an href that matches the spine item // so we can find the toc index by looking for the href for (int i = 0; i < toc.size(); i++) { @@ -348,13 +358,21 @@ int Epub::getTocIndexForSpineIndex(const int spineIndex) const { return -1; } -size_t Epub::getBookSize() const { return getCumulativeSpineItemSize(getSpineItemsCount() - 1); } +size_t Epub::getBookSize() const { + if (spine.empty()) { + return 0; + } + return getCumulativeSpineItemSize(getSpineItemsCount() - 1); +} // Calculate progress in book uint8_t Epub::calculateProgress(const int currentSpineIndex, const float currentSpineRead) { + size_t bookSize = getBookSize(); + if (bookSize == 0) { + return 0; + } size_t prevChapterSize = (currentSpineIndex >= 1) ? getCumulativeSpineItemSize(currentSpineIndex - 1) : 0; size_t curChapterSize = getCumulativeSpineItemSize(currentSpineIndex) - prevChapterSize; - size_t bookSize = getBookSize(); size_t sectionProgSize = currentSpineRead * curChapterSize; return round(static_cast(prevChapterSize + sectionProgSize) / bookSize * 100.0); } diff --git a/lib/ZipFile/ZipFile.cpp b/lib/ZipFile/ZipFile.cpp index 30b44f8..f55bb85 100644 --- a/lib/ZipFile/ZipFile.cpp +++ b/lib/ZipFile/ZipFile.cpp @@ -62,6 +62,10 @@ long ZipFile::getDataOffset(const mz_zip_archive_file_stat& fileStat) const { const uint64_t fileOffset = fileStat.m_local_header_ofs; FILE* file = fopen(filePath.c_str(), "r"); + if (!file) { + Serial.printf("[%lu] [ZIP] Failed to open file for reading local header\n", millis()); + return -1; + } fseek(file, fileOffset, SEEK_SET); const size_t read = fread(pLocalHeader, 1, localHeaderSize, file); fclose(file); @@ -104,6 +108,10 @@ uint8_t* ZipFile::readFileToMemory(const char* filename, size_t* size, const boo } FILE* file = fopen(filePath.c_str(), "rb"); + if (!file) { + Serial.printf("[%lu] [ZIP] Failed to open file for reading\n", millis()); + return nullptr; + } fseek(file, fileOffset, SEEK_SET); const auto deflatedDataSize = static_cast(fileStat.m_comp_size); @@ -175,6 +183,10 @@ bool ZipFile::readFileToStream(const char* filename, Print& out, const size_t ch } FILE* file = fopen(filePath.c_str(), "rb"); + if (!file) { + Serial.printf("[%lu] [ZIP] Failed to open file for streaming\n", millis()); + return false; + } fseek(file, fileOffset, SEEK_SET); const auto deflatedDataSize = static_cast(fileStat.m_comp_size); diff --git a/platformio.ini b/platformio.ini index 5494f86..4f71afe 100644 --- a/platformio.ini +++ b/platformio.ini @@ -31,6 +31,9 @@ board_build.flash_mode = dio board_build.flash_size = 16MB board_build.partitions = partitions.csv +extra_scripts = + pre:scripts/build_html.py + ; Libraries lib_deps = BatteryMonitor=symlink://open-x4-sdk/libs/hardware/BatteryMonitor diff --git a/scripts/build_html.py b/scripts/build_html.py new file mode 100644 index 0000000..248aba8 --- /dev/null +++ b/scripts/build_html.py @@ -0,0 +1,51 @@ +import os +import re + +SRC_DIR = "src" + +def minify_html(html: str) -> str: + # Tags where whitespace should be preserved + preserve_tags = ['pre', 'code', 'textarea', 'script', 'style'] + preserve_regex = '|'.join(preserve_tags) + + # Protect preserve blocks with placeholders + preserve_blocks = [] + def preserve(match): + preserve_blocks.append(match.group(0)) + return f"__PRESERVE_BLOCK_{len(preserve_blocks)-1}__" + + html = re.sub(rf'<({preserve_regex})[\s\S]*?', preserve, html, flags=re.IGNORECASE) + + # Remove HTML comments + html = re.sub(r'', '', html, flags=re.DOTALL) + + # Collapse all whitespace between tags + html = re.sub(r'>\s+<', '><', html) + + # Collapse multiple spaces inside tags + html = re.sub(r'\s+', ' ', html) + + # Restore preserved blocks + for i, block in enumerate(preserve_blocks): + html = html.replace(f"__PRESERVE_BLOCK_{i}__", block) + + return html.strip() + +for root, _, files in os.walk(SRC_DIR): + for file in files: + if file.endswith(".html"): + html_path = os.path.join(root, file) + with open(html_path, "r", encoding="utf-8") as f: + html_content = f.read() + + # minified = regex.sub("\g<1>", html_content) + minified = minify_html(html_content) + base_name = f"{os.path.splitext(file)[0]}Html" + header_path = os.path.join(root, f"{base_name}.generated.h") + + with open(header_path, "w", encoding="utf-8") as h: + h.write(f"// THIS FILE IS AUTOGENERATED, DO NOT EDIT MANUALLY\n\n") + h.write(f"#pragma once\n") + h.write(f'constexpr char {base_name}[] PROGMEM = R"rawliteral({minified})rawliteral";\n') + + print(f"Generated: {header_path}") diff --git a/src/CrossPointSettings.cpp b/src/CrossPointSettings.cpp index 1d6f5da..51ac88a 100644 --- a/src/CrossPointSettings.cpp +++ b/src/CrossPointSettings.cpp @@ -25,6 +25,7 @@ bool CrossPointSettings::saveToFile() const { serialization::writePod(outputFile, SETTINGS_COUNT); serialization::writePod(outputFile, whiteSleepScreen); serialization::writePod(outputFile, extraParagraphSpacing); + serialization::writePod(outputFile, shortPwrBtn); serialization::writePod(outputFile, hyphenationEnabled); outputFile.close(); @@ -51,16 +52,18 @@ bool CrossPointSettings::loadFromFile() { uint8_t fileSettingsCount = 0; serialization::readPod(inputFile, fileSettingsCount); - // load settings that exist in the file (supports backward compatibility) - if (fileSettingsCount >= 1) { + // load settings that exist + uint8_t settingsRead = 0; + do { serialization::readPod(inputFile, whiteSleepScreen); - } - if (fileSettingsCount >= 2) { + if (++settingsRead >= fileSettingsCount) break; serialization::readPod(inputFile, extraParagraphSpacing); - } - if (fileSettingsCount >= 3) { + if (++settingsRead >= fileSettingsCount) break; + serialization::readPod(inputFile, shortPwrBtn); + if (++settingsRead >= fileSettingsCount) break; serialization::readPod(inputFile, hyphenationEnabled); - } + if (++settingsRead >= fileSettingsCount) break; + } while (false); inputFile.close(); Serial.printf("[%lu] [CPS] Settings loaded from file\n", millis()); diff --git a/src/CrossPointSettings.h b/src/CrossPointSettings.h index 7c8b8d0..0ee815d 100644 --- a/src/CrossPointSettings.h +++ b/src/CrossPointSettings.h @@ -17,9 +17,10 @@ class CrossPointSettings { // Sleep screen settings uint8_t whiteSleepScreen = 0; - // Text rendering settings uint8_t extraParagraphSpacing = 1; + // Duration of the power button press + uint8_t shortPwrBtn = 0; uint8_t hyphenationEnabled = 1; ~CrossPointSettings() = default; @@ -27,6 +28,8 @@ class CrossPointSettings { // Get singleton instance static CrossPointSettings& getInstance() { return instance; } + uint16_t getPowerButtonDuration() const { return shortPwrBtn ? 10 : 500; } + bool saveToFile() const; bool loadFromFile(); }; diff --git a/src/WifiCredentialStore.cpp b/src/WifiCredentialStore.cpp new file mode 100644 index 0000000..ec9d955 --- /dev/null +++ b/src/WifiCredentialStore.cpp @@ -0,0 +1,160 @@ +#include "WifiCredentialStore.h" + +#include +#include +#include + +#include + +// Initialize the static instance +WifiCredentialStore WifiCredentialStore::instance; + +namespace { +// File format version +constexpr uint8_t WIFI_FILE_VERSION = 1; + +// WiFi credentials file path +constexpr char WIFI_FILE[] = "/sd/.crosspoint/wifi.bin"; + +// Obfuscation key - "CrossPoint" in ASCII +// This is NOT cryptographic security, just prevents casual file reading +constexpr uint8_t OBFUSCATION_KEY[] = {0x43, 0x72, 0x6F, 0x73, 0x73, 0x50, 0x6F, 0x69, 0x6E, 0x74}; +constexpr size_t KEY_LENGTH = sizeof(OBFUSCATION_KEY); +} // namespace + +void WifiCredentialStore::obfuscate(std::string& data) const { + Serial.printf("[%lu] [WCS] Obfuscating/deobfuscating %zu bytes\n", millis(), data.size()); + for (size_t i = 0; i < data.size(); i++) { + data[i] ^= OBFUSCATION_KEY[i % KEY_LENGTH]; + } +} + +bool WifiCredentialStore::saveToFile() const { + // Make sure the directory exists + SD.mkdir("/.crosspoint"); + + std::ofstream file(WIFI_FILE, std::ios::binary); + if (!file) { + Serial.printf("[%lu] [WCS] Failed to open wifi.bin for writing\n", millis()); + return false; + } + + // Write header + serialization::writePod(file, WIFI_FILE_VERSION); + serialization::writePod(file, static_cast(credentials.size())); + + // Write each credential + for (const auto& cred : credentials) { + // Write SSID (plaintext - not sensitive) + serialization::writeString(file, cred.ssid); + Serial.printf("[%lu] [WCS] Saving SSID: %s, password length: %zu\n", millis(), cred.ssid.c_str(), + cred.password.size()); + + // Write password (obfuscated) + std::string obfuscatedPwd = cred.password; + obfuscate(obfuscatedPwd); + serialization::writeString(file, obfuscatedPwd); + } + + file.close(); + Serial.printf("[%lu] [WCS] Saved %zu WiFi credentials to file\n", millis(), credentials.size()); + return true; +} + +bool WifiCredentialStore::loadFromFile() { + if (!SD.exists(WIFI_FILE + 3)) { // +3 to skip "/sd" prefix + Serial.printf("[%lu] [WCS] WiFi credentials file does not exist\n", millis()); + return false; + } + + std::ifstream file(WIFI_FILE, std::ios::binary); + if (!file) { + Serial.printf("[%lu] [WCS] Failed to open wifi.bin for reading\n", millis()); + return false; + } + + // Read and verify version + uint8_t version; + serialization::readPod(file, version); + if (version != WIFI_FILE_VERSION) { + Serial.printf("[%lu] [WCS] Unknown file version: %u\n", millis(), version); + file.close(); + return false; + } + + // Read credential count + uint8_t count; + serialization::readPod(file, count); + + // Read credentials + credentials.clear(); + for (uint8_t i = 0; i < count && i < MAX_NETWORKS; i++) { + WifiCredential cred; + + // Read SSID + serialization::readString(file, cred.ssid); + + // Read and deobfuscate password + serialization::readString(file, cred.password); + Serial.printf("[%lu] [WCS] Loaded SSID: %s, obfuscated password length: %zu\n", millis(), cred.ssid.c_str(), + cred.password.size()); + obfuscate(cred.password); // XOR is symmetric, so same function deobfuscates + Serial.printf("[%lu] [WCS] After deobfuscation, password length: %zu\n", millis(), cred.password.size()); + + credentials.push_back(cred); + } + + file.close(); + Serial.printf("[%lu] [WCS] Loaded %zu WiFi credentials from file\n", millis(), credentials.size()); + return true; +} + +bool WifiCredentialStore::addCredential(const std::string& ssid, const std::string& password) { + // Check if this SSID already exists and update it + for (auto& cred : credentials) { + if (cred.ssid == ssid) { + cred.password = password; + Serial.printf("[%lu] [WCS] Updated credentials for: %s\n", millis(), ssid.c_str()); + return saveToFile(); + } + } + + // Check if we've reached the limit + if (credentials.size() >= MAX_NETWORKS) { + Serial.printf("[%lu] [WCS] Cannot add more networks, limit of %zu reached\n", millis(), MAX_NETWORKS); + return false; + } + + // Add new credential + credentials.push_back({ssid, password}); + Serial.printf("[%lu] [WCS] Added credentials for: %s\n", millis(), ssid.c_str()); + return saveToFile(); +} + +bool WifiCredentialStore::removeCredential(const std::string& ssid) { + for (auto it = credentials.begin(); it != credentials.end(); ++it) { + if (it->ssid == ssid) { + credentials.erase(it); + Serial.printf("[%lu] [WCS] Removed credentials for: %s\n", millis(), ssid.c_str()); + return saveToFile(); + } + } + return false; // Not found +} + +const WifiCredential* WifiCredentialStore::findCredential(const std::string& ssid) const { + for (const auto& cred : credentials) { + if (cred.ssid == ssid) { + return &cred; + } + } + return nullptr; +} + +bool WifiCredentialStore::hasSavedCredential(const std::string& ssid) const { return findCredential(ssid) != nullptr; } + +void WifiCredentialStore::clearAll() { + credentials.clear(); + saveToFile(); + Serial.printf("[%lu] [WCS] Cleared all WiFi credentials\n", millis()); +} diff --git a/src/WifiCredentialStore.h b/src/WifiCredentialStore.h new file mode 100644 index 0000000..0004dc9 --- /dev/null +++ b/src/WifiCredentialStore.h @@ -0,0 +1,56 @@ +#pragma once +#include +#include + +struct WifiCredential { + std::string ssid; + std::string password; // Stored obfuscated in file +}; + +/** + * Singleton class for storing WiFi credentials on the SD card. + * Credentials are stored in /sd/.crosspoint/wifi.bin with basic + * XOR obfuscation to prevent casual reading (not cryptographically secure). + */ +class WifiCredentialStore { + private: + static WifiCredentialStore instance; + std::vector credentials; + + static constexpr size_t MAX_NETWORKS = 8; + + // Private constructor for singleton + WifiCredentialStore() = default; + + // XOR obfuscation (symmetric - same for encode/decode) + void obfuscate(std::string& data) const; + + public: + // Delete copy constructor and assignment + WifiCredentialStore(const WifiCredentialStore&) = delete; + WifiCredentialStore& operator=(const WifiCredentialStore&) = delete; + + // Get singleton instance + static WifiCredentialStore& getInstance() { return instance; } + + // Save/load from SD card + bool saveToFile() const; + bool loadFromFile(); + + // Credential management + bool addCredential(const std::string& ssid, const std::string& password); + bool removeCredential(const std::string& ssid); + const WifiCredential* findCredential(const std::string& ssid) const; + + // Get all stored credentials (for UI display) + const std::vector& getCredentials() const { return credentials; } + + // Check if a network is saved + bool hasSavedCredential(const std::string& ssid) const; + + // Clear all credentials + void clearAll(); +}; + +// Helper macro to access credentials store +#define WIFI_STORE WifiCredentialStore::getInstance() diff --git a/src/activities/Activity.h b/src/activities/Activity.h index 28017f7..dfe6714 100644 --- a/src/activities/Activity.h +++ b/src/activities/Activity.h @@ -15,4 +15,5 @@ class Activity { virtual void onEnter() {} virtual void onExit() {} virtual void loop() {} + virtual bool skipLoopDelay() { return false; } }; diff --git a/src/activities/boot_sleep/SleepActivity.cpp b/src/activities/boot_sleep/SleepActivity.cpp index 417a662..3b36990 100644 --- a/src/activities/boot_sleep/SleepActivity.cpp +++ b/src/activities/boot_sleep/SleepActivity.cpp @@ -2,18 +2,72 @@ #include +#include + #include "CrossPointSettings.h" #include "SD.h" #include "config.h" #include "images/CrossLarge.h" void SleepActivity::onEnter() { + renderPopup("Entering Sleep..."); + // Check if we have a /sleep directory + auto dir = SD.open("/sleep"); + if (dir && dir.isDirectory()) { + std::vector files; + // collect all valid BMP files + for (File file = dir.openNextFile(); file; file = dir.openNextFile()) { + if (file.isDirectory()) { + file.close(); + continue; + } + auto filename = std::string(file.name()); + if (filename[0] == '.') { + file.close(); + continue; + } + + if (filename.substr(filename.length() - 4) != ".bmp") { + Serial.printf("[%lu] [Slp] Skipping non-.bmp file name: %s\n", millis(), file.name()); + file.close(); + continue; + } + Bitmap bitmap(file); + if (bitmap.parseHeaders() != BmpReaderError::Ok) { + Serial.printf("[%lu] [Slp] Skipping invalid BMP file: %s\n", millis(), file.name()); + file.close(); + continue; + } + files.emplace_back(filename); + file.close(); + } + int numFiles = files.size(); + if (numFiles > 0) { + // Generate a random number between 1 and numFiles + int randomFileIndex = random(numFiles); + auto filename = "/sleep/" + files[randomFileIndex]; + auto file = SD.open(filename.c_str()); + if (file) { + Serial.printf("[%lu] [Slp] Randomly loading: /sleep/%s\n", millis(), files[randomFileIndex].c_str()); + delay(100); + Bitmap bitmap(file); + if (bitmap.parseHeaders() == BmpReaderError::Ok) { + renderCustomSleepScreen(bitmap); + dir.close(); + return; + } + } + } + } + if (dir) dir.close(); + // Look for sleep.bmp on the root of the sd card to determine if we should // render a custom sleep screen instead of the default. auto file = SD.open("/sleep.bmp"); if (file) { Bitmap bitmap(file); if (bitmap.parseHeaders() == BmpReaderError::Ok) { + Serial.printf("[%lu] [Slp] Loading: /sleep.bmp\n", millis()); renderCustomSleepScreen(bitmap); return; } @@ -22,6 +76,20 @@ void SleepActivity::onEnter() { renderDefaultSleepScreen(); } +void SleepActivity::renderPopup(const char* message) const { + const int textWidth = renderer.getTextWidth(READER_FONT_ID, message); + constexpr int margin = 20; + const int x = (GfxRenderer::getScreenWidth() - textWidth - margin * 2) / 2; + constexpr int y = 117; + const int w = textWidth + margin * 2; + const int h = renderer.getLineHeight(READER_FONT_ID) + margin * 2; + // renderer.clearScreen(); + renderer.fillRect(x + 5, y + 5, w - 10, h - 10, false); + renderer.drawText(READER_FONT_ID, x + margin, y + margin, message); + renderer.drawRect(x + 5, y + 5, w - 10, h - 10); + renderer.displayBuffer(); +} + void SleepActivity::renderDefaultSleepScreen() const { const auto pageWidth = GfxRenderer::getScreenWidth(); const auto pageHeight = GfxRenderer::getScreenHeight(); diff --git a/src/activities/boot_sleep/SleepActivity.h b/src/activities/boot_sleep/SleepActivity.h index 9d4a7c4..defc1d5 100644 --- a/src/activities/boot_sleep/SleepActivity.h +++ b/src/activities/boot_sleep/SleepActivity.h @@ -11,4 +11,5 @@ class SleepActivity final : public Activity { private: void renderDefaultSleepScreen() const; void renderCustomSleepScreen(const Bitmap& bitmap) const; + void renderPopup(const char* message) const; }; diff --git a/src/activities/home/HomeActivity.cpp b/src/activities/home/HomeActivity.cpp index 19b30c0..82d57cc 100644 --- a/src/activities/home/HomeActivity.cpp +++ b/src/activities/home/HomeActivity.cpp @@ -6,7 +6,7 @@ #include "config.h" namespace { -constexpr int menuItemCount = 2; +constexpr int menuItemCount = 3; } void HomeActivity::taskTrampoline(void* param) { @@ -51,6 +51,8 @@ void HomeActivity::loop() { if (selectorIndex == 0) { onReaderOpen(); } else if (selectorIndex == 1) { + onFileTransferOpen(); + } else if (selectorIndex == 2) { onSettingsOpen(); } } else if (prevPressed) { @@ -84,7 +86,8 @@ void HomeActivity::render() const { // Draw selection renderer.fillRect(0, 60 + selectorIndex * 30 + 2, pageWidth - 1, 30); renderer.drawText(UI_FONT_ID, 20, 60, "Read", selectorIndex != 0); - renderer.drawText(UI_FONT_ID, 20, 90, "Settings", selectorIndex != 1); + renderer.drawText(UI_FONT_ID, 20, 90, "File transfer", selectorIndex != 1); + renderer.drawText(UI_FONT_ID, 20, 120, "Settings", selectorIndex != 2); renderer.drawRect(25, pageHeight - 40, 106, 40); renderer.drawText(UI_FONT_ID, 25 + (105 - renderer.getTextWidth(UI_FONT_ID, "Back")) / 2, pageHeight - 35, "Back"); diff --git a/src/activities/home/HomeActivity.h b/src/activities/home/HomeActivity.h index 7f6ac4d..5dd26ec 100644 --- a/src/activities/home/HomeActivity.h +++ b/src/activities/home/HomeActivity.h @@ -14,6 +14,7 @@ class HomeActivity final : public Activity { bool updateRequired = false; const std::function onReaderOpen; const std::function onSettingsOpen; + const std::function onFileTransferOpen; static void taskTrampoline(void* param); [[noreturn]] void displayTaskLoop(); @@ -21,8 +22,11 @@ class HomeActivity final : public Activity { public: explicit HomeActivity(GfxRenderer& renderer, InputManager& inputManager, const std::function& onReaderOpen, - const std::function& onSettingsOpen) - : Activity(renderer, inputManager), onReaderOpen(onReaderOpen), onSettingsOpen(onSettingsOpen) {} + const std::function& onSettingsOpen, const std::function& onFileTransferOpen) + : Activity(renderer, inputManager), + onReaderOpen(onReaderOpen), + onSettingsOpen(onSettingsOpen), + onFileTransferOpen(onFileTransferOpen) {} void onEnter() override; void onExit() override; void loop() override; diff --git a/src/activities/network/CrossPointWebServerActivity.cpp b/src/activities/network/CrossPointWebServerActivity.cpp new file mode 100644 index 0000000..82f6329 --- /dev/null +++ b/src/activities/network/CrossPointWebServerActivity.cpp @@ -0,0 +1,243 @@ +#include "CrossPointWebServerActivity.h" + +#include +#include + +#include "config.h" + +void CrossPointWebServerActivity::taskTrampoline(void* param) { + auto* self = static_cast(param); + self->displayTaskLoop(); +} + +void CrossPointWebServerActivity::onEnter() { + Serial.printf("[%lu] [WEBACT] ========== CrossPointWebServerActivity onEnter ==========\n", millis()); + Serial.printf("[%lu] [WEBACT] [MEM] Free heap at onEnter: %d bytes\n", millis(), ESP.getFreeHeap()); + + renderingMutex = xSemaphoreCreateMutex(); + + // Reset state + state = WebServerActivityState::WIFI_SELECTION; + connectedIP.clear(); + connectedSSID.clear(); + lastHandleClientTime = 0; + updateRequired = true; + + xTaskCreate(&CrossPointWebServerActivity::taskTrampoline, "WebServerActivityTask", + 2048, // Stack size + this, // Parameters + 1, // Priority + &displayTaskHandle // Task handle + ); + + // Turn on WiFi immediately + Serial.printf("[%lu] [WEBACT] Turning on WiFi...\n", millis()); + WiFi.mode(WIFI_STA); + + // Launch WiFi selection subactivity + Serial.printf("[%lu] [WEBACT] Launching WifiSelectionActivity...\n", millis()); + wifiSelection.reset(new WifiSelectionActivity(renderer, inputManager, + [this](bool connected) { onWifiSelectionComplete(connected); })); + wifiSelection->onEnter(); +} + +void CrossPointWebServerActivity::onExit() { + Serial.printf("[%lu] [WEBACT] ========== CrossPointWebServerActivity onExit START ==========\n", millis()); + Serial.printf("[%lu] [WEBACT] [MEM] Free heap at onExit start: %d bytes\n", millis(), ESP.getFreeHeap()); + + state = WebServerActivityState::SHUTTING_DOWN; + + // Stop the web server first (before disconnecting WiFi) + stopWebServer(); + + // Exit WiFi selection subactivity if still active + if (wifiSelection) { + Serial.printf("[%lu] [WEBACT] Exiting WifiSelectionActivity...\n", millis()); + wifiSelection->onExit(); + wifiSelection.reset(); + Serial.printf("[%lu] [WEBACT] WifiSelectionActivity exited\n", millis()); + } + + // CRITICAL: Wait for LWIP stack to flush any pending packets + Serial.printf("[%lu] [WEBACT] Waiting 500ms for network stack to flush pending packets...\n", millis()); + delay(500); + + // Disconnect WiFi gracefully + Serial.printf("[%lu] [WEBACT] Disconnecting WiFi (graceful)...\n", millis()); + WiFi.disconnect(false); // false = don't erase credentials, send disconnect frame + delay(100); // Allow disconnect frame to be sent + + Serial.printf("[%lu] [WEBACT] Setting WiFi mode OFF...\n", millis()); + WiFi.mode(WIFI_OFF); + delay(100); // Allow WiFi hardware to fully power down + + Serial.printf("[%lu] [WEBACT] [MEM] Free heap after WiFi disconnect: %d bytes\n", millis(), ESP.getFreeHeap()); + + // Acquire mutex before deleting task + Serial.printf("[%lu] [WEBACT] Acquiring rendering mutex before task deletion...\n", millis()); + xSemaphoreTake(renderingMutex, portMAX_DELAY); + + // Delete the display task + Serial.printf("[%lu] [WEBACT] Deleting display task...\n", millis()); + if (displayTaskHandle) { + vTaskDelete(displayTaskHandle); + displayTaskHandle = nullptr; + Serial.printf("[%lu] [WEBACT] Display task deleted\n", millis()); + } + + // Delete the mutex + Serial.printf("[%lu] [WEBACT] Deleting mutex...\n", millis()); + vSemaphoreDelete(renderingMutex); + renderingMutex = nullptr; + Serial.printf("[%lu] [WEBACT] Mutex deleted\n", millis()); + + Serial.printf("[%lu] [WEBACT] [MEM] Free heap at onExit end: %d bytes\n", millis(), ESP.getFreeHeap()); + Serial.printf("[%lu] [WEBACT] ========== CrossPointWebServerActivity onExit COMPLETE ==========\n", millis()); +} + +void CrossPointWebServerActivity::onWifiSelectionComplete(bool connected) { + Serial.printf("[%lu] [WEBACT] WifiSelectionActivity completed, connected=%d\n", millis(), connected); + + if (connected) { + // Get connection info before exiting subactivity + connectedIP = wifiSelection->getConnectedIP(); + connectedSSID = WiFi.SSID().c_str(); + + // Exit the wifi selection subactivity + wifiSelection->onExit(); + wifiSelection.reset(); + + // Start the web server + startWebServer(); + } else { + // User cancelled - go back + onGoBack(); + } +} + +void CrossPointWebServerActivity::startWebServer() { + Serial.printf("[%lu] [WEBACT] Starting web server...\n", millis()); + + // Create the web server instance + webServer.reset(new CrossPointWebServer()); + webServer->begin(); + + if (webServer->isRunning()) { + state = WebServerActivityState::SERVER_RUNNING; + Serial.printf("[%lu] [WEBACT] Web server started successfully\n", millis()); + + // Force an immediate render since we're transitioning from a subactivity + // that had its own rendering task. We need to make sure our display is shown. + xSemaphoreTake(renderingMutex, portMAX_DELAY); + render(); + xSemaphoreGive(renderingMutex); + Serial.printf("[%lu] [WEBACT] Rendered File Transfer screen\n", millis()); + } else { + Serial.printf("[%lu] [WEBACT] ERROR: Failed to start web server!\n", millis()); + webServer.reset(); + // Go back on error + onGoBack(); + } +} + +void CrossPointWebServerActivity::stopWebServer() { + if (webServer && webServer->isRunning()) { + Serial.printf("[%lu] [WEBACT] Stopping web server...\n", millis()); + webServer->stop(); + Serial.printf("[%lu] [WEBACT] Web server stopped\n", millis()); + } + webServer.reset(); +} + +void CrossPointWebServerActivity::loop() { + // Handle different states + switch (state) { + case WebServerActivityState::WIFI_SELECTION: + // Forward loop to WiFi selection subactivity + if (wifiSelection) { + wifiSelection->loop(); + } + break; + + case WebServerActivityState::SERVER_RUNNING: + // Handle web server requests - call handleClient multiple times per loop + // to improve responsiveness and upload throughput + if (webServer && webServer->isRunning()) { + unsigned long timeSinceLastHandleClient = millis() - lastHandleClientTime; + + // Log if there's a significant gap between handleClient calls (>100ms) + if (lastHandleClientTime > 0 && timeSinceLastHandleClient > 100) { + Serial.printf("[%lu] [WEBACT] WARNING: %lu ms gap since last handleClient\n", millis(), + timeSinceLastHandleClient); + } + + // Call handleClient multiple times to process pending requests faster + // This is critical for upload performance - HTTP file uploads send data + // in chunks and each handleClient() call processes incoming data + constexpr int HANDLE_CLIENT_ITERATIONS = 10; + for (int i = 0; i < HANDLE_CLIENT_ITERATIONS && webServer->isRunning(); i++) { + webServer->handleClient(); + } + lastHandleClientTime = millis(); + } + + // Handle exit on Back button + if (inputManager.wasPressed(InputManager::BTN_BACK)) { + onGoBack(); + return; + } + break; + + case WebServerActivityState::SHUTTING_DOWN: + // Do nothing - waiting for cleanup + break; + } +} + +void CrossPointWebServerActivity::displayTaskLoop() { + while (true) { + if (updateRequired) { + updateRequired = false; + xSemaphoreTake(renderingMutex, portMAX_DELAY); + render(); + xSemaphoreGive(renderingMutex); + } + vTaskDelay(10 / portTICK_PERIOD_MS); + } +} + +void CrossPointWebServerActivity::render() const { + // Only render our own UI when server is running + // WiFi selection handles its own rendering + if (state == WebServerActivityState::SERVER_RUNNING) { + renderer.clearScreen(); + renderServerRunning(); + renderer.displayBuffer(); + } +} + +void CrossPointWebServerActivity::renderServerRunning() const { + const auto pageWidth = GfxRenderer::getScreenWidth(); + const auto pageHeight = GfxRenderer::getScreenHeight(); + const auto height = renderer.getLineHeight(UI_FONT_ID); + const auto top = (pageHeight - height * 5) / 2; + + renderer.drawCenteredText(READER_FONT_ID, top - 30, "File Transfer", true, BOLD); + + std::string ssidInfo = "Network: " + connectedSSID; + if (ssidInfo.length() > 28) { + ssidInfo = ssidInfo.substr(0, 25) + "..."; + } + renderer.drawCenteredText(UI_FONT_ID, top + 10, ssidInfo.c_str(), true, REGULAR); + + std::string ipInfo = "IP Address: " + connectedIP; + renderer.drawCenteredText(UI_FONT_ID, top + 40, ipInfo.c_str(), true, REGULAR); + + // Show web server URL prominently + std::string webInfo = "http://" + connectedIP + "/"; + renderer.drawCenteredText(UI_FONT_ID, top + 70, webInfo.c_str(), true, BOLD); + + renderer.drawCenteredText(SMALL_FONT_ID, top + 110, "Open this URL in your browser", true, REGULAR); + + renderer.drawCenteredText(SMALL_FONT_ID, pageHeight - 30, "Press BACK to exit", true, REGULAR); +} diff --git a/src/activities/network/CrossPointWebServerActivity.h b/src/activities/network/CrossPointWebServerActivity.h new file mode 100644 index 0000000..ad41dcd --- /dev/null +++ b/src/activities/network/CrossPointWebServerActivity.h @@ -0,0 +1,66 @@ +#pragma once +#include +#include +#include + +#include +#include +#include + +#include "../Activity.h" +#include "WifiSelectionActivity.h" +#include "server/CrossPointWebServer.h" + +// Web server activity states +enum class WebServerActivityState { + WIFI_SELECTION, // WiFi selection subactivity is active + SERVER_RUNNING, // Web server is running and handling requests + SHUTTING_DOWN // Shutting down server and WiFi +}; + +/** + * CrossPointWebServerActivity is the entry point for file transfer functionality. + * It: + * - Immediately turns on WiFi and launches WifiSelectionActivity on enter + * - When WifiSelectionActivity completes successfully, starts the CrossPointWebServer + * - Handles client requests in its loop() function + * - Cleans up the server and shuts down WiFi on exit + */ +class CrossPointWebServerActivity final : public Activity { + TaskHandle_t displayTaskHandle = nullptr; + SemaphoreHandle_t renderingMutex = nullptr; + bool updateRequired = false; + WebServerActivityState state = WebServerActivityState::WIFI_SELECTION; + const std::function onGoBack; + + // WiFi selection subactivity + std::unique_ptr wifiSelection; + + // Web server - owned by this activity + std::unique_ptr webServer; + + // Server status + std::string connectedIP; + std::string connectedSSID; + + // Performance monitoring + unsigned long lastHandleClientTime = 0; + + static void taskTrampoline(void* param); + [[noreturn]] void displayTaskLoop(); + void render() const; + void renderServerRunning() const; + + void onWifiSelectionComplete(bool connected); + void startWebServer(); + void stopWebServer(); + + public: + explicit CrossPointWebServerActivity(GfxRenderer& renderer, InputManager& inputManager, + const std::function& onGoBack) + : Activity(renderer, inputManager), onGoBack(onGoBack) {} + void onEnter() override; + void onExit() override; + void loop() override; + bool skipLoopDelay() override { return webServer && webServer->isRunning(); } +}; diff --git a/src/activities/network/WifiSelectionActivity.cpp b/src/activities/network/WifiSelectionActivity.cpp new file mode 100644 index 0000000..a48891e --- /dev/null +++ b/src/activities/network/WifiSelectionActivity.cpp @@ -0,0 +1,691 @@ +#include "WifiSelectionActivity.h" + +#include +#include + +#include + +#include "WifiCredentialStore.h" +#include "config.h" + +void WifiSelectionActivity::taskTrampoline(void* param) { + auto* self = static_cast(param); + self->displayTaskLoop(); +} + +void WifiSelectionActivity::onEnter() { + renderingMutex = xSemaphoreCreateMutex(); + + // Load saved WiFi credentials + WIFI_STORE.loadFromFile(); + + // Reset state + selectedNetworkIndex = 0; + networks.clear(); + state = WifiSelectionState::SCANNING; + selectedSSID.clear(); + connectedIP.clear(); + connectionError.clear(); + enteredPassword.clear(); + usedSavedPassword = false; + savePromptSelection = 0; + forgetPromptSelection = 0; + keyboard.reset(); + + // Trigger first update to show scanning message + updateRequired = true; + + xTaskCreate(&WifiSelectionActivity::taskTrampoline, "WifiSelectionTask", + 4096, // Stack size (larger for WiFi operations) + this, // Parameters + 1, // Priority + &displayTaskHandle // Task handle + ); + + // Start WiFi scan + startWifiScan(); +} + +void WifiSelectionActivity::onExit() { + Serial.printf("[%lu] [WIFI] ========== WifiSelectionActivity onExit START ==========\n", millis()); + Serial.printf("[%lu] [WIFI] [MEM] Free heap at onExit start: %d bytes\n", millis(), ESP.getFreeHeap()); + + // Stop any ongoing WiFi scan + Serial.printf("[%lu] [WIFI] Deleting WiFi scan...\n", millis()); + WiFi.scanDelete(); + Serial.printf("[%lu] [WIFI] [MEM] Free heap after scanDelete: %d bytes\n", millis(), ESP.getFreeHeap()); + + // Note: We do NOT disconnect WiFi here - the parent activity (CrossPointWebServerActivity) + // manages WiFi connection state. We just clean up the scan and task. + + // Acquire mutex before deleting task to ensure task isn't using it + // This prevents hangs/crashes if the task holds the mutex when deleted + Serial.printf("[%lu] [WIFI] Acquiring rendering mutex before task deletion...\n", millis()); + xSemaphoreTake(renderingMutex, portMAX_DELAY); + + // Delete the display task (we now hold the mutex, so task is blocked if it needs it) + Serial.printf("[%lu] [WIFI] Deleting display task...\n", millis()); + if (displayTaskHandle) { + vTaskDelete(displayTaskHandle); + displayTaskHandle = nullptr; + Serial.printf("[%lu] [WIFI] Display task deleted\n", millis()); + } + + // Now safe to delete the mutex since we own it + Serial.printf("[%lu] [WIFI] Deleting mutex...\n", millis()); + vSemaphoreDelete(renderingMutex); + renderingMutex = nullptr; + Serial.printf("[%lu] [WIFI] Mutex deleted\n", millis()); + + Serial.printf("[%lu] [WIFI] [MEM] Free heap at onExit end: %d bytes\n", millis(), ESP.getFreeHeap()); + Serial.printf("[%lu] [WIFI] ========== WifiSelectionActivity onExit COMPLETE ==========\n", millis()); +} + +void WifiSelectionActivity::startWifiScan() { + state = WifiSelectionState::SCANNING; + networks.clear(); + updateRequired = true; + + // Set WiFi mode to station + WiFi.mode(WIFI_STA); + WiFi.disconnect(); + delay(100); + + // Start async scan + WiFi.scanNetworks(true); // true = async scan +} + +void WifiSelectionActivity::processWifiScanResults() { + int16_t scanResult = WiFi.scanComplete(); + + if (scanResult == WIFI_SCAN_RUNNING) { + // Scan still in progress + return; + } + + if (scanResult == WIFI_SCAN_FAILED) { + state = WifiSelectionState::NETWORK_LIST; + updateRequired = true; + return; + } + + // Scan complete, process results + // Use a map to deduplicate networks by SSID, keeping the strongest signal + std::map uniqueNetworks; + + for (int i = 0; i < scanResult; i++) { + std::string ssid = WiFi.SSID(i).c_str(); + int32_t rssi = WiFi.RSSI(i); + + // Skip hidden networks (empty SSID) + if (ssid.empty()) { + continue; + } + + // Check if we've already seen this SSID + auto it = uniqueNetworks.find(ssid); + if (it == uniqueNetworks.end() || rssi > it->second.rssi) { + // New network or stronger signal than existing entry + WifiNetworkInfo network; + network.ssid = ssid; + network.rssi = rssi; + network.isEncrypted = (WiFi.encryptionType(i) != WIFI_AUTH_OPEN); + network.hasSavedPassword = WIFI_STORE.hasSavedCredential(network.ssid); + uniqueNetworks[ssid] = network; + } + } + + // Convert map to vector + networks.clear(); + for (const auto& pair : uniqueNetworks) { + networks.push_back(pair.second); + } + + // Sort by signal strength (strongest first) + std::sort(networks.begin(), networks.end(), + [](const WifiNetworkInfo& a, const WifiNetworkInfo& b) { return a.rssi > b.rssi; }); + + WiFi.scanDelete(); + state = WifiSelectionState::NETWORK_LIST; + selectedNetworkIndex = 0; + updateRequired = true; +} + +void WifiSelectionActivity::selectNetwork(int index) { + if (index < 0 || index >= static_cast(networks.size())) { + return; + } + + const auto& network = networks[index]; + selectedSSID = network.ssid; + selectedRequiresPassword = network.isEncrypted; + usedSavedPassword = false; + enteredPassword.clear(); + + // Check if we have saved credentials for this network + const auto* savedCred = WIFI_STORE.findCredential(selectedSSID); + if (savedCred && !savedCred->password.empty()) { + // Use saved password - connect directly + enteredPassword = savedCred->password; + usedSavedPassword = true; + Serial.printf("[%lu] [WiFi] Using saved password for %s, length: %zu\n", millis(), selectedSSID.c_str(), + enteredPassword.size()); + attemptConnection(); + return; + } + + if (selectedRequiresPassword) { + // Show password entry + state = WifiSelectionState::PASSWORD_ENTRY; + keyboard.reset(new KeyboardEntryActivity(renderer, inputManager, "Enter WiFi Password", + "", // No initial text + 64, // Max password length + false // Show password by default (hard keyboard to use) + )); + updateRequired = true; + } else { + // Connect directly for open networks + attemptConnection(); + } +} + +void WifiSelectionActivity::attemptConnection() { + state = WifiSelectionState::CONNECTING; + connectionStartTime = millis(); + connectedIP.clear(); + connectionError.clear(); + updateRequired = true; + + WiFi.mode(WIFI_STA); + + // Get password from keyboard if we just entered it + if (keyboard && !usedSavedPassword) { + enteredPassword = keyboard->getText(); + } + + if (selectedRequiresPassword && !enteredPassword.empty()) { + WiFi.begin(selectedSSID.c_str(), enteredPassword.c_str()); + } else { + WiFi.begin(selectedSSID.c_str()); + } +} + +void WifiSelectionActivity::checkConnectionStatus() { + if (state != WifiSelectionState::CONNECTING) { + return; + } + + wl_status_t status = WiFi.status(); + + if (status == WL_CONNECTED) { + // Successfully connected + IPAddress ip = WiFi.localIP(); + char ipStr[16]; + snprintf(ipStr, sizeof(ipStr), "%d.%d.%d.%d", ip[0], ip[1], ip[2], ip[3]); + connectedIP = ipStr; + + // If we entered a new password, ask if user wants to save it + // Otherwise, immediately complete so parent can start web server + if (!usedSavedPassword && !enteredPassword.empty()) { + state = WifiSelectionState::SAVE_PROMPT; + savePromptSelection = 0; // Default to "Yes" + updateRequired = true; + } else { + // Using saved password or open network - complete immediately + Serial.printf("[%lu] [WIFI] Connected with saved/open credentials, completing immediately\n", millis()); + onComplete(true); + } + return; + } + + if (status == WL_CONNECT_FAILED || status == WL_NO_SSID_AVAIL) { + connectionError = "Connection failed"; + if (status == WL_NO_SSID_AVAIL) { + connectionError = "Network not found"; + } + state = WifiSelectionState::CONNECTION_FAILED; + updateRequired = true; + return; + } + + // Check for timeout + if (millis() - connectionStartTime > CONNECTION_TIMEOUT_MS) { + WiFi.disconnect(); + connectionError = "Connection timeout"; + state = WifiSelectionState::CONNECTION_FAILED; + updateRequired = true; + return; + } +} + +void WifiSelectionActivity::loop() { + // Check scan progress + if (state == WifiSelectionState::SCANNING) { + processWifiScanResults(); + return; + } + + // Check connection progress + if (state == WifiSelectionState::CONNECTING) { + checkConnectionStatus(); + return; + } + + // Handle password entry state + if (state == WifiSelectionState::PASSWORD_ENTRY && keyboard) { + keyboard->handleInput(); + + if (keyboard->isComplete()) { + attemptConnection(); + return; + } + + if (keyboard->isCancelled()) { + state = WifiSelectionState::NETWORK_LIST; + keyboard.reset(); + updateRequired = true; + return; + } + + updateRequired = true; + return; + } + + // Handle save prompt state + if (state == WifiSelectionState::SAVE_PROMPT) { + if (inputManager.wasPressed(InputManager::BTN_LEFT) || inputManager.wasPressed(InputManager::BTN_UP)) { + if (savePromptSelection > 0) { + savePromptSelection--; + updateRequired = true; + } + } else if (inputManager.wasPressed(InputManager::BTN_RIGHT) || inputManager.wasPressed(InputManager::BTN_DOWN)) { + if (savePromptSelection < 1) { + savePromptSelection++; + updateRequired = true; + } + } else if (inputManager.wasPressed(InputManager::BTN_CONFIRM)) { + if (savePromptSelection == 0) { + // User chose "Yes" - save the password + WIFI_STORE.addCredential(selectedSSID, enteredPassword); + } + // Complete - parent will start web server + onComplete(true); + } else if (inputManager.wasPressed(InputManager::BTN_BACK)) { + // Skip saving, complete anyway + onComplete(true); + } + return; + } + + // Handle forget prompt state (connection failed with saved credentials) + if (state == WifiSelectionState::FORGET_PROMPT) { + if (inputManager.wasPressed(InputManager::BTN_LEFT) || inputManager.wasPressed(InputManager::BTN_UP)) { + if (forgetPromptSelection > 0) { + forgetPromptSelection--; + updateRequired = true; + } + } else if (inputManager.wasPressed(InputManager::BTN_RIGHT) || inputManager.wasPressed(InputManager::BTN_DOWN)) { + if (forgetPromptSelection < 1) { + forgetPromptSelection++; + updateRequired = true; + } + } else if (inputManager.wasPressed(InputManager::BTN_CONFIRM)) { + if (forgetPromptSelection == 0) { + // User chose "Yes" - forget the network + WIFI_STORE.removeCredential(selectedSSID); + // Update the network list to reflect the change + for (auto& network : networks) { + if (network.ssid == selectedSSID) { + network.hasSavedPassword = false; + break; + } + } + } + // Go back to network list + state = WifiSelectionState::NETWORK_LIST; + updateRequired = true; + } else if (inputManager.wasPressed(InputManager::BTN_BACK)) { + // Skip forgetting, go back to network list + state = WifiSelectionState::NETWORK_LIST; + updateRequired = true; + } + return; + } + + // Handle connected state (should not normally be reached - connection completes immediately) + if (state == WifiSelectionState::CONNECTED) { + // Safety fallback - immediately complete + onComplete(true); + return; + } + + // Handle connection failed state + if (state == WifiSelectionState::CONNECTION_FAILED) { + if (inputManager.wasPressed(InputManager::BTN_BACK) || inputManager.wasPressed(InputManager::BTN_CONFIRM)) { + // If we used saved credentials, offer to forget the network + if (usedSavedPassword) { + state = WifiSelectionState::FORGET_PROMPT; + forgetPromptSelection = 0; // Default to "Yes" + } else { + // Go back to network list on failure + state = WifiSelectionState::NETWORK_LIST; + } + updateRequired = true; + return; + } + } + + // Handle network list state + if (state == WifiSelectionState::NETWORK_LIST) { + // Check for Back button to exit (cancel) + if (inputManager.wasPressed(InputManager::BTN_BACK)) { + onComplete(false); + return; + } + + // Check for Confirm button to select network or rescan + if (inputManager.wasPressed(InputManager::BTN_CONFIRM)) { + if (!networks.empty()) { + selectNetwork(selectedNetworkIndex); + } else { + startWifiScan(); + } + return; + } + + // Handle UP/DOWN navigation + if (inputManager.wasPressed(InputManager::BTN_UP) || inputManager.wasPressed(InputManager::BTN_LEFT)) { + if (selectedNetworkIndex > 0) { + selectedNetworkIndex--; + updateRequired = true; + } + } else if (inputManager.wasPressed(InputManager::BTN_DOWN) || inputManager.wasPressed(InputManager::BTN_RIGHT)) { + if (!networks.empty() && selectedNetworkIndex < static_cast(networks.size()) - 1) { + selectedNetworkIndex++; + updateRequired = true; + } + } + } +} + +std::string WifiSelectionActivity::getSignalStrengthIndicator(int32_t rssi) const { + // Convert RSSI to signal bars representation + if (rssi >= -50) { + return "||||"; // Excellent + } else if (rssi >= -60) { + return "||| "; // Good + } else if (rssi >= -70) { + return "|| "; // Fair + } else if (rssi >= -80) { + return "| "; // Weak + } + return " "; // Very weak +} + +void WifiSelectionActivity::displayTaskLoop() { + while (true) { + if (updateRequired) { + updateRequired = false; + xSemaphoreTake(renderingMutex, portMAX_DELAY); + render(); + xSemaphoreGive(renderingMutex); + } + vTaskDelay(10 / portTICK_PERIOD_MS); + } +} + +void WifiSelectionActivity::render() const { + renderer.clearScreen(); + + switch (state) { + case WifiSelectionState::SCANNING: + renderConnecting(); // Reuse connecting screen with different message + break; + case WifiSelectionState::NETWORK_LIST: + renderNetworkList(); + break; + case WifiSelectionState::PASSWORD_ENTRY: + renderPasswordEntry(); + break; + case WifiSelectionState::CONNECTING: + renderConnecting(); + break; + case WifiSelectionState::CONNECTED: + renderConnected(); + break; + case WifiSelectionState::SAVE_PROMPT: + renderSavePrompt(); + break; + case WifiSelectionState::CONNECTION_FAILED: + renderConnectionFailed(); + break; + case WifiSelectionState::FORGET_PROMPT: + renderForgetPrompt(); + break; + } + + renderer.displayBuffer(); +} + +void WifiSelectionActivity::renderNetworkList() const { + const auto pageWidth = GfxRenderer::getScreenWidth(); + const auto pageHeight = GfxRenderer::getScreenHeight(); + + // Draw header + renderer.drawCenteredText(READER_FONT_ID, 10, "WiFi Networks", true, BOLD); + + if (networks.empty()) { + // No networks found or scan failed + const auto height = renderer.getLineHeight(UI_FONT_ID); + const auto top = (pageHeight - height) / 2; + renderer.drawCenteredText(UI_FONT_ID, top, "No networks found", true, REGULAR); + renderer.drawCenteredText(SMALL_FONT_ID, top + height + 10, "Press OK to scan again", true, REGULAR); + } else { + // Calculate how many networks we can display + const int startY = 60; + const int lineHeight = 25; + const int maxVisibleNetworks = (pageHeight - startY - 40) / lineHeight; + + // Calculate scroll offset to keep selected item visible + int scrollOffset = 0; + if (selectedNetworkIndex >= maxVisibleNetworks) { + scrollOffset = selectedNetworkIndex - maxVisibleNetworks + 1; + } + + // Draw networks + int displayIndex = 0; + for (size_t i = scrollOffset; i < networks.size() && displayIndex < maxVisibleNetworks; i++, displayIndex++) { + const int networkY = startY + displayIndex * lineHeight; + const auto& network = networks[i]; + + // Draw selection indicator + if (static_cast(i) == selectedNetworkIndex) { + renderer.drawText(UI_FONT_ID, 5, networkY, ">"); + } + + // Draw network name (truncate if too long) + std::string displayName = network.ssid; + if (displayName.length() > 16) { + displayName = displayName.substr(0, 13) + "..."; + } + renderer.drawText(UI_FONT_ID, 20, networkY, displayName.c_str()); + + // Draw signal strength indicator + std::string signalStr = getSignalStrengthIndicator(network.rssi); + renderer.drawText(UI_FONT_ID, pageWidth - 90, networkY, signalStr.c_str()); + + // Draw saved indicator (checkmark) for networks with saved passwords + if (network.hasSavedPassword) { + renderer.drawText(UI_FONT_ID, pageWidth - 50, networkY, "+"); + } + + // Draw lock icon for encrypted networks + if (network.isEncrypted) { + renderer.drawText(UI_FONT_ID, pageWidth - 30, networkY, "*"); + } + } + + // Draw scroll indicators if needed + if (scrollOffset > 0) { + renderer.drawText(SMALL_FONT_ID, pageWidth - 15, startY - 10, "^"); + } + if (scrollOffset + maxVisibleNetworks < static_cast(networks.size())) { + renderer.drawText(SMALL_FONT_ID, pageWidth - 15, startY + maxVisibleNetworks * lineHeight, "v"); + } + + // Show network count + char countStr[32]; + snprintf(countStr, sizeof(countStr), "%zu networks found", networks.size()); + renderer.drawText(SMALL_FONT_ID, 20, pageHeight - 45, countStr); + } + + // Draw help text + renderer.drawText(SMALL_FONT_ID, 20, pageHeight - 30, "OK: Connect | * = Encrypted | + = Saved"); +} + +void WifiSelectionActivity::renderPasswordEntry() const { + const auto pageHeight = GfxRenderer::getScreenHeight(); + + // Draw header + renderer.drawCenteredText(READER_FONT_ID, 5, "WiFi Password", true, BOLD); + + // Draw network name with good spacing from header + std::string networkInfo = "Network: " + selectedSSID; + if (networkInfo.length() > 30) { + networkInfo = networkInfo.substr(0, 27) + "..."; + } + renderer.drawCenteredText(UI_FONT_ID, 38, networkInfo.c_str(), true, REGULAR); + + // Draw keyboard + if (keyboard) { + keyboard->render(58); + } +} + +void WifiSelectionActivity::renderConnecting() const { + const auto pageHeight = GfxRenderer::getScreenHeight(); + const auto height = renderer.getLineHeight(UI_FONT_ID); + const auto top = (pageHeight - height) / 2; + + if (state == WifiSelectionState::SCANNING) { + renderer.drawCenteredText(UI_FONT_ID, top, "Scanning...", true, REGULAR); + } else { + renderer.drawCenteredText(READER_FONT_ID, top - 30, "Connecting...", true, BOLD); + + std::string ssidInfo = "to " + selectedSSID; + if (ssidInfo.length() > 25) { + ssidInfo = ssidInfo.substr(0, 22) + "..."; + } + renderer.drawCenteredText(UI_FONT_ID, top, ssidInfo.c_str(), true, REGULAR); + } +} + +void WifiSelectionActivity::renderConnected() const { + const auto pageWidth = GfxRenderer::getScreenWidth(); + const auto pageHeight = GfxRenderer::getScreenHeight(); + const auto height = renderer.getLineHeight(UI_FONT_ID); + const auto top = (pageHeight - height * 4) / 2; + + renderer.drawCenteredText(READER_FONT_ID, top - 30, "Connected!", true, BOLD); + + std::string ssidInfo = "Network: " + selectedSSID; + if (ssidInfo.length() > 28) { + ssidInfo = ssidInfo.substr(0, 25) + "..."; + } + renderer.drawCenteredText(UI_FONT_ID, top + 10, ssidInfo.c_str(), true, REGULAR); + + std::string ipInfo = "IP Address: " + connectedIP; + renderer.drawCenteredText(UI_FONT_ID, top + 40, ipInfo.c_str(), true, REGULAR); + + renderer.drawCenteredText(SMALL_FONT_ID, pageHeight - 30, "Press any button to continue", true, REGULAR); +} + +void WifiSelectionActivity::renderSavePrompt() const { + const auto pageWidth = GfxRenderer::getScreenWidth(); + const auto pageHeight = GfxRenderer::getScreenHeight(); + const auto height = renderer.getLineHeight(UI_FONT_ID); + const auto top = (pageHeight - height * 3) / 2; + + renderer.drawCenteredText(READER_FONT_ID, top - 40, "Connected!", true, BOLD); + + std::string ssidInfo = "Network: " + selectedSSID; + if (ssidInfo.length() > 28) { + ssidInfo = ssidInfo.substr(0, 25) + "..."; + } + renderer.drawCenteredText(UI_FONT_ID, top, ssidInfo.c_str(), true, REGULAR); + + renderer.drawCenteredText(UI_FONT_ID, top + 40, "Save password for next time?", true, REGULAR); + + // Draw Yes/No buttons + const int buttonY = top + 80; + const int buttonWidth = 60; + const int buttonSpacing = 30; + const int totalWidth = buttonWidth * 2 + buttonSpacing; + const int startX = (pageWidth - totalWidth) / 2; + + // Draw "Yes" button + if (savePromptSelection == 0) { + renderer.drawText(UI_FONT_ID, startX, buttonY, "[Yes]"); + } else { + renderer.drawText(UI_FONT_ID, startX + 4, buttonY, "Yes"); + } + + // Draw "No" button + if (savePromptSelection == 1) { + renderer.drawText(UI_FONT_ID, startX + buttonWidth + buttonSpacing, buttonY, "[No]"); + } else { + renderer.drawText(UI_FONT_ID, startX + buttonWidth + buttonSpacing + 4, buttonY, "No"); + } + + renderer.drawCenteredText(SMALL_FONT_ID, pageHeight - 30, "LEFT/RIGHT: Select | OK: Confirm", true, REGULAR); +} + +void WifiSelectionActivity::renderConnectionFailed() const { + const auto pageHeight = GfxRenderer::getScreenHeight(); + const auto height = renderer.getLineHeight(UI_FONT_ID); + const auto top = (pageHeight - height * 2) / 2; + + renderer.drawCenteredText(READER_FONT_ID, top - 20, "Connection Failed", true, BOLD); + renderer.drawCenteredText(UI_FONT_ID, top + 20, connectionError.c_str(), true, REGULAR); + renderer.drawCenteredText(SMALL_FONT_ID, pageHeight - 30, "Press any button to continue", true, REGULAR); +} + +void WifiSelectionActivity::renderForgetPrompt() const { + const auto pageWidth = GfxRenderer::getScreenWidth(); + const auto pageHeight = GfxRenderer::getScreenHeight(); + const auto height = renderer.getLineHeight(UI_FONT_ID); + const auto top = (pageHeight - height * 3) / 2; + + renderer.drawCenteredText(READER_FONT_ID, top - 40, "Forget Network?", true, BOLD); + + std::string ssidInfo = "Network: " + selectedSSID; + if (ssidInfo.length() > 28) { + ssidInfo = ssidInfo.substr(0, 25) + "..."; + } + renderer.drawCenteredText(UI_FONT_ID, top, ssidInfo.c_str(), true, REGULAR); + + renderer.drawCenteredText(UI_FONT_ID, top + 40, "Remove saved password?", true, REGULAR); + + // Draw Yes/No buttons + const int buttonY = top + 80; + const int buttonWidth = 60; + const int buttonSpacing = 30; + const int totalWidth = buttonWidth * 2 + buttonSpacing; + const int startX = (pageWidth - totalWidth) / 2; + + // Draw "Yes" button + if (forgetPromptSelection == 0) { + renderer.drawText(UI_FONT_ID, startX, buttonY, "[Yes]"); + } else { + renderer.drawText(UI_FONT_ID, startX + 4, buttonY, "Yes"); + } + + // Draw "No" button + if (forgetPromptSelection == 1) { + renderer.drawText(UI_FONT_ID, startX + buttonWidth + buttonSpacing, buttonY, "[No]"); + } else { + renderer.drawText(UI_FONT_ID, startX + buttonWidth + buttonSpacing + 4, buttonY, "No"); + } + + renderer.drawCenteredText(SMALL_FONT_ID, pageHeight - 30, "LEFT/RIGHT: Select | OK: Confirm", true, REGULAR); +} diff --git a/src/activities/network/WifiSelectionActivity.h b/src/activities/network/WifiSelectionActivity.h new file mode 100644 index 0000000..e7b12ae --- /dev/null +++ b/src/activities/network/WifiSelectionActivity.h @@ -0,0 +1,108 @@ +#pragma once +#include +#include +#include + +#include +#include +#include +#include +#include + +#include "../Activity.h" +#include "../util/KeyboardEntryActivity.h" + +// Structure to hold WiFi network information +struct WifiNetworkInfo { + std::string ssid; + int32_t rssi; + bool isEncrypted; + bool hasSavedPassword; // Whether we have saved credentials for this network +}; + +// WiFi selection states +enum class WifiSelectionState { + SCANNING, // Scanning for networks + NETWORK_LIST, // Displaying available networks + PASSWORD_ENTRY, // Entering password for selected network + CONNECTING, // Attempting to connect + CONNECTED, // Successfully connected + SAVE_PROMPT, // Asking user if they want to save the password + CONNECTION_FAILED, // Connection failed + FORGET_PROMPT // Asking user if they want to forget the network +}; + +/** + * WifiSelectionActivity is responsible for scanning WiFi APs and connecting to them. + * It will: + * - Enter scanning mode on entry + * - List available WiFi networks + * - Allow selection and launch KeyboardEntryActivity for password if needed + * - Save the password if requested + * - Call onComplete callback when connected or cancelled + * + * The onComplete callback receives true if connected successfully, false if cancelled. + */ +class WifiSelectionActivity final : public Activity { + TaskHandle_t displayTaskHandle = nullptr; + SemaphoreHandle_t renderingMutex = nullptr; + bool updateRequired = false; + WifiSelectionState state = WifiSelectionState::SCANNING; + int selectedNetworkIndex = 0; + std::vector networks; + const std::function onComplete; + + // Selected network for connection + std::string selectedSSID; + bool selectedRequiresPassword = false; + + // On-screen keyboard for password entry + std::unique_ptr keyboard; + + // Connection result + std::string connectedIP; + std::string connectionError; + + // Password to potentially save (from keyboard or saved credentials) + std::string enteredPassword; + + // Whether network was connected using a saved password (skip save prompt) + bool usedSavedPassword = false; + + // Save/forget prompt selection (0 = Yes, 1 = No) + int savePromptSelection = 0; + int forgetPromptSelection = 0; + + // Connection timeout + static constexpr unsigned long CONNECTION_TIMEOUT_MS = 15000; + unsigned long connectionStartTime = 0; + + static void taskTrampoline(void* param); + [[noreturn]] void displayTaskLoop(); + void render() const; + void renderNetworkList() const; + void renderPasswordEntry() const; + void renderConnecting() const; + void renderConnected() const; + void renderSavePrompt() const; + void renderConnectionFailed() const; + void renderForgetPrompt() const; + + void startWifiScan(); + void processWifiScanResults(); + void selectNetwork(int index); + void attemptConnection(); + void checkConnectionStatus(); + std::string getSignalStrengthIndicator(int32_t rssi) const; + + public: + explicit WifiSelectionActivity(GfxRenderer& renderer, InputManager& inputManager, + const std::function& onComplete) + : Activity(renderer, inputManager), onComplete(onComplete) {} + void onEnter() override; + void onExit() override; + void loop() override; + + // Get the IP address after successful connection + const std::string& getConnectedIP() const { return connectedIP; } +}; diff --git a/src/activities/network/server/CrossPointWebServer.cpp b/src/activities/network/server/CrossPointWebServer.cpp new file mode 100644 index 0000000..61a8813 --- /dev/null +++ b/src/activities/network/server/CrossPointWebServer.cpp @@ -0,0 +1,735 @@ +#include "CrossPointWebServer.h" + +#include +#include + +#include + +#include "config.h" +#include "html/FilesPageFooterHtml.generated.h" +#include "html/FilesPageHeaderHtml.generated.h" +#include "html/HomePageHtml.generated.h" + +namespace { + +// Folders/files to hide from the web interface file browser +// Note: Items starting with "." are automatically hidden +const char* HIDDEN_ITEMS[] = {"System Volume Information", "XTCache"}; +const size_t HIDDEN_ITEMS_COUNT = sizeof(HIDDEN_ITEMS) / sizeof(HIDDEN_ITEMS[0]); + +// Helper function to escape HTML special characters to prevent XSS +String escapeHtml(const String& input) { + String output; + output.reserve(input.length() * 1.1); // Pre-allocate with some extra space + + for (size_t i = 0; i < input.length(); i++) { + char c = input.charAt(i); + switch (c) { + case '&': + output += "&"; + break; + case '<': + output += "<"; + break; + case '>': + output += ">"; + break; + case '"': + output += """; + break; + case '\'': + output += "'"; + break; + default: + output += c; + break; + } + } + return output; +} + +} // namespace + +// File listing page template - now using generated headers: +// - HomePageHtml (from html/HomePage.html) +// - FilesPageHeaderHtml (from html/FilesPageHeader.html) +// - FilesPageFooterHtml (from html/FilesPageFooter.html) +CrossPointWebServer::CrossPointWebServer() {} + +CrossPointWebServer::~CrossPointWebServer() { stop(); } + +void CrossPointWebServer::begin() { + if (running) { + Serial.printf("[%lu] [WEB] Web server already running\n", millis()); + return; + } + + if (WiFi.status() != WL_CONNECTED) { + Serial.printf("[%lu] [WEB] Cannot start webserver - WiFi not connected\n", millis()); + return; + } + + Serial.printf("[%lu] [WEB] [MEM] Free heap before begin: %d bytes\n", millis(), ESP.getFreeHeap()); + + Serial.printf("[%lu] [WEB] Creating web server on port %d...\n", millis(), port); + server = new WebServer(port); + Serial.printf("[%lu] [WEB] [MEM] Free heap after WebServer allocation: %d bytes\n", millis(), ESP.getFreeHeap()); + + if (!server) { + Serial.printf("[%lu] [WEB] Failed to create WebServer!\n", millis()); + return; + } + + // Setup routes + Serial.printf("[%lu] [WEB] Setting up routes...\n", millis()); + server->on("/", HTTP_GET, [this]() { handleRoot(); }); + server->on("/status", HTTP_GET, [this]() { handleStatus(); }); + server->on("/files", HTTP_GET, [this]() { handleFileList(); }); + + // Upload endpoint with special handling for multipart form data + server->on("/upload", HTTP_POST, [this]() { handleUploadPost(); }, [this]() { handleUpload(); }); + + // Create folder endpoint + server->on("/mkdir", HTTP_POST, [this]() { handleCreateFolder(); }); + + // Delete file/folder endpoint + server->on("/delete", HTTP_POST, [this]() { handleDelete(); }); + + server->onNotFound([this]() { handleNotFound(); }); + Serial.printf("[%lu] [WEB] [MEM] Free heap after route setup: %d bytes\n", millis(), ESP.getFreeHeap()); + + server->begin(); + running = true; + + Serial.printf("[%lu] [WEB] Web server started on port %d\n", millis(), port); + Serial.printf("[%lu] [WEB] Access at http://%s/\n", millis(), WiFi.localIP().toString().c_str()); + Serial.printf("[%lu] [WEB] [MEM] Free heap after server.begin(): %d bytes\n", millis(), ESP.getFreeHeap()); +} + +void CrossPointWebServer::stop() { + if (!running || !server) { + Serial.printf("[%lu] [WEB] stop() called but already stopped (running=%d, server=%p)\n", millis(), running, server); + return; + } + + Serial.printf("[%lu] [WEB] STOP INITIATED - setting running=false first\n", millis()); + running = false; // Set this FIRST to prevent handleClient from using server + + Serial.printf("[%lu] [WEB] [MEM] Free heap before stop: %d bytes\n", millis(), ESP.getFreeHeap()); + + // Add delay to allow any in-flight handleClient() calls to complete + delay(100); + Serial.printf("[%lu] [WEB] Waited 100ms for handleClient to finish\n", millis()); + + server->stop(); + Serial.printf("[%lu] [WEB] [MEM] Free heap after server->stop(): %d bytes\n", millis(), ESP.getFreeHeap()); + + // Add another delay before deletion to ensure server->stop() completes + delay(50); + Serial.printf("[%lu] [WEB] Waited 50ms before deleting server\n", millis()); + + delete server; + server = nullptr; + + Serial.printf("[%lu] [WEB] Web server stopped and deleted\n", millis()); + Serial.printf("[%lu] [WEB] [MEM] Free heap after delete server: %d bytes\n", millis(), ESP.getFreeHeap()); + + // Note: Static upload variables (uploadFileName, uploadPath, uploadError) are declared + // later in the file and will be cleared when they go out of scope or on next upload + Serial.printf("[%lu] [WEB] [MEM] Free heap final: %d bytes\n", millis(), ESP.getFreeHeap()); +} + +void CrossPointWebServer::handleClient() { + static unsigned long lastDebugPrint = 0; + + // Check running flag FIRST before accessing server + if (!running) { + return; + } + + // Double-check server pointer is valid + if (!server) { + Serial.printf("[%lu] [WEB] WARNING: handleClient called with null server!\n", millis()); + return; + } + + // Print debug every 10 seconds to confirm handleClient is being called + if (millis() - lastDebugPrint > 10000) { + Serial.printf("[%lu] [WEB] handleClient active, server running on port %d\n", millis(), port); + lastDebugPrint = millis(); + } + + server->handleClient(); +} + +void CrossPointWebServer::handleRoot() { + String html = HomePageHtml; + + // Replace placeholders with actual values + html.replace("%VERSION%", CROSSPOINT_VERSION); + html.replace("%IP_ADDRESS%", WiFi.localIP().toString()); + html.replace("%FREE_HEAP%", String(ESP.getFreeHeap())); + + server->send(200, "text/html", html); + Serial.printf("[%lu] [WEB] Served root page\n", millis()); +} + +void CrossPointWebServer::handleNotFound() { + String message = "404 Not Found\n\n"; + message += "URI: " + server->uri() + "\n"; + server->send(404, "text/plain", message); +} + +void CrossPointWebServer::handleStatus() { + String json = "{"; + json += "\"version\":\"" + String(CROSSPOINT_VERSION) + "\","; + json += "\"ip\":\"" + WiFi.localIP().toString() + "\","; + json += "\"rssi\":" + String(WiFi.RSSI()) + ","; + json += "\"freeHeap\":" + String(ESP.getFreeHeap()) + ","; + json += "\"uptime\":" + String(millis() / 1000); + json += "}"; + + server->send(200, "application/json", json); +} + +std::vector CrossPointWebServer::scanFiles(const char* path) { + std::vector files; + + File root = SD.open(path); + if (!root) { + Serial.printf("[%lu] [WEB] Failed to open directory: %s\n", millis(), path); + return files; + } + + if (!root.isDirectory()) { + Serial.printf("[%lu] [WEB] Not a directory: %s\n", millis(), path); + root.close(); + return files; + } + + Serial.printf("[%lu] [WEB] Scanning files in: %s\n", millis(), path); + + File file = root.openNextFile(); + while (file) { + String fileName = String(file.name()); + + // Skip hidden items (starting with ".") + bool shouldHide = fileName.startsWith("."); + + // Check against explicitly hidden items list + if (!shouldHide) { + for (size_t i = 0; i < HIDDEN_ITEMS_COUNT; i++) { + if (fileName.equals(HIDDEN_ITEMS[i])) { + shouldHide = true; + break; + } + } + } + + if (!shouldHide) { + FileInfo info; + info.name = fileName; + info.isDirectory = file.isDirectory(); + + if (info.isDirectory) { + info.size = 0; + info.isEpub = false; + } else { + info.size = file.size(); + info.isEpub = isEpubFile(info.name); + } + + files.push_back(info); + } + + file.close(); + file = root.openNextFile(); + } + root.close(); + + Serial.printf("[%lu] [WEB] Found %d items (files and folders)\n", millis(), files.size()); + return files; +} + +String CrossPointWebServer::formatFileSize(size_t bytes) { + if (bytes < 1024) { + return String(bytes) + " B"; + } else if (bytes < 1024 * 1024) { + return String(bytes / 1024.0, 1) + " KB"; + } else { + return String(bytes / (1024.0 * 1024.0), 1) + " MB"; + } +} + +bool CrossPointWebServer::isEpubFile(const String& filename) { + String lower = filename; + lower.toLowerCase(); + return lower.endsWith(".epub"); +} + +void CrossPointWebServer::handleFileList() { + String html = FilesPageHeaderHtml; + + // Get current path from query string (default to root) + String currentPath = "/"; + if (server->hasArg("path")) { + currentPath = server->arg("path"); + // Ensure path starts with / + if (!currentPath.startsWith("/")) { + currentPath = "/" + currentPath; + } + // Remove trailing slash unless it's root + if (currentPath.length() > 1 && currentPath.endsWith("/")) { + currentPath = currentPath.substring(0, currentPath.length() - 1); + } + } + + // Get message from query string if present + if (server->hasArg("msg")) { + String msg = escapeHtml(server->arg("msg")); + String msgType = server->hasArg("type") ? escapeHtml(server->arg("type")) : "success"; + html += "
" + msg + "
"; + } + + // Hidden input to store current path for JavaScript + html += ""; + + // Scan files in current path first (we need counts for the header) + std::vector files = scanFiles(currentPath.c_str()); + + // Count items + int epubCount = 0; + int folderCount = 0; + size_t totalSize = 0; + for (const auto& file : files) { + if (file.isDirectory) { + folderCount++; + } else { + if (file.isEpub) epubCount++; + totalSize += file.size; + } + } + + // Page header with inline breadcrumb and action buttons + html += "
"; + html += "
"; + html += "

📁 File Manager

"; + + // Inline breadcrumb + html += "
"; + html += "/"; + + if (currentPath == "/") { + html += "🏠"; + } else { + html += "🏠"; + String pathParts = currentPath.substring(1); // Remove leading / + String buildPath = ""; + int start = 0; + int end = pathParts.indexOf('/'); + + while (start < (int)pathParts.length()) { + String part; + if (end == -1) { + part = pathParts.substring(start); + buildPath += "/" + part; + html += "/" + escapeHtml(part) + ""; + break; + } else { + part = pathParts.substring(start, end); + buildPath += "/" + part; + html += "/" + escapeHtml(part) + ""; + start = end + 1; + end = pathParts.indexOf('/', start); + } + } + } + html += "
"; + html += "
"; + + // Action buttons + html += "
"; + html += ""; + html += ""; + html += "
"; + + html += "
"; // end page-header + + // Contents card with inline summary + html += "
"; + + // Contents header with inline stats + html += "
"; + html += "

Contents

"; + html += ""; + html += String(folderCount) + " folder" + (folderCount != 1 ? "s" : "") + ", "; + html += String(files.size() - folderCount) + " file" + ((files.size() - folderCount) != 1 ? "s" : "") + ", "; + html += formatFileSize(totalSize); + html += ""; + html += "
"; + + if (files.empty()) { + html += "
This folder is empty
"; + } else { + html += ""; + html += ""; + + // Sort files: folders first, then epub files, then other files, alphabetically within each group + std::sort(files.begin(), files.end(), [](const FileInfo& a, const FileInfo& b) { + // Folders come first + if (a.isDirectory != b.isDirectory) return a.isDirectory > b.isDirectory; + // Then sort by epub status (epubs first among files) + if (!a.isDirectory && !b.isDirectory) { + if (a.isEpub != b.isEpub) return a.isEpub > b.isEpub; + } + // Then alphabetically + return a.name < b.name; + }); + + for (const auto& file : files) { + String rowClass; + String icon; + String badge; + String typeStr; + String sizeStr; + + if (file.isDirectory) { + rowClass = "folder-row"; + icon = "📁"; + badge = "FOLDER"; + typeStr = "Folder"; + sizeStr = "-"; + + // Build the path to this folder + String folderPath = currentPath; + if (!folderPath.endsWith("/")) folderPath += "/"; + folderPath += file.name; + + html += ""; + html += ""; + html += ""; + html += ""; + // Escape quotes for JavaScript string + String escapedName = file.name; + escapedName.replace("'", "\\'"); + String escapedPath = folderPath; + escapedPath.replace("'", "\\'"); + html += ""; + html += ""; + } else { + rowClass = file.isEpub ? "epub-file" : ""; + icon = file.isEpub ? "📗" : "📄"; + badge = file.isEpub ? "EPUB" : ""; + String ext = file.name.substring(file.name.lastIndexOf('.') + 1); + ext.toUpperCase(); + typeStr = ext; + sizeStr = formatFileSize(file.size); + + // Build file path for delete + String filePath = currentPath; + if (!filePath.endsWith("/")) filePath += "/"; + filePath += file.name; + + html += ""; + html += ""; + html += ""; + html += ""; + // Escape quotes for JavaScript string + String escapedName = file.name; + escapedName.replace("'", "\\'"); + String escapedPath = filePath; + escapedPath.replace("'", "\\'"); + html += ""; + html += ""; + } + } + + html += "
NameTypeSizeActions
" + icon + ""; + html += "" + escapeHtml(file.name) + "" + + badge + "" + typeStr + "" + sizeStr + "
" + icon + "" + escapeHtml(file.name) + badge + "" + typeStr + "" + sizeStr + "
"; + } + + html += "
"; + + html += FilesPageFooterHtml; + + server->send(200, "text/html", html); + Serial.printf("[%lu] [WEB] Served file listing page for path: %s\n", millis(), currentPath.c_str()); +} + +// Static variables for upload handling +static File uploadFile; +static String uploadFileName; +static String uploadPath = "/"; +static size_t uploadSize = 0; +static bool uploadSuccess = false; +static String uploadError = ""; + +void CrossPointWebServer::handleUpload() { + static unsigned long lastWriteTime = 0; + static unsigned long uploadStartTime = 0; + static size_t lastLoggedSize = 0; + + // Safety check: ensure server is still valid + if (!running || !server) { + Serial.printf("[%lu] [WEB] [UPLOAD] ERROR: handleUpload called but server not running!\n", millis()); + return; + } + + HTTPUpload& upload = server->upload(); + + if (upload.status == UPLOAD_FILE_START) { + uploadFileName = upload.filename; + uploadSize = 0; + uploadSuccess = false; + uploadError = ""; + uploadStartTime = millis(); + lastWriteTime = millis(); + lastLoggedSize = 0; + + // Get upload path from query parameter (defaults to root if not specified) + // Note: We use query parameter instead of form data because multipart form + // fields aren't available until after file upload completes + if (server->hasArg("path")) { + uploadPath = server->arg("path"); + // Ensure path starts with / + if (!uploadPath.startsWith("/")) { + uploadPath = "/" + uploadPath; + } + // Remove trailing slash unless it's root + if (uploadPath.length() > 1 && uploadPath.endsWith("/")) { + uploadPath = uploadPath.substring(0, uploadPath.length() - 1); + } + } else { + uploadPath = "/"; + } + + Serial.printf("[%lu] [WEB] [UPLOAD] START: %s to path: %s\n", millis(), uploadFileName.c_str(), uploadPath.c_str()); + Serial.printf("[%lu] [WEB] [UPLOAD] Free heap: %d bytes\n", millis(), ESP.getFreeHeap()); + + // Validate file extension + if (!isEpubFile(uploadFileName)) { + uploadError = "Only .epub files are allowed"; + Serial.printf("[%lu] [WEB] [UPLOAD] REJECTED - not an epub file\n", millis()); + return; + } + + // Create file path + String filePath = uploadPath; + if (!filePath.endsWith("/")) filePath += "/"; + filePath += uploadFileName; + + // Check if file already exists + if (SD.exists(filePath.c_str())) { + Serial.printf("[%lu] [WEB] [UPLOAD] Overwriting existing file: %s\n", millis(), filePath.c_str()); + SD.remove(filePath.c_str()); + } + + // Open file for writing + uploadFile = SD.open(filePath.c_str(), FILE_WRITE); + if (!uploadFile) { + uploadError = "Failed to create file on SD card"; + Serial.printf("[%lu] [WEB] [UPLOAD] FAILED to create file: %s\n", millis(), filePath.c_str()); + return; + } + + Serial.printf("[%lu] [WEB] [UPLOAD] File created successfully: %s\n", millis(), filePath.c_str()); + } else if (upload.status == UPLOAD_FILE_WRITE) { + if (uploadFile && uploadError.isEmpty()) { + unsigned long writeStartTime = millis(); + size_t written = uploadFile.write(upload.buf, upload.currentSize); + unsigned long writeEndTime = millis(); + unsigned long writeDuration = writeEndTime - writeStartTime; + + if (written != upload.currentSize) { + uploadError = "Failed to write to SD card - disk may be full"; + uploadFile.close(); + Serial.printf("[%lu] [WEB] [UPLOAD] WRITE ERROR - expected %d, wrote %d\n", millis(), upload.currentSize, + written); + } else { + uploadSize += written; + + // Log progress every 50KB or if write took >100ms + if (uploadSize - lastLoggedSize >= 51200 || writeDuration > 100) { + unsigned long timeSinceStart = millis() - uploadStartTime; + unsigned long timeSinceLastWrite = millis() - lastWriteTime; + float kbps = (uploadSize / 1024.0) / (timeSinceStart / 1000.0); + + Serial.printf( + "[%lu] [WEB] [UPLOAD] Progress: %d bytes (%.1f KB), %.1f KB/s, write took %lu ms, gap since last: %lu " + "ms\n", + millis(), uploadSize, uploadSize / 1024.0, kbps, writeDuration, timeSinceLastWrite); + lastLoggedSize = uploadSize; + } + lastWriteTime = millis(); + } + } + } else if (upload.status == UPLOAD_FILE_END) { + if (uploadFile) { + uploadFile.close(); + + if (uploadError.isEmpty()) { + uploadSuccess = true; + Serial.printf("[%lu] [WEB] Upload complete: %s (%d bytes)\n", millis(), uploadFileName.c_str(), uploadSize); + } + } + } else if (upload.status == UPLOAD_FILE_ABORTED) { + if (uploadFile) { + uploadFile.close(); + // Try to delete the incomplete file + String filePath = uploadPath; + if (!filePath.endsWith("/")) filePath += "/"; + filePath += uploadFileName; + SD.remove(filePath.c_str()); + } + uploadError = "Upload aborted"; + Serial.printf("[%lu] [WEB] Upload aborted\n", millis()); + } +} + +void CrossPointWebServer::handleUploadPost() { + if (uploadSuccess) { + server->send(200, "text/plain", "File uploaded successfully: " + uploadFileName); + } else { + String error = uploadError.isEmpty() ? "Unknown error during upload" : uploadError; + server->send(400, "text/plain", error); + } +} + +void CrossPointWebServer::handleCreateFolder() { + // Get folder name from form data + if (!server->hasArg("name")) { + server->send(400, "text/plain", "Missing folder name"); + return; + } + + String folderName = server->arg("name"); + + // Validate folder name + if (folderName.isEmpty()) { + server->send(400, "text/plain", "Folder name cannot be empty"); + return; + } + + // Get parent path + String parentPath = "/"; + if (server->hasArg("path")) { + parentPath = server->arg("path"); + if (!parentPath.startsWith("/")) { + parentPath = "/" + parentPath; + } + if (parentPath.length() > 1 && parentPath.endsWith("/")) { + parentPath = parentPath.substring(0, parentPath.length() - 1); + } + } + + // Build full folder path + String folderPath = parentPath; + if (!folderPath.endsWith("/")) folderPath += "/"; + folderPath += folderName; + + Serial.printf("[%lu] [WEB] Creating folder: %s\n", millis(), folderPath.c_str()); + + // Check if already exists + if (SD.exists(folderPath.c_str())) { + server->send(400, "text/plain", "Folder already exists"); + return; + } + + // Create the folder + if (SD.mkdir(folderPath.c_str())) { + Serial.printf("[%lu] [WEB] Folder created successfully: %s\n", millis(), folderPath.c_str()); + server->send(200, "text/plain", "Folder created: " + folderName); + } else { + Serial.printf("[%lu] [WEB] Failed to create folder: %s\n", millis(), folderPath.c_str()); + server->send(500, "text/plain", "Failed to create folder"); + } +} + +void CrossPointWebServer::handleDelete() { + // Get path from form data + if (!server->hasArg("path")) { + server->send(400, "text/plain", "Missing path"); + return; + } + + String itemPath = server->arg("path"); + String itemType = server->hasArg("type") ? server->arg("type") : "file"; + + // Validate path + if (itemPath.isEmpty() || itemPath == "/") { + server->send(400, "text/plain", "Cannot delete root directory"); + return; + } + + // Ensure path starts with / + if (!itemPath.startsWith("/")) { + itemPath = "/" + itemPath; + } + + // Security check: prevent deletion of protected items + String itemName = itemPath.substring(itemPath.lastIndexOf('/') + 1); + + // Check if item starts with a dot (hidden/system file) + if (itemName.startsWith(".")) { + Serial.printf("[%lu] [WEB] Delete rejected - hidden/system item: %s\n", millis(), itemPath.c_str()); + server->send(403, "text/plain", "Cannot delete system files"); + return; + } + + // Check against explicitly protected items + for (size_t i = 0; i < HIDDEN_ITEMS_COUNT; i++) { + if (itemName.equals(HIDDEN_ITEMS[i])) { + Serial.printf("[%lu] [WEB] Delete rejected - protected item: %s\n", millis(), itemPath.c_str()); + server->send(403, "text/plain", "Cannot delete protected items"); + return; + } + } + + // Check if item exists + if (!SD.exists(itemPath.c_str())) { + Serial.printf("[%lu] [WEB] Delete failed - item not found: %s\n", millis(), itemPath.c_str()); + server->send(404, "text/plain", "Item not found"); + return; + } + + Serial.printf("[%lu] [WEB] Attempting to delete %s: %s\n", millis(), itemType.c_str(), itemPath.c_str()); + + bool success = false; + + if (itemType == "folder") { + // For folders, try to remove (will fail if not empty) + File dir = SD.open(itemPath.c_str()); + if (dir && dir.isDirectory()) { + // Check if folder is empty + File entry = dir.openNextFile(); + if (entry) { + // Folder is not empty + entry.close(); + dir.close(); + Serial.printf("[%lu] [WEB] Delete failed - folder not empty: %s\n", millis(), itemPath.c_str()); + server->send(400, "text/plain", "Folder is not empty. Delete contents first."); + return; + } + dir.close(); + } + success = SD.rmdir(itemPath.c_str()); + } else { + // For files, use remove + success = SD.remove(itemPath.c_str()); + } + + if (success) { + Serial.printf("[%lu] [WEB] Successfully deleted: %s\n", millis(), itemPath.c_str()); + server->send(200, "text/plain", "Deleted successfully"); + } else { + Serial.printf("[%lu] [WEB] Failed to delete: %s\n", millis(), itemPath.c_str()); + server->send(500, "text/plain", "Failed to delete item"); + } +} diff --git a/src/activities/network/server/CrossPointWebServer.h b/src/activities/network/server/CrossPointWebServer.h new file mode 100644 index 0000000..79c0b8e --- /dev/null +++ b/src/activities/network/server/CrossPointWebServer.h @@ -0,0 +1,56 @@ +#pragma once + +#include + +#include +#include +#include + +// Structure to hold file information +struct FileInfo { + String name; + size_t size; + bool isEpub; + bool isDirectory; +}; + +class CrossPointWebServer { + public: + CrossPointWebServer(); + ~CrossPointWebServer(); + + // Start the web server (call after WiFi is connected) + void begin(); + + // Stop the web server + void stop(); + + // Call this periodically to handle client requests + void handleClient(); + + // Check if server is running + bool isRunning() const { return running; } + + // Get the port number + uint16_t getPort() const { return port; } + + private: + WebServer* server = nullptr; + bool running = false; + uint16_t port = 80; + + // File scanning + std::vector scanFiles(const char* path = "/"); + String formatFileSize(size_t bytes); + bool isEpubFile(const String& filename); + + // Request handlers + void handleRoot(); + void handleNotFound(); + void handleStatus(); + void handleFileList(); + void handleUpload(); + void handleUploadPost(); + void handleCreateFolder(); + void handleDelete(); +}; diff --git a/src/activities/reader/EpubReaderActivity.cpp b/src/activities/reader/EpubReaderActivity.cpp index 8e65b13..9950f91 100644 --- a/src/activities/reader/EpubReaderActivity.cpp +++ b/src/activities/reader/EpubReaderActivity.cpp @@ -33,13 +33,14 @@ void EpubReaderActivity::onEnter() { epub->setupCacheDir(); - if (SD.exists((epub->getCachePath() + "/progress.bin").c_str())) { - File f = SD.open((epub->getCachePath() + "/progress.bin").c_str()); + File f = SD.open((epub->getCachePath() + "/progress.bin").c_str()); + if (f) { uint8_t data[4]; - f.read(data, 4); - currentSpineIndex = data[0] + (data[1] << 8); - nextPageNumber = data[2] + (data[3] << 8); - Serial.printf("[%lu] [ERS] Loaded cache: %d, %d\n", millis(), currentSpineIndex, nextPageNumber); + if (f.read(data, 4) == 4) { + currentSpineIndex = data[0] + (data[1] << 8); + nextPageNumber = data[2] + (data[3] << 8); + Serial.printf("[%lu] [ERS] Loaded cache: %d, %d\n", millis(), currentSpineIndex, nextPageNumber); + } f.close(); } @@ -213,12 +214,11 @@ void EpubReaderActivity::renderScreen() { { const int textWidth = renderer.getTextWidth(READER_FONT_ID, "Indexing..."); constexpr int margin = 20; - // Round all coordinates to 8 pixel boundaries - const int x = ((GfxRenderer::getScreenWidth() - textWidth - margin * 2) / 2 + 7) / 8 * 8; - constexpr int y = 56; - const int w = (textWidth + margin * 2 + 7) / 8 * 8; - const int h = (renderer.getLineHeight(READER_FONT_ID) + margin * 2 + 7) / 8 * 8; - renderer.clearScreen(); + const int x = (GfxRenderer::getScreenWidth() - textWidth - margin * 2) / 2; + constexpr int y = 50; + const int w = textWidth + margin * 2; + const int h = renderer.getLineHeight(READER_FONT_ID) + margin * 2; + renderer.fillRect(x, y, w, h, false); renderer.drawText(READER_FONT_ID, x + margin, y + margin, "Indexing..."); renderer.drawRect(x + 5, y + 5, w - 10, h - 10); renderer.displayBuffer(); @@ -382,7 +382,7 @@ void EpubReaderActivity::renderStatusBar() const { const auto tocItem = epub->getTocItem(tocIndex); title = tocItem.title; titleWidth = renderer.getTextWidth(SMALL_FONT_ID, title.c_str()); - while (titleWidth > availableTextWidth) { + while (titleWidth > availableTextWidth && title.length() > 11) { title = title.substr(0, title.length() - 8) + "..."; titleWidth = renderer.getTextWidth(SMALL_FONT_ID, title.c_str()); } diff --git a/src/activities/settings/SettingsActivity.cpp b/src/activities/settings/SettingsActivity.cpp index cbe1e77..0e1f05c 100644 --- a/src/activities/settings/SettingsActivity.cpp +++ b/src/activities/settings/SettingsActivity.cpp @@ -8,8 +8,9 @@ // Define the static settings list const SettingInfo SettingsActivity::settingsList[settingsCount] = { - {"White Sleep Screen", &CrossPointSettings::whiteSleepScreen}, - {"Extra Paragraph Spacing", &CrossPointSettings::extraParagraphSpacing}, + {"White Sleep Screen", SettingType::TOGGLE, &CrossPointSettings::whiteSleepScreen}, + {"Extra Paragraph Spacing", SettingType::TOGGLE, &CrossPointSettings::extraParagraphSpacing}, + {"Short Power Button Click", SettingType::TOGGLE, &CrossPointSettings::shortPwrBtn}, {"Hyphenation", &CrossPointSettings::hyphenationEnabled}}; void SettingsActivity::taskTrampoline(void* param) { @@ -65,9 +66,11 @@ void SettingsActivity::loop() { selectedSettingIndex = (selectedSettingIndex > 0) ? (selectedSettingIndex - 1) : (settingsCount - 1); updateRequired = true; } else if (inputManager.wasPressed(InputManager::BTN_DOWN) || inputManager.wasPressed(InputManager::BTN_RIGHT)) { - // Move selection down (with wrap-around) - selectedSettingIndex = (selectedSettingIndex < settingsCount - 1) ? (selectedSettingIndex + 1) : 0; - updateRequired = true; + // Move selection down + if (selectedSettingIndex < settingsCount - 1) { + selectedSettingIndex++; + updateRequired = true; + } } } @@ -77,9 +80,16 @@ void SettingsActivity::toggleCurrentSetting() { return; } + const auto& setting = settingsList[selectedSettingIndex]; + + // Only toggle if it's a toggle type and has a value pointer + if (setting.type != SettingType::TOGGLE || setting.valuePtr == nullptr) { + return; + } + // Toggle the boolean value using the member pointer - bool currentValue = SETTINGS.*(settingsList[selectedSettingIndex].valuePtr); - SETTINGS.*(settingsList[selectedSettingIndex].valuePtr) = !currentValue; + bool currentValue = SETTINGS.*(setting.valuePtr); + SETTINGS.*(setting.valuePtr) = !currentValue; // Save settings when they change SETTINGS.saveToFile(); @@ -106,8 +116,6 @@ void SettingsActivity::render() const { // Draw header renderer.drawCenteredText(READER_FONT_ID, 10, "Settings", true, BOLD); - // We always have at least one setting - // Draw all settings for (int i = 0; i < settingsCount; i++) { const int settingY = 60 + i * 30; // 30 pixels between settings @@ -117,10 +125,14 @@ void SettingsActivity::render() const { renderer.drawText(UI_FONT_ID, 5, settingY, ">"); } - // Draw setting name and value + // Draw setting name renderer.drawText(UI_FONT_ID, 20, settingY, settingsList[i].name); - bool value = SETTINGS.*(settingsList[i].valuePtr); - renderer.drawText(UI_FONT_ID, pageWidth - 80, settingY, value ? "ON" : "OFF"); + + // Draw value based on setting type + if (settingsList[i].type == SettingType::TOGGLE && settingsList[i].valuePtr != nullptr) { + bool value = SETTINGS.*(settingsList[i].valuePtr); + renderer.drawText(UI_FONT_ID, pageWidth - 80, settingY, value ? "ON" : "OFF"); + } } // Draw help text diff --git a/src/activities/settings/SettingsActivity.h b/src/activities/settings/SettingsActivity.h index 2464015..7843a5c 100644 --- a/src/activities/settings/SettingsActivity.h +++ b/src/activities/settings/SettingsActivity.h @@ -4,6 +4,7 @@ #include #include +#include #include #include @@ -11,10 +12,13 @@ class CrossPointSettings; +enum class SettingType { TOGGLE }; + // Structure to hold setting information struct SettingInfo { const char* name; // Display name of the setting - uint8_t CrossPointSettings::* valuePtr; // Pointer to member in CrossPointSettings + SettingType type; // Type of setting + uint8_t CrossPointSettings::* valuePtr; // Pointer to member in CrossPointSettings (for TOGGLE) }; class SettingsActivity final : public Activity { diff --git a/src/activities/util/KeyboardEntryActivity.cpp b/src/activities/util/KeyboardEntryActivity.cpp new file mode 100644 index 0000000..40d6fed --- /dev/null +++ b/src/activities/util/KeyboardEntryActivity.cpp @@ -0,0 +1,315 @@ +#include "KeyboardEntryActivity.h" + +#include "../../config.h" + +// Keyboard layouts - lowercase +const char* const KeyboardEntryActivity::keyboard[NUM_ROWS] = { + "`1234567890-=", "qwertyuiop[]\\", "asdfghjkl;'", "zxcvbnm,./", + "^ _____?", "^ _____ 0 && text.length() > maxLength) { + text = text.substr(0, maxLength); + } +} + +void KeyboardEntryActivity::reset(const std::string& newTitle, const std::string& newInitialText) { + if (!newTitle.empty()) { + title = newTitle; + } + text = newInitialText; + selectedRow = 0; + selectedCol = 0; + shiftActive = false; + complete = false; + cancelled = false; +} + +void KeyboardEntryActivity::onEnter() { + // Reset state when entering the activity + complete = false; + cancelled = false; +} + +void KeyboardEntryActivity::onExit() { + // Clean up if needed +} + +void KeyboardEntryActivity::loop() { + handleInput(); + render(10); +} + +int KeyboardEntryActivity::getRowLength(int row) const { + if (row < 0 || row >= NUM_ROWS) return 0; + + // Return actual length of each row based on keyboard layout + switch (row) { + case 0: + return 13; // `1234567890-= + case 1: + return 13; // qwertyuiop[]backslash + case 2: + return 11; // asdfghjkl;' + case 3: + return 10; // zxcvbnm,./ + case 4: + return 10; // ^, space (5 wide), backspace, OK (2 wide) + default: + return 0; + } +} + +char KeyboardEntryActivity::getSelectedChar() const { + const char* const* layout = shiftActive ? keyboardShift : keyboard; + + if (selectedRow < 0 || selectedRow >= NUM_ROWS) return '\0'; + if (selectedCol < 0 || selectedCol >= getRowLength(selectedRow)) return '\0'; + + return layout[selectedRow][selectedCol]; +} + +void KeyboardEntryActivity::handleKeyPress() { + // Handle special row (bottom row with shift, space, backspace, done) + if (selectedRow == SHIFT_ROW) { + if (selectedCol == SHIFT_COL) { + // Shift toggle + shiftActive = !shiftActive; + return; + } + + if (selectedCol >= SPACE_COL && selectedCol < BACKSPACE_COL) { + // Space bar + if (maxLength == 0 || text.length() < maxLength) { + text += ' '; + } + return; + } + + if (selectedCol == BACKSPACE_COL) { + // Backspace + if (!text.empty()) { + text.pop_back(); + } + return; + } + + if (selectedCol >= DONE_COL) { + // Done button + complete = true; + if (onComplete) { + onComplete(text); + } + return; + } + } + + // Regular character + char c = getSelectedChar(); + if (c != '\0' && c != '^' && c != '_' && c != '<') { + if (maxLength == 0 || text.length() < maxLength) { + text += c; + // Auto-disable shift after typing a letter + if (shiftActive && ((c >= 'A' && c <= 'Z') || (c >= 'a' && c <= 'z'))) { + shiftActive = false; + } + } + } +} + +bool KeyboardEntryActivity::handleInput() { + if (complete || cancelled) { + return false; + } + + bool handled = false; + + // Navigation + if (inputManager.wasPressed(InputManager::BTN_UP)) { + if (selectedRow > 0) { + selectedRow--; + // Clamp column to valid range for new row + int maxCol = getRowLength(selectedRow) - 1; + if (selectedCol > maxCol) selectedCol = maxCol; + } + handled = true; + } else if (inputManager.wasPressed(InputManager::BTN_DOWN)) { + if (selectedRow < NUM_ROWS - 1) { + selectedRow++; + int maxCol = getRowLength(selectedRow) - 1; + if (selectedCol > maxCol) selectedCol = maxCol; + } + handled = true; + } else if (inputManager.wasPressed(InputManager::BTN_LEFT)) { + if (selectedCol > 0) { + selectedCol--; + } else if (selectedRow > 0) { + // Wrap to previous row + selectedRow--; + selectedCol = getRowLength(selectedRow) - 1; + } + handled = true; + } else if (inputManager.wasPressed(InputManager::BTN_RIGHT)) { + int maxCol = getRowLength(selectedRow) - 1; + if (selectedCol < maxCol) { + selectedCol++; + } else if (selectedRow < NUM_ROWS - 1) { + // Wrap to next row + selectedRow++; + selectedCol = 0; + } + handled = true; + } + + // Selection + if (inputManager.wasPressed(InputManager::BTN_CONFIRM)) { + handleKeyPress(); + handled = true; + } + + // Cancel + if (inputManager.wasPressed(InputManager::BTN_BACK)) { + cancelled = true; + if (onCancel) { + onCancel(); + } + handled = true; + } + + return handled; +} + +void KeyboardEntryActivity::render(int startY) const { + const auto pageWidth = GfxRenderer::getScreenWidth(); + + // Draw title + renderer.drawCenteredText(UI_FONT_ID, startY, title.c_str(), true, REGULAR); + + // Draw input field + int inputY = startY + 22; + renderer.drawText(UI_FONT_ID, 10, inputY, "["); + + std::string displayText; + if (isPassword) { + displayText = std::string(text.length(), '*'); + } else { + displayText = text; + } + + // Show cursor at end + displayText += "_"; + + // Truncate if too long for display - use actual character width from font + int charWidth = renderer.getSpaceWidth(UI_FONT_ID); + if (charWidth < 1) charWidth = 8; // Fallback to approximate width + int maxDisplayLen = (pageWidth - 40) / charWidth; + if (displayText.length() > static_cast(maxDisplayLen)) { + displayText = "..." + displayText.substr(displayText.length() - maxDisplayLen + 3); + } + + renderer.drawText(UI_FONT_ID, 20, inputY, displayText.c_str()); + renderer.drawText(UI_FONT_ID, pageWidth - 15, inputY, "]"); + + // Draw keyboard - use compact spacing to fit 5 rows on screen + int keyboardStartY = inputY + 25; + const int keyWidth = 18; + const int keyHeight = 18; + const int keySpacing = 3; + + const char* const* layout = shiftActive ? keyboardShift : keyboard; + + // Calculate left margin to center the longest row (13 keys) + int maxRowWidth = KEYS_PER_ROW * (keyWidth + keySpacing); + int leftMargin = (pageWidth - maxRowWidth) / 2; + + for (int row = 0; row < NUM_ROWS; row++) { + int rowY = keyboardStartY + row * (keyHeight + keySpacing); + + // Left-align all rows for consistent navigation + int startX = leftMargin; + + // Handle bottom row (row 4) specially with proper multi-column keys + if (row == 4) { + // Bottom row layout: CAPS (2 cols) | SPACE (5 cols) | <- (2 cols) | OK (2 cols) + // Total: 11 visual columns, but we use logical positions for selection + + int currentX = startX; + + // CAPS key (logical col 0, spans 2 key widths) + int capsWidth = 2 * keyWidth + keySpacing; + bool capsSelected = (selectedRow == 4 && selectedCol == SHIFT_COL); + if (capsSelected) { + renderer.drawText(UI_FONT_ID, currentX - 2, rowY, "["); + renderer.drawText(UI_FONT_ID, currentX + capsWidth - 4, rowY, "]"); + } + renderer.drawText(UI_FONT_ID, currentX + 2, rowY, shiftActive ? "CAPS" : "caps"); + currentX += capsWidth + keySpacing; + + // Space bar (logical cols 2-6, spans 5 key widths) + int spaceWidth = 5 * keyWidth + 4 * keySpacing; + bool spaceSelected = (selectedRow == 4 && selectedCol >= SPACE_COL && selectedCol < BACKSPACE_COL); + if (spaceSelected) { + renderer.drawText(UI_FONT_ID, currentX - 2, rowY, "["); + renderer.drawText(UI_FONT_ID, currentX + spaceWidth - 4, rowY, "]"); + } + // Draw centered underscores for space bar + int spaceTextX = currentX + (spaceWidth / 2) - 12; + renderer.drawText(UI_FONT_ID, spaceTextX, rowY, "_____"); + currentX += spaceWidth + keySpacing; + + // Backspace key (logical col 7, spans 2 key widths) + int bsWidth = 2 * keyWidth + keySpacing; + bool bsSelected = (selectedRow == 4 && selectedCol == BACKSPACE_COL); + if (bsSelected) { + renderer.drawText(UI_FONT_ID, currentX - 2, rowY, "["); + renderer.drawText(UI_FONT_ID, currentX + bsWidth - 4, rowY, "]"); + } + renderer.drawText(UI_FONT_ID, currentX + 6, rowY, "<-"); + currentX += bsWidth + keySpacing; + + // OK button (logical col 9, spans 2 key widths) + int okWidth = 2 * keyWidth + keySpacing; + bool okSelected = (selectedRow == 4 && selectedCol >= DONE_COL); + if (okSelected) { + renderer.drawText(UI_FONT_ID, currentX - 2, rowY, "["); + renderer.drawText(UI_FONT_ID, currentX + okWidth - 4, rowY, "]"); + } + renderer.drawText(UI_FONT_ID, currentX + 8, rowY, "OK"); + + } else { + // Regular rows: render each key individually + for (int col = 0; col < getRowLength(row); col++) { + int keyX = startX + col * (keyWidth + keySpacing); + + // Get the character to display + char c = layout[row][col]; + std::string keyLabel(1, c); + + // Draw selection highlight + bool isSelected = (row == selectedRow && col == selectedCol); + + if (isSelected) { + renderer.drawText(UI_FONT_ID, keyX - 2, rowY, "["); + renderer.drawText(UI_FONT_ID, keyX + keyWidth - 4, rowY, "]"); + } + + renderer.drawText(UI_FONT_ID, keyX + 2, rowY, keyLabel.c_str()); + } + } + } + + // Draw help text at absolute bottom of screen (consistent with other screens) + const auto pageHeight = GfxRenderer::getScreenHeight(); + renderer.drawText(SMALL_FONT_ID, 10, pageHeight - 30, "Navigate: D-pad | Select: OK | Cancel: BACK"); +} diff --git a/src/activities/util/KeyboardEntryActivity.h b/src/activities/util/KeyboardEntryActivity.h new file mode 100644 index 0000000..af6d9b4 --- /dev/null +++ b/src/activities/util/KeyboardEntryActivity.h @@ -0,0 +1,127 @@ +#pragma once +#include +#include + +#include +#include + +#include "../Activity.h" + +/** + * Reusable keyboard entry activity for text input. + * Can be started from any activity that needs text entry. + * + * Usage: + * 1. Create a KeyboardEntryActivity instance + * 2. Set callbacks with setOnComplete() and setOnCancel() + * 3. Call onEnter() to start the activity + * 4. Call loop() in your main loop + * 5. When complete or cancelled, callbacks will be invoked + */ +class KeyboardEntryActivity : public Activity { + public: + // Callback types + using OnCompleteCallback = std::function; + using OnCancelCallback = std::function; + + /** + * Constructor + * @param renderer Reference to the GfxRenderer for drawing + * @param inputManager Reference to InputManager for handling input + * @param title Title to display above the keyboard + * @param initialText Initial text to show in the input field + * @param maxLength Maximum length of input text (0 for unlimited) + * @param isPassword If true, display asterisks instead of actual characters + */ + KeyboardEntryActivity(GfxRenderer& renderer, InputManager& inputManager, const std::string& title = "Enter Text", + const std::string& initialText = "", size_t maxLength = 0, bool isPassword = false); + + /** + * Handle button input. Call this in your main loop. + * @return true if input was handled, false otherwise + */ + bool handleInput(); + + /** + * Render the keyboard at the specified Y position. + * @param startY Y-coordinate where keyboard rendering starts (default 10) + */ + void render(int startY = 10) const; + + /** + * Get the current text entered by the user. + */ + const std::string& getText() const { return text; } + + /** + * Set the current text. + */ + void setText(const std::string& newText); + + /** + * Check if the user has completed text entry (pressed OK on Done). + */ + bool isComplete() const { return complete; } + + /** + * Check if the user has cancelled text entry. + */ + bool isCancelled() const { return cancelled; } + + /** + * Reset the keyboard state for reuse. + */ + void reset(const std::string& newTitle = "", const std::string& newInitialText = ""); + + /** + * Set callback for when input is complete. + */ + void setOnComplete(OnCompleteCallback callback) { onComplete = callback; } + + /** + * Set callback for when input is cancelled. + */ + void setOnCancel(OnCancelCallback callback) { onCancel = callback; } + + // Activity overrides + void onEnter() override; + void onExit() override; + void loop() override; + + private: + std::string title; + std::string text; + size_t maxLength; + bool isPassword; + + // Keyboard state + int selectedRow = 0; + int selectedCol = 0; + bool shiftActive = false; + bool complete = false; + bool cancelled = false; + + // Callbacks + OnCompleteCallback onComplete; + OnCancelCallback onCancel; + + // Keyboard layout + static constexpr int NUM_ROWS = 5; + static constexpr int KEYS_PER_ROW = 13; // Max keys per row (rows 0 and 1 have 13 keys) + static const char* const keyboard[NUM_ROWS]; + static const char* const keyboardShift[NUM_ROWS]; + + // Special key positions (bottom row) + static constexpr int SHIFT_ROW = 4; + static constexpr int SHIFT_COL = 0; + static constexpr int SPACE_ROW = 4; + static constexpr int SPACE_COL = 2; + static constexpr int BACKSPACE_ROW = 4; + static constexpr int BACKSPACE_COL = 7; + static constexpr int DONE_ROW = 4; + static constexpr int DONE_COL = 9; + + char getSelectedChar() const; + void handleKeyPress(); + int getRowLength(int row) const; +}; diff --git a/src/html/FilesPageFooter.html b/src/html/FilesPageFooter.html new file mode 100644 index 0000000..102430a --- /dev/null +++ b/src/html/FilesPageFooter.html @@ -0,0 +1,251 @@ +
+

+ CrossPoint E-Reader • Open Source +

+
+ + + + + + + + + + + + + diff --git a/src/html/FilesPageHeader.html b/src/html/FilesPageHeader.html new file mode 100644 index 0000000..7ebfc88 --- /dev/null +++ b/src/html/FilesPageHeader.html @@ -0,0 +1,472 @@ + + + + + + CrossPoint Reader - Files + + + +
+ Home + File Manager +
+ + diff --git a/src/html/HomePage.html b/src/html/HomePage.html new file mode 100644 index 0000000..024c6a9 --- /dev/null +++ b/src/html/HomePage.html @@ -0,0 +1,108 @@ + + + + + + CrossPoint Reader + + + +

📚 CrossPoint Reader

+ +
+ Home + File Manager +
+ +
+

Device Status

+
+ Version + %VERSION% +
+
+ WiFi Status + Connected +
+
+ IP Address + %IP_ADDRESS% +
+
+ Free Memory + %FREE_HEAP% bytes +
+
+ +
+

+ CrossPoint E-Reader • Open Source +

+
+ + diff --git a/src/main.cpp b/src/main.cpp index d12c701..86169a5 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -5,6 +5,7 @@ #include #include #include +#include #include #include #include @@ -19,6 +20,7 @@ #include "activities/boot_sleep/BootActivity.h" #include "activities/boot_sleep/SleepActivity.h" #include "activities/home/HomeActivity.h" +#include "activities/network/CrossPointWebServerActivity.h" #include "activities/reader/ReaderActivity.h" #include "activities/settings/SettingsActivity.h" #include "activities/util/FullScreenMessageActivity.h" @@ -57,11 +59,6 @@ EpdFont ubuntu10Font(&ubuntu_10); EpdFont ubuntuBold10Font(&ubuntu_bold_10); EpdFontFamily ubuntuFontFamily(&ubuntu10Font, &ubuntuBold10Font); -// Power button timing -// Time required to confirm boot from sleep -constexpr unsigned long POWER_BUTTON_WAKEUP_MS = 500; -// Time required to enter sleep mode -constexpr unsigned long POWER_BUTTON_SLEEP_MS = 500; // Auto-sleep timeout (10 minutes of inactivity) constexpr unsigned long AUTO_SLEEP_TIMEOUT_MS = 10 * 60 * 1000; @@ -69,6 +66,7 @@ void exitActivity() { if (currentActivity) { currentActivity->onExit(); delete currentActivity; + currentActivity = nullptr; } } @@ -79,23 +77,24 @@ void enterNewActivity(Activity* activity) { // Verify long press on wake-up from deep sleep void verifyWakeupLongPress() { - // Give the user up to 1000ms to start holding the power button, and must hold for POWER_BUTTON_WAKEUP_MS + // Give the user up to 1000ms to start holding the power button, and must hold for SETTINGS.getPowerButtonDuration() const auto start = millis(); bool abort = false; - Serial.printf("[%lu] [ ] Verifying power button press\n", millis()); inputManager.update(); + // Verify the user has actually pressed while (!inputManager.isPressed(InputManager::BTN_POWER) && millis() - start < 1000) { - delay(50); + delay(10); // only wait 10ms each iteration to not delay too much in case of short configured duration. inputManager.update(); } if (inputManager.isPressed(InputManager::BTN_POWER)) { do { - delay(50); + delay(10); inputManager.update(); - } while (inputManager.isPressed(InputManager::BTN_POWER) && inputManager.getHeldTime() < POWER_BUTTON_WAKEUP_MS); - abort = inputManager.getHeldTime() < POWER_BUTTON_WAKEUP_MS; + } while (inputManager.isPressed(InputManager::BTN_POWER) && + inputManager.getHeldTime() < SETTINGS.getPowerButtonDuration()); + abort = inputManager.getHeldTime() < SETTINGS.getPowerButtonDuration(); } else { abort = true; } @@ -121,7 +120,7 @@ void enterDeepSleep() { exitActivity(); enterNewActivity(new SleepActivity(renderer, inputManager)); - Serial.printf("[%lu] [ ] Power button released after a long press. Entering deep sleep.\n", millis()); + Serial.printf("[%lu] [ ] Entering deep sleep.\n", millis()); delay(1000); // Allow Serial buffer to empty and display to update // Enable Wakeup on LOW (button press) @@ -140,6 +139,11 @@ void onGoToReader(const std::string& initialEpubPath) { } void onGoToReaderHome() { onGoToReader(std::string()); } +void onGoToFileTransfer() { + exitActivity(); + enterNewActivity(new CrossPointWebServerActivity(renderer, inputManager, onGoHome)); +} + void onGoToSettings() { exitActivity(); enterNewActivity(new SettingsActivity(renderer, inputManager, onGoHome)); @@ -147,7 +151,7 @@ void onGoToSettings() { void onGoHome() { exitActivity(); - enterNewActivity(new HomeActivity(renderer, inputManager, onGoToReaderHome, onGoToSettings)); + enterNewActivity(new HomeActivity(renderer, inputManager, onGoToReaderHome, onGoToSettings, onGoToFileTransfer)); } void setup() { @@ -156,14 +160,25 @@ void setup() { Serial.printf("[%lu] [ ] Starting CrossPoint version " CROSSPOINT_VERSION "\n", millis()); inputManager.begin(); - verifyWakeupLongPress(); - // Initialize pins pinMode(BAT_GPIO0, INPUT); // Initialize SPI with custom pins SPI.begin(EPD_SCLK, SD_SPI_MISO, EPD_MOSI, EPD_CS); + // SD Card Initialization + if (!SD.begin(SD_SPI_CS, SPI, SPI_FQ)) { + Serial.printf("[%lu] [ ] SD card initialization failed\n", millis()); + exitActivity(); + enterNewActivity(new FullScreenMessageActivity(renderer, inputManager, "SD card error", BOLD)); + return; + } + + SETTINGS.loadFromFile(); + + // verify power button press duration after we've read settings. + verifyWakeupLongPress(); + // Initialize display einkDisplay.begin(); Serial.printf("[%lu] [ ] Display initialized\n", millis()); @@ -176,10 +191,6 @@ void setup() { exitActivity(); enterNewActivity(new BootActivity(renderer, inputManager)); - // SD Card Initialization - SD.begin(SD_SPI_CS, SPI, SPI_FQ); - - SETTINGS.loadFromFile(); APP_STATE.loadFromFile(); if (APP_STATE.openEpubPath.empty()) { onGoHome(); @@ -192,7 +203,10 @@ void setup() { } void loop() { - delay(10); + static unsigned long lastLoopTime = 0; + static unsigned long maxLoopDuration = 0; + + unsigned long loopStartTime = millis(); static unsigned long lastMemPrint = 0; if (Serial && millis() - lastMemPrint >= 10000) { @@ -216,13 +230,36 @@ void loop() { return; } - if (inputManager.wasReleased(InputManager::BTN_POWER) && inputManager.getHeldTime() > POWER_BUTTON_SLEEP_MS) { + if (inputManager.wasReleased(InputManager::BTN_POWER) && + inputManager.getHeldTime() > SETTINGS.getPowerButtonDuration()) { enterDeepSleep(); // This should never be hit as `enterDeepSleep` calls esp_deep_sleep_start return; } + unsigned long activityStartTime = millis(); if (currentActivity) { currentActivity->loop(); } + unsigned long activityDuration = millis() - activityStartTime; + + unsigned long loopDuration = millis() - loopStartTime; + if (loopDuration > maxLoopDuration) { + maxLoopDuration = loopDuration; + if (maxLoopDuration > 50) { + Serial.printf("[%lu] [LOOP] New max loop duration: %lu ms (activity: %lu ms)\n", millis(), maxLoopDuration, + activityDuration); + } + } + + lastLoopTime = loopStartTime; + + // Add delay at the end of the loop to prevent tight spinning + // When an activity requests skip loop delay (e.g., webserver running), use yield() for faster response + // Otherwise, use longer delay to save power + if (currentActivity && currentActivity->skipLoopDelay()) { + yield(); // Give FreeRTOS a chance to run tasks, but return immediately + } else { + delay(10); // Normal delay when no activity requires fast response + } }