adolforeyna/tactility
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge develop into main (#167)

Browse Source 
- 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
Download Patch File Download Diff File Expand all files Collapse all files
TactilityCore/Source/Bundle.cpp
+9 -9
View File
@@ -16,22 +16,22 @@ std::string Bundle::getString(const std::string& key) const {
bool Bundle::hasBool(const std::string& key) const {
auto entry = this->entries.find(key);
return entry != std::end(this->entries) && entry->second.type == TypeBool;
return entry != std::end(this->entries) && entry->second.type == Type::Bool;
}
bool Bundle::hasInt32(const std::string& key) const {
auto entry = this->entries.find(key);
return entry != std::end(this->entries) && entry->second.type == TypeInt32;
return entry != std::end(this->entries) && entry->second.type == Type::Int32;
}
bool Bundle::hasString(const std::string& key) const {
auto entry = this->entries.find(key);
return entry != std::end(this->entries) && entry->second.type == TypeString;
return entry != std::end(this->entries) && entry->second.type == Type::String;
}
bool Bundle::optBool(const std::string& key, bool& out) const {
auto entry = this->entries.find(key);
if (entry != std::end(this->entries) && entry->second.type == TypeBool) {
if (entry != std::end(this->entries) && entry->second.type == Type::Bool) {
out = entry->second.value_bool;
return true;
} else {
@@ -41,7 +41,7 @@ bool Bundle::optBool(const std::string& key, bool& out) const {
bool Bundle::optInt32(const std::string& key, int32_t& out) const {
auto entry = this->entries.find(key);
if (entry != std::end(this->entries) && entry->second.type == TypeInt32) {
if (entry != std::end(this->entries) && entry->second.type == Type::Int32) {
out = entry->second.value_int32;
return true;
} else {
@@ -51,7 +51,7 @@ bool Bundle::optInt32(const std::string& key, int32_t& out) const {
bool Bundle::optString(const std::string& key, std::string& out) const {
auto entry = this->entries.find(key);
if (entry != std::end(this->entries) && entry->second.type == TypeString) {
if (entry != std::end(this->entries) && entry->second.type == Type::String) {
out = entry->second.value_string;
return true;
} else {
@@ -61,7 +61,7 @@ bool Bundle::optString(const std::string& key, std::string& out) const {
void Bundle::putBool(const std::string& key, bool value) {
this->entries[key] = {
.type = TypeBool,
.type = Type::Bool,
.value_bool = value,
.value_string = ""
};
@@ -69,7 +69,7 @@ void Bundle::putBool(const std::string& key, bool value) {
void Bundle::putInt32(const std::string& key, int32_t value) {
this->entries[key] = {
.type = TypeInt32,
.type = Type::Int32,
.value_int32 = value,
.value_string = ""
};
@@ -77,7 +77,7 @@ void Bundle::putInt32(const std::string& key, int32_t value) {
void Bundle::putString(const std::string& key, const std::string& value) {
this->entries[key] = {
.type = TypeString,
.type = Type::String,
.value_bool = false,
.value_string = value
};