mirror of
https://github.com/daveallie/crosspoint-reader.git
synced 2026-02-04 14:47:37 +03:00
a922e553ed
## Summary * **What is the goal of this PR?** Fixes #199 - Device falls asleep during WiFi file transfer after 10 minutes of inactivity, disconnecting the web server. * **What changes are included?** - Add `preventAutoSleep()` virtual method to `Activity` base class - Modify main loop to reset inactivity timer when `preventAutoSleep()` returns true - Override `preventAutoSleep()` in `CrossPointWebServerActivity` (returns true when web server running) - Override `preventAutoSleep()` in `OtaUpdateActivity` (returns true during update check/download) ## Additional Context * The existing `skipLoopDelay()` method controls loop timing (yield vs delay) for HTTP responsiveness. The new `preventAutoSleep()` method is semantically separate - it explicitly signals that an activity should keep the device awake. * `CrossPointWebServerActivity` uses both methods: `skipLoopDelay()` for responsive HTTP handling, `preventAutoSleep()` for staying awake. * `OtaUpdateActivity` only needs `preventAutoSleep()` since the OTA library handles HTTP internally.
46 lines
1.4 KiB
C++
46 lines
1.4 KiB
C++
#pragma once
|
|
#include <freertos/FreeRTOS.h>
|
|
#include <freertos/semphr.h>
|
|
#include <freertos/task.h>
|
|
|
|
#include "activities/ActivityWithSubactivity.h"
|
|
#include "network/OtaUpdater.h"
|
|
|
|
class OtaUpdateActivity : public ActivityWithSubactivity {
|
|
enum State {
|
|
WIFI_SELECTION,
|
|
CHECKING_FOR_UPDATE,
|
|
WAITING_CONFIRMATION,
|
|
UPDATE_IN_PROGRESS,
|
|
NO_UPDATE,
|
|
FAILED,
|
|
FINISHED,
|
|
SHUTTING_DOWN
|
|
};
|
|
|
|
// Can't initialize this to 0 or the first render doesn't happen
|
|
static constexpr unsigned int UNINITIALIZED_PERCENTAGE = 111;
|
|
|
|
TaskHandle_t displayTaskHandle = nullptr;
|
|
SemaphoreHandle_t renderingMutex = nullptr;
|
|
bool updateRequired = false;
|
|
const std::function<void()> goBack;
|
|
State state = WIFI_SELECTION;
|
|
unsigned int lastUpdaterPercentage = UNINITIALIZED_PERCENTAGE;
|
|
OtaUpdater updater;
|
|
|
|
void onWifiSelectionComplete(bool success);
|
|
static void taskTrampoline(void* param);
|
|
[[noreturn]] void displayTaskLoop();
|
|
void render();
|
|
|
|
public:
|
|
explicit OtaUpdateActivity(GfxRenderer& renderer, MappedInputManager& mappedInput,
|
|
const std::function<void()>& goBack)
|
|
: ActivityWithSubactivity("OtaUpdate", renderer, mappedInput), goBack(goBack), updater() {}
|
|
void onEnter() override;
|
|
void onExit() override;
|
|
void loop() override;
|
|
bool preventAutoSleep() override { return state == CHECKING_FOR_UPDATE || state == UPDATE_IN_PROGRESS; }
|
|
};
|