ed8a0feac1
Currently, each activity has to manage their own `displayTaskLoop` which adds redundant boilerplate code. The loop is a wait loop which is also not the best practice, as the `updateRequested` boolean is not protected by a mutex. In this PR: - Move `displayTaskLoop` to the super `Activity` class - Replace `updateRequested` with freeRTOS's [direct to task notification](https://www.freertos.org/Documentation/02-Kernel/02-Kernel-features/03-Direct-to-task-notifications/01-Task-notifications) - For `ActivityWithSubactivity`, whenever a sub-activity is present, the parent's `render()` automatically goes inactive With this change, activities now only need to expose `render()` function, and anywhere in the code base can call `requestUpdate()` to request a new rendering pass. In theory, this change may also make the battery life a bit better, since one wait loop is removed. Although the equipment in my home lab wasn't been able to verify it (the electric current is too noisy and small). Would appreciate if anyone has any insights on this subject. Update: I managed to hack [a small piece of code](https://github.com/ngxson/crosspoint-reader/tree/xsn/measure_cpu_usage) that allow tracking CPU idle time. The CPU load does decrease a bit (1.47% down to 1.39%), which make sense, because the display task is now sleeping most of the time unless notified. This should translate to a slightly increase in battery life in the long run. ``` PR: [40012] [MEM] Free: 185856 bytes, Total: 231004 bytes, Min Free: 123316 bytes [40012] [IDLE] Idle time: 98.61% (CPU load: 1.39%) [50017] [MEM] Free: 185856 bytes, Total: 231004 bytes, Min Free: 123316 bytes [50017] [IDLE] Idle time: 98.61% (CPU load: 1.39%) [60022] [MEM] Free: 185856 bytes, Total: 231004 bytes, Min Free: 123316 bytes [60022] [IDLE] Idle time: 98.61% (CPU load: 1.39%) master: [20012] [MEM] Free: 195016 bytes, Total: 231532 bytes, Min Free: 132460 bytes [20012] [IDLE] Idle time: 98.53% (CPU load: 1.47%) [30017] [MEM] Free: 195016 bytes, Total: 231532 bytes, Min Free: 132460 bytes [30017] [IDLE] Idle time: 98.53% (CPU load: 1.47%) [40022] [MEM] Free: 195016 bytes, Total: 231532 bytes, Min Free: 132460 bytes [40022] [IDLE] Idle time: 98.53% (CPU load: 1.47%) ``` --- While CrossPoint doesn't have restrictions on AI tools in contributing, please be transparent about their usage as it helps set the right context for reviewers. Did you use AI tools to help write this code? **NO** <!-- This is an auto-generated comment: release notes by coderabbit.ai --> * **Refactor** * Streamlined rendering architecture by consolidating update mechanisms across all activities, improving efficiency and consistency. * Modernized synchronization patterns for display updates to ensure reliable, conflict-free rendering. * **Bug Fixes** * Enhanced rendering stability through improved locking mechanisms and explicit update requests. <!-- end of auto-generated comment: release notes by coderabbit.ai --> --------- Co-authored-by: znelson <znelson@users.noreply.github.com>
67 lines
2.4 KiB
C++
67 lines
2.4 KiB
C++
#pragma once
|
|
|
|
#include <functional>
|
|
#include <memory>
|
|
#include <string>
|
|
|
|
#include "NetworkModeSelectionActivity.h"
|
|
#include "activities/ActivityWithSubactivity.h"
|
|
#include "network/CrossPointWebServer.h"
|
|
|
|
// Web server activity states
|
|
enum class WebServerActivityState {
|
|
MODE_SELECTION, // Choosing between Join Network and Create Hotspot
|
|
WIFI_SELECTION, // WiFi selection subactivity is active (for Join Network mode)
|
|
AP_STARTING, // Starting Access Point mode
|
|
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:
|
|
* - First presents a choice between "Join a Network" (STA), "Connect to Calibre", and "Create Hotspot" (AP)
|
|
* - For STA mode: Launches WifiSelectionActivity to connect to an existing network
|
|
* - For AP mode: Creates an Access Point that clients can connect to
|
|
* - Starts the CrossPointWebServer when connected
|
|
* - Handles client requests in its loop() function
|
|
* - Cleans up the server and shuts down WiFi on exit
|
|
*/
|
|
class CrossPointWebServerActivity final : public ActivityWithSubactivity {
|
|
WebServerActivityState state = WebServerActivityState::MODE_SELECTION;
|
|
const std::function<void()> onGoBack;
|
|
|
|
// Network mode
|
|
NetworkMode networkMode = NetworkMode::JOIN_NETWORK;
|
|
bool isApMode = false;
|
|
|
|
// Web server - owned by this activity
|
|
std::unique_ptr<CrossPointWebServer> webServer;
|
|
|
|
// Server status
|
|
std::string connectedIP;
|
|
std::string connectedSSID; // For STA mode: network name, For AP mode: AP name
|
|
|
|
// Performance monitoring
|
|
unsigned long lastHandleClientTime = 0;
|
|
|
|
void renderServerRunning() const;
|
|
|
|
void onNetworkModeSelected(NetworkMode mode);
|
|
void onWifiSelectionComplete(bool connected);
|
|
void startAccessPoint();
|
|
void startWebServer();
|
|
void stopWebServer();
|
|
|
|
public:
|
|
explicit CrossPointWebServerActivity(GfxRenderer& renderer, MappedInputManager& mappedInput,
|
|
const std::function<void()>& onGoBack)
|
|
: ActivityWithSubactivity("CrossPointWebServer", renderer, mappedInput), onGoBack(onGoBack) {}
|
|
void onEnter() override;
|
|
void onExit() override;
|
|
void loop() override;
|
|
void render(Activity::RenderLock&&) override;
|
|
bool skipLoopDelay() override { return webServer && webServer->isRunning(); }
|
|
bool preventAutoSleep() override { return webServer && webServer->isRunning(); }
|
|
};
|