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:
committed by
GitHub
parent
3ca0f8cf97
commit
3ea02d912f
@@ -19,10 +19,15 @@ public:
|
||||
Callback callback;
|
||||
std::shared_ptr<void> callbackContext;
|
||||
|
||||
typedef enum {
|
||||
TypeOnce = 0, ///< One-shot timer.
|
||||
TypePeriodic = 1 ///< Repeating timer.
|
||||
} Type;
|
||||
enum class Type {
|
||||
Once = 0, ///< One-shot timer.
|
||||
Periodic = 1 ///< Repeating timer.
|
||||
};
|
||||
|
||||
enum class Priority{
|
||||
Normal, /**< Lower then other threads */
|
||||
Elevated, /**< Same as other threads */
|
||||
};
|
||||
|
||||
/**
|
||||
* @param[in] type The timer type
|
||||
@@ -74,11 +79,6 @@ public:
|
||||
*/
|
||||
bool setPendingCallback(PendingCallback callback, void* callbackContext, uint32_t callbackArg, TickType_t timeout);
|
||||
|
||||
enum class Priority{
|
||||
Normal, /**< Lower then other threads */
|
||||
Elevated, /**< Same as other threads */
|
||||
};
|
||||
|
||||
/** Set Timer thread priority
|
||||
* @param[in] priority The priority
|
||||
*/
|
||||
|
||||
Reference in New Issue
Block a user