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
@@ -10,8 +10,8 @@
|
||||
#define TAG "lvgl_task"
|
||||
|
||||
// Mutex for LVGL drawing
|
||||
static tt::Mutex lvgl_mutex(tt::Mutex::TypeRecursive);
|
||||
static tt::Mutex task_mutex(tt::Mutex::TypeRecursive);
|
||||
static tt::Mutex lvgl_mutex(tt::Mutex::Type::Recursive);
|
||||
static tt::Mutex task_mutex(tt::Mutex::Type::Recursive);
|
||||
|
||||
static uint32_t task_max_sleep_ms = 10;
|
||||
// Mutex for LVGL task state (to modify task_running state)
|
||||
|
||||
@@ -36,7 +36,7 @@ extern const tt::hal::Configuration hardware = {
|
||||
tt::hal::i2c::Configuration {
|
||||
.name = "Internal",
|
||||
.port = I2C_NUM_0,
|
||||
.initMode = tt::hal::i2c::InitByTactility,
|
||||
.initMode = tt::hal::i2c::InitMode::ByTactility,
|
||||
.canReinit = false,
|
||||
.hasMutableConfiguration = false,
|
||||
.config = (i2c_config_t) {
|
||||
@@ -54,7 +54,7 @@ extern const tt::hal::Configuration hardware = {
|
||||
tt::hal::i2c::Configuration {
|
||||
.name = "External",
|
||||
.port = I2C_NUM_1,
|
||||
.initMode = tt::hal::i2c::InitByTactility,
|
||||
.initMode = tt::hal::i2c::InitMode::ByTactility,
|
||||
.canReinit = true,
|
||||
.hasMutableConfiguration = true,
|
||||
.config = (i2c_config_t) {
|
||||
|
||||
@@ -4,10 +4,10 @@
|
||||
|
||||
bool SimulatorPower::supportsMetric(MetricType type) const {
|
||||
switch (type) {
|
||||
case IS_CHARGING:
|
||||
case CURRENT:
|
||||
case BATTERY_VOLTAGE:
|
||||
case CHARGE_LEVEL:
|
||||
case MetricType::IsCharging:
|
||||
case MetricType::Current:
|
||||
case MetricType::BatteryVoltage:
|
||||
case MetricType::ChargeLevel:
|
||||
return true;
|
||||
}
|
||||
|
||||
@@ -16,16 +16,16 @@ bool SimulatorPower::supportsMetric(MetricType type) const {
|
||||
|
||||
bool SimulatorPower::getMetric(Power::MetricType type, Power::MetricData& data) {
|
||||
switch (type) {
|
||||
case IS_CHARGING:
|
||||
case MetricType::IsCharging:
|
||||
data.valueAsBool = true;
|
||||
return true;
|
||||
case CURRENT:
|
||||
case MetricType::Current:
|
||||
data.valueAsInt32 = 42;
|
||||
return true;
|
||||
case BATTERY_VOLTAGE:
|
||||
case MetricType::BatteryVoltage:
|
||||
data.valueAsUint32 = 4032;
|
||||
return true;
|
||||
case CHARGE_LEVEL:
|
||||
case MetricType::ChargeLevel:
|
||||
data.valueAsUint8 = 100;
|
||||
return true;
|
||||
}
|
||||
|
||||
@@ -8,14 +8,14 @@ class SimulatorSdCard : public SdCard {
|
||||
private:
|
||||
State state;
|
||||
public:
|
||||
SimulatorSdCard() : SdCard(MountBehaviourAtBoot), state(StateUnmounted) {}
|
||||
SimulatorSdCard() : SdCard(MountBehaviour::AtBoot), state(State::Unmounted) {}
|
||||
|
||||
bool mount(const char* mountPath) override {
|
||||
state = StateMounted;
|
||||
state = State::Mounted;
|
||||
return true;
|
||||
}
|
||||
bool unmount() override {
|
||||
state = StateUnmounted;
|
||||
state = State::Unmounted;
|
||||
return true;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user