Mirror/squeezelite-esp32
1
0
Fork 0
mirror of https://github.com/sle118/squeezelite-esp32.git synced 2026-03-25 07:07:57 +03:00
Code Issues Packages Projects Releases Wiki Activity

style: apply clang-format and enforce left pointer alignment

Browse Source
This commit is contained in:
Sebastien L
2026-02-12 04:48:38 +00:00
parent df225c120c
commit bf2fff44b8
148 changed files with 11508 additions and 12904 deletions
Download Patch File Download Diff File Expand all files Collapse all files

91
components/platform_config/Config.cpp
View File

@@ -25,33 +25,34 @@ __attribute__((section(".ext_ram.bss"))) sys_dac_default_sets* default_dac_sets;
__attribute__((section(".ext_ram.bss"))) System::PB<sys_config> configWrapper("config", &sys_config_msg, sizeof(sys_config_msg));
__attribute__((section(".ext_ram.bss"))) System::PB<sys_state_data> stateWrapper("state", &sys_state_data_msg, sizeof(sys_state_data_msg));
__attribute__((section(".ext_ram.bss"))) System::PB<sys_dac_default_sets> defaultSets("default_sets", &sys_dac_default_sets_msg, sizeof(sys_dac_default_sets_msg));
__attribute__((section(".ext_ram.bss"))) System::PB<sys_dac_default_sets> defaultSets(
"default_sets", &sys_dac_default_sets_msg, sizeof(sys_dac_default_sets_msg));
const int MaxDelay = 1000;
bool config_update_mac_string(const pb_msgdesc_t* desc, uint32_t field_tag, void* message) {
pb_field_iter_t iter;
if (pb_field_iter_begin(&iter, desc, message) && pb_field_iter_find(&iter, field_tag)) {
if (!iter.pData) {
if(pb_field_iter_begin(&iter, desc, message) && pb_field_iter_find(&iter, field_tag)) {
if(!iter.pData) {
ESP_LOGW(TAG, "Unable to check mac string member. Data not initialized");
return false;
}
if (iter.pData) {
if(iter.pData) {
auto curvalue = std::string((char*)iter.pData);
if (curvalue.find(get_mac_str()) != std::string::npos) {
if(curvalue.find(get_mac_str()) != std::string::npos) {
ESP_LOGD(TAG, "Entry already has mac string: %s", curvalue.c_str());
return true;
}
if (curvalue.find("@@init_from_mac@@") == std::string::npos) {
if(curvalue.find("@@init_from_mac@@") == std::string::npos) {
ESP_LOGW(TAG, "Member not configured for mac address or was overwritten: %s", curvalue.c_str());
return false;
}
auto newval = std::string("squeezelite-") + get_mac_str();
if (PB_ATYPE(iter.type) == PB_ATYPE_POINTER) {
if(PB_ATYPE(iter.type) == PB_ATYPE_POINTER) {
ESP_LOGD(TAG, "Field is a pointer. Freeing previous value if any: %s", STR_OR_BLANK((char*)iter.pField));
FREE_AND_NULL(*(char**)iter.pField);
ESP_LOGD(TAG, "Field is a pointer. Setting new value as %s", newval.c_str());
*(char**)iter.pField = strdup_psram(newval.c_str());
} else if (PB_ATYPE(iter.type) == PB_ATYPE_STATIC) {
} else if(PB_ATYPE(iter.type) == PB_ATYPE_STATIC) {
ESP_LOGD(TAG, "Static string. Setting new value as %s from %s", newval.c_str(), STR_OR_BLANK((char*)iter.pData));
memset((char*)iter.pData, 0x00, iter.data_size);
strncpy((char*)iter.pData, newval.c_str(), iter.data_size);
@@ -64,7 +65,7 @@ bool config_update_mac_string(const pb_msgdesc_t* desc, uint32_t field_tag, void
return true;
}
bool set_pb_string_from_mac(pb_ostream_t* stream, const pb_field_t* field, void* const* arg) {
if (!stream) {
if(!stream) {
// This is a size calculation pass, return true to indicate field presence
return true;
}
@@ -74,7 +75,7 @@ bool set_pb_string_from_mac(pb_ostream_t* stream, const pb_field_t* field, void*
char* value = alloc_get_string_with_mac(prefix && strlen(prefix) > 0 ? prefix : "squeezelite-");
// Write the string to the stream
if (!pb_encode_string(stream, (uint8_t*)value, strlen(value))) {
if(!pb_encode_string(stream, (uint8_t*)value, strlen(value))) {
free(value); // Free memory if encoding fails
return false;
}
@@ -104,7 +105,7 @@ void set_mac_string() {
changed = config_update_mac_string(&sys_names_config_msg, sys_names_config_squeezelite_tag, &config->names) || changed;
changed = config_update_mac_string(&sys_names_config_msg, sys_names_config_wifi_ap_name_tag, &config->names) || changed;
if (changed) {
if(changed) {
ESP_LOGI(TAG, "One or more name was changed. Committing");
configWrapper.RaiseChangedAsync();
}
@@ -120,44 +121,42 @@ void config_load() {
assert(platform != nullptr);
assert(sys_state != nullptr);
assert(default_dac_sets != nullptr);
configWrapper.get()->net.credentials = reinterpret_cast<sys_net_wifi_entry*>(new WifiList("wifi"));
assert(configWrapper.get()->net.credentials != nullptr);
if (!stateWrapper.FileExists()) {
if(!stateWrapper.FileExists()) {
ESP_LOGI(TAG, "State file not found or is empty. ");
stateWrapper.Reinitialize(true);
stateWrapper.SetTarget(CONFIG_FW_PLATFORM_NAME);
} else {
stateWrapper.LoadFile();
}
if (!configWrapper.FileExists()) {
if(!configWrapper.FileExists()) {
ESP_LOGI(TAG, "Configuration file not found or is empty. ");
configWrapper.Reinitialize(true);
ESP_LOGI(TAG, "Current device name after load: %s", platform->names.device);
configWrapper.SetTarget(CONFIG_FW_PLATFORM_NAME,true);
configWrapper.SetTarget(CONFIG_FW_PLATFORM_NAME, true);
set_mac_string();
ESP_LOGW(TAG, "Restart required after initializing configuration");
restart = true;
} else {
configWrapper.LoadFile();
if (configWrapper.GetTargetName().empty() && !std::string(CONFIG_FW_PLATFORM_NAME).empty()) {
if(configWrapper.GetTargetName().empty() && !std::string(CONFIG_FW_PLATFORM_NAME).empty()) {
ESP_LOGW(TAG, "Config target is empty. Updating to %s", CONFIG_FW_PLATFORM_NAME);
configWrapper.Reinitialize(false,true,std::string(CONFIG_FW_PLATFORM_NAME));
configWrapper.Reinitialize(false, true, std::string(CONFIG_FW_PLATFORM_NAME));
ESP_LOGW(TAG, "Restart required due to target change");
restart = true;
}
}
if (!defaultSets.FileExists()) {
if(!defaultSets.FileExists()) {
ESP_LOGE(TAG, "Default Sets file not found or is empty. (%s)", defaultSets.GetFileName().c_str());
} else {
defaultSets.LoadFile();
}
if (restart) {
network_async_reboot(OTA);
}
if(restart) { network_async_reboot(OTA); }
}
void config_dump_config() {
auto serialized = configWrapper.Encode();
@@ -167,14 +166,14 @@ void config_dump_config() {
void config_set_target(const char* target_name, bool reset) {
std::string new_target = std::string(target_name);
bool restart = false;
if (configWrapper.GetTargetName() != new_target) {
if(configWrapper.GetTargetName() != new_target) {
ESP_LOGI(TAG, "Setting configuration target name to %s, %s", target_name, reset ? "full reset" : "reapply only");
if (reset) {
if(reset) {
ESP_LOGD(TAG, "Reinitializing Config structure");
configWrapper.Reinitialize(false,true,new_target);
configWrapper.Reinitialize(false, true, new_target);
} else {
ESP_LOGD(TAG, "Loading Config target values for %s", target_name);
configWrapper.SetTarget(target_name,true);
configWrapper.SetTarget(target_name, true);
configWrapper.LoadTargetValues();
configWrapper.RaiseChangedAsync();
}
@@ -182,28 +181,26 @@ void config_set_target(const char* target_name, bool reset) {
} else {
ESP_LOGW(TAG, "Target name has no change");
}
if (stateWrapper.GetTargetName() != new_target) {
if(stateWrapper.GetTargetName() != new_target) {
ESP_LOGI(TAG, "Setting state target name to %s, %s", target_name, reset ? "full reset" : "reapply only");
restart=true;
if (reset) {
restart = true;
if(reset) {
ESP_LOGD(TAG, "Reinitializing State structure");
stateWrapper.Reinitialize(false,true,new_target);
stateWrapper.Reinitialize(false, true, new_target);
} else {
ESP_LOGD(TAG, "Loading State target values for %s", target_name);
stateWrapper.SetTarget(target_name,true);
stateWrapper.SetTarget(target_name, true);
stateWrapper.LoadTargetValues();
stateWrapper.RaiseChangedAsync();
}
}
ESP_LOGD(TAG, "Done updating target to %s", target_name);
if(restart){
network_async_reboot(RESTART);
}
if(restart) { network_async_reboot(RESTART); }
}
void config_set_target_no_reset(const char* target_name) { config_set_target(target_name, false); }
void config_set_target_reset(const char* target_name) { config_set_target(target_name, true); }
void config_raise_changed(bool sync) {
if (sync) {
if(sync) {
configWrapper.CommitChanges();
} else {
configWrapper.RaiseChangedAsync();
@@ -226,7 +223,7 @@ bool config_http_send_config(httpd_req_t* req) {
auto data = configWrapper.Encode();
httpd_resp_send(req, (const char*)data.data(), data.size());
return true;
} catch (const std::runtime_error& e) {
} catch(const std::runtime_error& e) {
std::string errdesc = (std::string("Unable to get configuration: ") + e.what());
httpd_resp_send_err(req, HTTPD_500_INTERNAL_SERVER_ERROR, errdesc.c_str());
}
@@ -235,30 +232,26 @@ bool config_http_send_config(httpd_req_t* req) {
bool system_set_string(const pb_msgdesc_t* desc, uint32_t field_tag, void* message, const char* value) {
pb_field_iter_t iter;
ESP_LOGD(TAG,"system_set_string. Getting new value");
ESP_LOGD(TAG, "system_set_string. Getting new value");
std::string newval = std::string(STR_OR_BLANK(value));
ESP_LOGD(TAG,"system_set_string. Done getting new value");
ESP_LOGD(TAG, "system_set_string. Done getting new value");
ESP_LOGD(TAG, "Setting value [%s] in message field tag %d", newval.c_str(), field_tag);
if (pb_field_iter_begin(&iter, desc, message) && pb_field_iter_find(&iter, field_tag)) {
std::string old= std::string((char*)iter.pData);
if (iter.pData && old == newval) {
if(pb_field_iter_begin(&iter, desc, message) && pb_field_iter_find(&iter, field_tag)) {
std::string old = std::string((char*)iter.pData);
if(iter.pData && old == newval) {
ESP_LOGW(TAG, "No change, from and to values are the same: [%s]", newval.c_str());
return false;
}
if (PB_ATYPE(iter.type) == PB_ATYPE_POINTER) {
if(PB_ATYPE(iter.type) == PB_ATYPE_POINTER) {
ESP_LOGD(TAG, "Field is a pointer. Freeing previous value if any: %s", STR_OR_BLANK((char*)iter.pField));
FREE_AND_NULL(*(char**)iter.pField);
ESP_LOGD(TAG, "Field is a pointer. Setting new value ");
if (!newval.empty()) {
*(char**)iter.pField = strdup_psram(newval.c_str());
}
if(!newval.empty()) { *(char**)iter.pField = strdup_psram(newval.c_str()); }
} else if (PB_ATYPE(iter.type) == PB_ATYPE_STATIC) {
} else if(PB_ATYPE(iter.type) == PB_ATYPE_STATIC) {
ESP_LOGD(TAG, "Static string. Setting new value. Existing value: %s", (char*)iter.pData);
memset((char*)iter.pData, 0x00, iter.data_size);
if (!newval.empty()) {
strncpy((char*)iter.pData, newval.c_str(), iter.data_size);
}
if(!newval.empty()) { strncpy((char*)iter.pData, newval.c_str(), iter.data_size); }
}
ESP_LOGD(TAG, "Done setting value ");
}