From a30d1ee41e383cda247eb993bef8c2cb71ca61ad Mon Sep 17 00:00:00 2001
From: philippe44 <philippe_44@outlook.com>
Date: Wed, 15 Jan 2020 18:26:24 -0800
Subject: [PATCH] merge

---
 components/config/config.c           | 37 +---------------------------
 components/config/config.h           |  2 +-
 components/display/display.c         |  4 +--
 components/services/audio_controls.c |  2 --
 4 files changed, 4 insertions(+), 41 deletions(-)

diff --git a/components/config/config.c b/components/config/config.c
index 0776c282..62763fa7 100644
--- a/components/config/config.c
+++ b/components/config/config.c
@@ -25,7 +25,6 @@
 #include <stdio.h>
 #include <string.h>
 #include "esp_system.h"
-#include "ctype.h"
 #include "esp_log.h"
 #include "esp_console.h"
 #include "esp_vfs_dev.h"
@@ -90,10 +89,10 @@ static void * free_fn(void * ptr){
 }
 #endif
 void init_cJSON(){
+	static cJSON_Hooks hooks;
 	// initialize cJSON hooks it uses SPIRAM memory
 	// as opposed to IRAM
 #if RECOVERY_APPLICATION==0
-	static cJSON_Hooks hooks;
 	// In squeezelite mode, allocate memory from PSRAM.  Otherwise allocate from internal RAM
 	// as recovery will lock flash access when erasing FLASH or writing to OTA partition.
 	hooks.malloc_fn=&malloc_fn;
@@ -705,39 +704,6 @@ esp_err_t config_set_value(nvs_type_t nvs_type, const char *key, void * value){
 	return result;
 }
 
-#define IS_ALPHA(c) isalpha((int)c)
-#define TO_UPPER(c) toupper((int)c)
-
-
-
-
-char * strstri (const char * str1, const char * str2){
-	char *cp = (char *) str1;
-	char *s1, *s2;
-
-	if ( *str2=='\0' )
-		return((char *)str1);
-
-	while (*cp){
-			s1 = cp;
-			s2 = (char *) str2;
-			while ( *s1!='\0' && *s2!='\0' && (IS_ALPHA(*s1) && IS_ALPHA(*s2))?!(TO_UPPER(*s1) - TO_UPPER(*s2)):!(*s1-*s2)){
-				ESP_LOGW(TAG,"Matched [%c] = [%c] ", IS_ALPHA(*s1)?TO_UPPER(*s1):*s1,IS_ALPHA(*s2)?TO_UPPER(*s2):*s2);
-				++s1, ++s2;
-			}
-
-
-			if (*s2=='\0'){
-				ESP_LOGW(TAG,"String %s found!", str2);
-				return(cp);
-			}
-
-			++cp;
-			ESP_LOGW(TAG,"%s not found. s2 is [%c]. Moving forward to %s", str2, *s2, cp);
-	}
-	ESP_LOGW(TAG,"String %s not found", str2);
-	return(NULL);
-}
 IMPLEMENT_SET_DEFAULT(uint8_t,NVS_TYPE_U8);
 IMPLEMENT_SET_DEFAULT(int8_t,NVS_TYPE_I8);
 IMPLEMENT_SET_DEFAULT(uint16_t,NVS_TYPE_U16);
@@ -751,4 +717,3 @@ IMPLEMENT_GET_NUM(uint16_t,NVS_TYPE_U16);
 IMPLEMENT_GET_NUM(int16_t,NVS_TYPE_I16);
 IMPLEMENT_GET_NUM(uint32_t,NVS_TYPE_U32);
 IMPLEMENT_GET_NUM(int32_t,NVS_TYPE_I32);
-
diff --git a/components/config/config.h b/components/config/config.h
index 3b4a74c7..f83c7276 100644
--- a/components/config/config.h
+++ b/components/config/config.h
@@ -37,4 +37,4 @@ void * config_alloc_get(nvs_type_t nvs_type, const char *key) ;
 bool wait_for_commit();
 char * config_alloc_get_json(bool bFormatted);
 esp_err_t config_set_value(nvs_type_t nvs_type, const char *key, void * value);
-char * strstri (const char * str1, const char * str2);
+
diff --git a/components/display/display.c b/components/display/display.c
index 0b3b20df..33bf0b40 100644
--- a/components/display/display.c
+++ b/components/display/display.c
@@ -64,7 +64,7 @@ void display_init(char *welcome) {
 
 	if (item && *item) {
 		char * drivername=strstr(item,"driver");
-		if( !drivername  || (drivername && (strstr(drivername,"SSD1306") || strstr(drivername,"ssd1306")))){
+		if (!drivername  || (drivername && strcasestr(drivername,"SSD1306"))) {
 			handle = &SSD1306_handle;
 			if (handle->init(item, welcome)) {
 				slimp_handler_chain = slimp_handler;
@@ -73,7 +73,7 @@ void display_init(char *welcome) {
 			} else {
 				ESP_LOGE(TAG, "Display initialization failed");
 			}
-		}else {
+		} else {
 			ESP_LOGE(TAG,"Unknown display driver name in display config: %s",item);
 		}
 	} else {
diff --git a/components/services/audio_controls.c b/components/services/audio_controls.c
index 5acc7db9..93e8bad2 100644
--- a/components/services/audio_controls.c
+++ b/components/services/audio_controls.c
@@ -304,8 +304,6 @@ esp_err_t actrls_init_json(const char *config) {
 				esp_err_t loc_err = actrls_process_button(button, cur_config);
 				err = (err == ESP_OK) ? loc_err : err;
 				if (loc_err == ESP_OK) {
-
-					ESP_LOGI(TAG, "Calling button_create");
 					button_create((void*) cur_config, cur_config->gpio,cur_config->type, cur_config->pull,cur_config->debounce,
 									control_handler, cur_config->long_press, cur_config->shifter_gpio);
 				}