Mirror/squeezelite-esp32
1
0
Fork 0
mirror of https://github.com/sle118/squeezelite-esp32.git synced 2025-12-09 21:17:18 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fix: OTA now works under the new configuration subsystem - release

Browse Source 
Make sure that you use bootloader from version v0.3.172 and up
This commit is contained in:
Sebastien
2019-11-07 14:44:21 -05:00
parent e9ba659b4f
commit 3325d31691
1 changed files with 15 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
main/config.c
View File

@@ -49,7 +49,7 @@ static TimerHandle_t timer;
static SemaphoreHandle_t config_mutex = NULL; static SemaphoreHandle_t config_mutex = NULL;
static EventGroupHandle_t config_group; static EventGroupHandle_t config_group;
/* @brief indicate that the ESP32 is currently connected. */ /* @brief indicate that the ESP32 is currently connected. */
static const int CONFIG_PENDING_CHANGE_BIT = BIT0; static const int CONFIG_NO_COMMIT_PENDING = BIT0;
static const int CONFIG_LOAD_BIT = BIT1; static const int CONFIG_LOAD_BIT = BIT1;
bool config_lock(TickType_t xTicksToWait); bool config_lock(TickType_t xTicksToWait);
@@ -170,7 +170,7 @@ cJSON * config_set_value_safe(nvs_type_t nvs_type, const char *key, void * value
ESP_LOGV(TAG,"Failed to print existing entry"); ESP_LOGV(TAG,"Failed to print existing entry");
} }
// set commit flag as equal so we can compare // set commit flag as equal so we can compare
cJSON * chg_flag =cJSON_AddBoolToObject(entry,"chg",config_is_entry_changed(existing)); cJSON_AddBoolToObject(entry,"chg",config_is_entry_changed(existing));
if(!cJSON_Compare(entry,existing,false)){ if(!cJSON_Compare(entry,existing,false)){
char * entry_str = cJSON_PrintUnformatted(entry); char * entry_str = cJSON_PrintUnformatted(entry);
if(entry_str!=NULL){ if(entry_str!=NULL){
@@ -421,24 +421,23 @@ void config_commit_to_nvs(){
config_unlock(); config_unlock();
} }
bool config_has_changes(){ bool config_has_changes(){
return (xEventGroupGetBits(config_group) & CONFIG_PENDING_CHANGE_BIT)!=0; return (xEventGroupGetBits(config_group) & CONFIG_NO_COMMIT_PENDING)==0;
} }
bool wait_for_commit(){ bool wait_for_commit(){
bool needs_commit=(xEventGroupGetBits(config_group) & CONFIG_PENDING_CHANGE_BIT)!=0; bool commit_pending=(xEventGroupGetBits(config_group) & CONFIG_NO_COMMIT_PENDING)==0;
if(needs_commit){ while (commit_pending){
ESP_LOGD(TAG,"Waiting for config commit ..."); ESP_LOGW(TAG,"Waiting for config commit ...");
needs_commit = (xEventGroupWaitBits(config_group, CONFIG_PENDING_CHANGE_BIT,pdFALSE, pdTRUE, (CONFIG_COMMIT_DELAY*5) / portTICK_PERIOD_MS) & CONFIG_PENDING_CHANGE_BIT)!=0; commit_pending = (xEventGroupWaitBits(config_group, CONFIG_NO_COMMIT_PENDING,pdFALSE, pdTRUE, (CONFIG_COMMIT_DELAY*2) / portTICK_PERIOD_MS) & CONFIG_NO_COMMIT_PENDING)==0;
if(needs_commit){ if(commit_pending){
ESP_LOGE(TAG,"Timeout waiting for config commit."); ESP_LOGW(TAG,"Timeout waiting for config commit.");
} }
else else {
{
ESP_LOGI(TAG,"Config committed!"); ESP_LOGI(TAG,"Config committed!");
} }
} }
return needs_commit; return commit_pending;
} }
bool config_lock(TickType_t xTicksToWait) { bool config_lock(TickType_t xTicksToWait) {
@@ -472,16 +471,16 @@ static void vCallbackFunction( TimerHandle_t xTimer ) {
} }
xTimerReset( xTimer, 10 ); xTimerReset( xTimer, 10 );
} }
void config_raise_change(bool flag){ void config_raise_change(bool change_found){
if(config_set_group_bit(CONFIG_PENDING_CHANGE_BIT,flag)) if(config_set_group_bit(CONFIG_NO_COMMIT_PENDING,!change_found))
{ {
ESP_LOGD(TAG,"Config change indicator was %s",flag?"Set":"Cleared"); ESP_LOGD(TAG,"Config commit set to %s",change_found?"Pending Commit":"Committed");
} }
} }
bool config_set_group_bit(int bit_num,bool flag){ bool config_set_group_bit(int bit_num,bool flag){
bool result = true; bool result = true;
int curFlags=xEventGroupGetBits(config_group); int curFlags=xEventGroupGetBits(config_group);
if((curFlags & CONFIG_LOAD_BIT) && bit_num == CONFIG_PENDING_CHANGE_BIT ){ if((curFlags & CONFIG_LOAD_BIT) && bit_num == CONFIG_NO_COMMIT_PENDING ){
ESP_LOGD(TAG,"Loading config, ignoring changes"); ESP_LOGD(TAG,"Loading config, ignoring changes");
result = false; result = false;
} }