Merge develop into main (#167)

- WiFi Connect app is now hidden by default, but accessible at the bottom of the WiFi Manage app when WiFi is turned on.
- WiFi service now turns on WiFi when calling connect() and WiFi is not on.
- Removed `blocking` option for `service::loader::startApp()`. This feature was unused and complex.
- Various apps: Moved private headers into Private/ folder.
- Various apps: created start() function for easy starting.
- Added documentation to all TactilityC APIs
- Refactored various `enum` into `class enum`
- Refactor M5Stack `initBoot()` (but VBus is still 0V for some reason)
This commit is contained in:
Ken Van Hoeylandt
2025-01-17 19:37:42 +01:00
committed by GitHub
parent 3ca0f8cf97
commit 3ea02d912f
147 changed files with 1538 additions and 739 deletions
+28 -23
View File
@@ -34,39 +34,39 @@ typedef enum {
namespace tt::service::wifi {
enum WifiEventType {
enum class EventType {
/** Radio was turned on */
WifiEventTypeRadioStateOn,
RadioStateOn,
/** Radio is turning on. */
WifiEventTypeRadioStateOnPending,
RadioStateOnPending,
/** Radio is turned off */
WifiEventTypeRadioStateOff,
RadioStateOff,
/** Radio is turning off */
WifiEventTypeRadioStateOffPending,
RadioStateOffPending,
/** Started scanning for access points */
WifiEventTypeScanStarted,
ScanStarted,
/** Finished scanning for access points */ // TODO: 1 second validity
WifiEventTypeScanFinished,
WifiEventTypeDisconnected,
WifiEventTypeConnectionPending,
WifiEventTypeConnectionSuccess,
WifiEventTypeConnectionFailed
ScanFinished,
Disconnected,
ConnectionPending,
ConnectionSuccess,
ConnectionFailed
};
enum WifiRadioState {
WIFI_RADIO_ON_PENDING,
WIFI_RADIO_ON,
WIFI_RADIO_CONNECTION_PENDING,
WIFI_RADIO_CONNECTION_ACTIVE,
WIFI_RADIO_OFF_PENDING,
WIFI_RADIO_OFF,
enum class RadioState {
OnPending,
On,
ConnectionPending,
ConnectionActive,
OffPending,
Off,
};
struct WifiEvent {
WifiEventType type;
struct Event {
EventType type;
};
struct WifiApRecord {
struct ApRecord {
std::string ssid;
int8_t rssi;
wifi_auth_mode_t auth_mode;
@@ -78,7 +78,12 @@ struct WifiApRecord {
*/
std::shared_ptr<PubSub> getPubsub();
WifiRadioState getRadioState();
/** @return Get the current radio state */
RadioState getRadioState();
/** For logging purposes */
const char* radioStateToString(RadioState state);
/**
* @brief Request scanning update. Returns immediately. Results are through pubsub.
*/
@@ -91,7 +96,7 @@ bool isScanning();
std::string getConnectionTarget();
/** @return the access points from the last scan (if any). It only contains public APs. */
std::vector<WifiApRecord> getScanResults();
std::vector<ApRecord> getScanResults();
/**
* @brief Overrides the default scan result size of 16.