CaptainFritoandDave Allie
e7ee6ff05e
## Summary Implements Lyra theme for some more Crosspoint screens:       ## Additional Context - A bit of refactoring for list scrolling logic --- ### AI Usage 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**_ --------- Co-authored-by: Dave Allie <dave@daveallie.com>
112 lines
3.6 KiB
C++
112 lines
3.6 KiB
C++
#pragma once
|
|
|
|
#include <cstdint>
|
|
#include <functional>
|
|
#include <memory>
|
|
#include <string>
|
|
#include <vector>
|
|
|
|
#include "activities/ActivityWithSubactivity.h"
|
|
#include "util/ButtonNavigator.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 {
|
|
AUTO_CONNECTING, // Trying to connect to the last known network
|
|
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 ActivityWithSubactivity {
|
|
ButtonNavigator buttonNavigator;
|
|
|
|
WifiSelectionState state = WifiSelectionState::SCANNING;
|
|
size_t selectedNetworkIndex = 0;
|
|
std::vector<WifiNetworkInfo> networks;
|
|
const std::function<void(bool connected)> onComplete;
|
|
|
|
// Selected network for connection
|
|
std::string selectedSSID;
|
|
bool selectedRequiresPassword = false;
|
|
|
|
// Connection result
|
|
std::string connectedIP;
|
|
std::string connectionError;
|
|
|
|
// Password to potentially save (from keyboard or saved credentials)
|
|
std::string enteredPassword;
|
|
|
|
// Cached MAC address string for display
|
|
std::string cachedMacAddress;
|
|
|
|
// Whether network was connected using a saved password (skip save prompt)
|
|
bool usedSavedPassword = false;
|
|
|
|
// Whether to attempt auto-connect on entry
|
|
const bool allowAutoConnect;
|
|
|
|
// Whether we are attempting to auto-connect
|
|
bool autoConnecting = 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;
|
|
|
|
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, MappedInputManager& mappedInput,
|
|
const std::function<void(bool connected)>& onComplete, bool autoConnect = true)
|
|
: ActivityWithSubactivity("WifiSelection", renderer, mappedInput),
|
|
onComplete(onComplete),
|
|
allowAutoConnect(autoConnect) {}
|
|
void onEnter() override;
|
|
void onExit() override;
|
|
void loop() override;
|
|
void render(Activity::RenderLock&&) override;
|
|
|
|
// Get the IP address after successful connection
|
|
const std::string& getConnectedIP() const { return connectedIP; }
|
|
};
|