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

Clang format

Browse Source
This commit is contained in:
Brendan O'Leary 2025-12-21 19:47:39 -05:00
parent d0716e8fda
commit 628bd364a2
4 changed files with 15 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/activities/network/CrossPointWebServerActivity.cpp
View File

@ -1,10 +1,10 @@
#include "CrossPointWebServerActivity.h" #include "CrossPointWebServerActivity.h"
#include <DNSServer.h> #include <DNSServer.h>
#include <ESPmDNS.h>
#include <GfxRenderer.h> #include <GfxRenderer.h>
#include <InputManager.h> #include <InputManager.h>
#include <WiFi.h> #include <WiFi.h>
#include <ESPmDNS.h>
#include "NetworkModeSelectionActivity.h" #include "NetworkModeSelectionActivity.h"
#include "WifiSelectionActivity.h" #include "WifiSelectionActivity.h"
@ -54,8 +54,7 @@ void CrossPointWebServerActivity::onEnter() {
// Launch network mode selection subactivity // Launch network mode selection subactivity
Serial.printf("[%lu] [WEBACT] Launching NetworkModeSelectionActivity...\n", millis()); Serial.printf("[%lu] [WEBACT] Launching NetworkModeSelectionActivity...\n", millis());
enterNewActivity(new NetworkModeSelectionActivity( enterNewActivity(new NetworkModeSelectionActivity(
renderer, inputManager, renderer, inputManager, [this](const NetworkMode mode) { onNetworkModeSelected(mode); },
[this](const NetworkMode mode) { onNetworkModeSelected(mode); },
[this]() { onGoBack(); } // Cancel goes back to home [this]() { onGoBack(); } // Cancel goes back to home
)); ));
} }
@ -172,10 +171,8 @@ void CrossPointWebServerActivity::onWifiSelectionComplete(const bool connected)
exitActivity(); exitActivity();
state = WebServerActivityState::MODE_SELECTION; state = WebServerActivityState::MODE_SELECTION;
enterNewActivity(new NetworkModeSelectionActivity( enterNewActivity(new NetworkModeSelectionActivity(
renderer, inputManager, renderer, inputManager, [this](const NetworkMode mode) { onNetworkModeSelected(mode); },
[this](const NetworkMode mode) { onNetworkModeSelected(mode); }, [this]() { onGoBack(); }));
[this]() { onGoBack(); }
));
} }
} }
@ -356,8 +353,8 @@ void CrossPointWebServerActivity::renderServerRunning() const {
std::string ssidInfo = "Network: " + connectedSSID; std::string ssidInfo = "Network: " + connectedSSID;
renderer.drawCenteredText(UI_FONT_ID, startY + LINE_SPACING, ssidInfo.c_str(), true, REGULAR); renderer.drawCenteredText(UI_FONT_ID, startY + LINE_SPACING, ssidInfo.c_str(), true, REGULAR);
renderer.drawCenteredText(SMALL_FONT_ID, startY + LINE_SPACING * 2, "Connect your device to this WiFi network", true, renderer.drawCenteredText(SMALL_FONT_ID, startY + LINE_SPACING * 2, "Connect your device to this WiFi network",
REGULAR); true, REGULAR);
// Show primary URL (hostname) // Show primary URL (hostname)
std::string hostnameUrl = std::string("http://") + AP_HOSTNAME + ".local/"; std::string hostnameUrl = std::string("http://") + AP_HOSTNAME + ".local/";

2
src/activities/network/CrossPointWebServerActivity.h
View File

@ -7,9 +7,9 @@
#include <memory> #include <memory>
#include <string> #include <string>
#include "NetworkModeSelectionActivity.h"
#include "activities/ActivityWithSubactivity.h" #include "activities/ActivityWithSubactivity.h"
#include "network/CrossPointWebServer.h" #include "network/CrossPointWebServer.h"
#include "NetworkModeSelectionActivity.h"
// Web server activity states // Web server activity states
enum class WebServerActivityState { enum class WebServerActivityState {

4
src/activities/network/NetworkModeSelectionActivity.h
View File

@ -34,9 +34,7 @@ class NetworkModeSelectionActivity final : public Activity {
explicit NetworkModeSelectionActivity(GfxRenderer& renderer, InputManager& inputManager, explicit NetworkModeSelectionActivity(GfxRenderer& renderer, InputManager& inputManager,
const std::function<void(NetworkMode)>& onModeSelected, const std::function<void(NetworkMode)>& onModeSelected,
const std::function<void()>& onCancel) const std::function<void()>& onCancel)
: Activity("NetworkModeSelection", renderer, inputManager), : Activity("NetworkModeSelection", renderer, inputManager), onModeSelected(onModeSelected), onCancel(onCancel) {}
onModeSelected(onModeSelected),
onCancel(onCancel) {}
void onEnter() override; void onEnter() override;
void onExit() override; void onExit() override;
void loop() override; void loop() override;