mirror of
https://github.com/daveallie/crosspoint-reader.git
synced 2026-02-04 14:47:37 +03:00
format files
This commit is contained in:
parent
d4c8e13698
commit
cb7f3313f0
@ -1,21 +1,19 @@
|
||||
#include "AutoConnectingActivity.h"
|
||||
|
||||
#include <string>
|
||||
#include <WiFi.h>
|
||||
#include <GfxRenderer.h>
|
||||
#include "MappedInputManager.h"
|
||||
#include "fontIds.h"
|
||||
#include "CrossPointSettings.h"
|
||||
#include "WifiCredentialStore.h"
|
||||
#include <WiFi.h>
|
||||
|
||||
AutoConnectingActivity::AutoConnectingActivity(
|
||||
GfxRenderer& renderer,
|
||||
MappedInputManager& mappedInput,
|
||||
#include <string>
|
||||
|
||||
#include "CrossPointSettings.h"
|
||||
#include "MappedInputManager.h"
|
||||
#include "WifiCredentialStore.h"
|
||||
#include "fontIds.h"
|
||||
|
||||
AutoConnectingActivity::AutoConnectingActivity(GfxRenderer& renderer, MappedInputManager& mappedInput,
|
||||
const std::function<void()>& on_success,
|
||||
const std::function<void()>& on_failure
|
||||
) : Activity("AutoConnecting", renderer, mappedInput),
|
||||
on_success(on_success),
|
||||
on_failure(on_failure) {}
|
||||
const std::function<void()>& on_failure)
|
||||
: Activity("AutoConnecting", renderer, mappedInput), on_success(on_success), on_failure(on_failure) {}
|
||||
|
||||
void AutoConnectingActivity::onEnter() {
|
||||
Activity::onEnter();
|
||||
@ -23,13 +21,9 @@ void AutoConnectingActivity::onEnter() {
|
||||
attemptConnection();
|
||||
}
|
||||
|
||||
void AutoConnectingActivity::onExit() {
|
||||
Activity::onExit();
|
||||
}
|
||||
void AutoConnectingActivity::onExit() { Activity::onExit(); }
|
||||
|
||||
void AutoConnectingActivity::loop() {
|
||||
checkConnectionStatus();
|
||||
}
|
||||
void AutoConnectingActivity::loop() { checkConnectionStatus(); }
|
||||
|
||||
void AutoConnectingActivity::attemptConnection() {
|
||||
connectionStartTime = millis();
|
||||
|
||||
@ -1,22 +1,19 @@
|
||||
#pragma once
|
||||
|
||||
#include "activities/Activity.h"
|
||||
#include <functional>
|
||||
|
||||
#include "activities/Activity.h"
|
||||
|
||||
class AutoConnectingActivity final : public Activity {
|
||||
public:
|
||||
AutoConnectingActivity(
|
||||
GfxRenderer& renderer,
|
||||
MappedInputManager& mappedInput,
|
||||
const std::function<void()>& on_success,
|
||||
const std::function<void()>& on_failure
|
||||
);
|
||||
public:
|
||||
AutoConnectingActivity(GfxRenderer& renderer, MappedInputManager& mappedInput,
|
||||
const std::function<void()>& on_success, const std::function<void()>& on_failure);
|
||||
|
||||
void onEnter() override;
|
||||
void onExit() override;
|
||||
void loop() override;
|
||||
|
||||
private:
|
||||
private:
|
||||
void render() const;
|
||||
void attemptConnection();
|
||||
void checkConnectionStatus();
|
||||
|
||||
@ -6,11 +6,11 @@
|
||||
#include <algorithm>
|
||||
#include <map>
|
||||
|
||||
#include "CrossPointSettings.h"
|
||||
#include "MappedInputManager.h"
|
||||
#include "WifiCredentialStore.h"
|
||||
#include "activities/util/KeyboardEntryActivity.h"
|
||||
#include "fontIds.h"
|
||||
#include "CrossPointSettings.h"
|
||||
|
||||
void WifiSelectionActivity::taskTrampoline(void* param) {
|
||||
auto* self = static_cast<WifiSelectionActivity*>(param);
|
||||
|
||||
@ -53,7 +53,9 @@ const SettingInfo systemSettings[systemSettingsCount] = {
|
||||
SettingInfo::Enum("Time to Sleep", &CrossPointSettings::sleepTimeout,
|
||||
{"1 min", "5 min", "10 min", "15 min", "30 min"}),
|
||||
SettingInfo::Action("Network"),
|
||||
SettingInfo::Action("KOReader Sync"), SettingInfo::Action("OPDS Browser"), SettingInfo::Action("Clear Cache"),
|
||||
SettingInfo::Action("KOReader Sync"),
|
||||
SettingInfo::Action("OPDS Browser"),
|
||||
SettingInfo::Action("Clear Cache"),
|
||||
SettingInfo::Action("Check for updates")};
|
||||
} // namespace
|
||||
|
||||
|
||||
@ -5,6 +5,7 @@
|
||||
#include <HalGPIO.h>
|
||||
#include <SDCardManager.h>
|
||||
#include <SPI.h>
|
||||
#include <WiFi.h>
|
||||
#include <builtinFonts/all.h>
|
||||
|
||||
#include <cstring>
|
||||
@ -20,14 +21,13 @@
|
||||
#include "activities/browser/OpdsBookBrowserActivity.h"
|
||||
#include "activities/home/HomeActivity.h"
|
||||
#include "activities/home/MyLibraryActivity.h"
|
||||
#include "activities/network/AutoConnectingActivity.h"
|
||||
#include "activities/network/CrossPointWebServerActivity.h"
|
||||
#include "activities/network/WifiSelectionActivity.h"
|
||||
#include "activities/reader/ReaderActivity.h"
|
||||
#include "activities/settings/SettingsActivity.h"
|
||||
#include "activities/util/FullScreenMessageActivity.h"
|
||||
#include "activities/network/AutoConnectingActivity.h"
|
||||
#include "activities/network/WifiSelectionActivity.h"
|
||||
#include "fontIds.h"
|
||||
#include <WiFi.h>
|
||||
|
||||
HalDisplay display;
|
||||
HalGPIO gpio;
|
||||
|
||||
Loading…
Reference in New Issue
Block a user