bugfix: fix crash for esp32s2

Author: TDA-2030

Firmware/FFBoard/Inc/DebugLog.h

@@ -11,16 +11,16 @@ extern "C" {
 // LOG DEBUG
 #ifdef HW_ESP32SX
 #define FFB_LOGI(format, ...) do {                                          \
-            ESP_LOGI(__FILE__, "%s(%d): " format, __FUNCTION__, __LINE__ __VA_OPT__(,) __VA_ARGS__);        \
+            ESP_LOGI(__FUNCTION__, "%s:%d -- " format, __FILE__, __LINE__ __VA_OPT__(,) __VA_ARGS__);        \
     } while(0)
 #define FFB_LOGW(format, ...) do {                                          \
-            ESP_LOGW(__FILE__, "%s(%d): " format, __FUNCTION__, __LINE__ __VA_OPT__(,) __VA_ARGS__);        \
+            ESP_LOGW(__FUNCTION__, "%s:%d -- " format, __FILE__, __LINE__ __VA_OPT__(,) __VA_ARGS__);        \
     } while(0)
 #define FFB_LOGE(format, ...) do {                                          \
-            ESP_LOGE(__FILE__, "%s(%d): " format, __FUNCTION__, __LINE__ __VA_OPT__(,) __VA_ARGS__);        \
+            ESP_LOGE(__FUNCTION__, "%s:%d -- " format, __FILE__, __LINE__ __VA_OPT__(,) __VA_ARGS__);        \
     } while(0)
 #define FFB_LOGD(format, ...) do {                                          \
-            ESP_LOGD(__FILE__, "%s(%d): " format, __FUNCTION__, __LINE__ __VA_OPT__(,) __VA_ARGS__);        \
+            ESP_LOGD(__FUNCTION__, "%s:%d -- " format, __FILE__, __LINE__ __VA_OPT__(,) __VA_ARGS__);        \
     } while(0)
 
 #else

Firmware/FFBoard/Src/CDCcomm.cpp

@@ -31,7 +31,7 @@ CDCcomm::~CDCcomm() {
 void CDCcomm::cdcFinished(uint8_t itf){
 	bool ret = cdcSems[itf].Give();
 	if (true != ret){
-		FFB_LOGE("cdcSem give error\n");
+		// FFB_LOGE("cdcSem give error\n");
 		return;
 	}
 

Firmware/FFBoard/Src/EffectsCalculator.cpp

@@ -29,7 +29,6 @@ const ClassIdentifier EffectsCalculator::getInfo(){
 EffectsCalculator::EffectsCalculator() : CommandHandler("fx", CLSID_EFFECTSCALC),
 		Thread("EffectsCalculator", EFFECT_THREAD_MEM, EFFECT_THREAD_PRIO)
 {
-	restoreFlash();
 
 	CommandHandler::registerCommands();
 	registerCommand("filterCfFreq", EffectsCalculator_commands::ffbfiltercf, "Constant force filter frequency", CMDFLAG_GET | CMDFLAG_SET);
@@ -576,7 +575,12 @@ uint8_t EffectsCalculator::getGain() { return global_gain; }
 
 void EffectsCalculator::setEffectsArray(FFB_Effect *pEffects)
 {
-	effects = pEffects;
+	FFB_LOGI("setEffectsArray %p", pEffects);
+	if (effects != pEffects) {
+		effects = pEffects;
+		FFB_LOGI("restoreFlash");
+		restoreFlash();
+	}
 }
 
 

Firmware/FFBoard/Src/eeprom.c

@@ -168,8 +168,11 @@ uint16_t EE_ReadVariable(uint16_t VirtAddress, uint16_t *Data)
     char key[16] = {0};
     make_key(VirtAddress, key);
     esp_err_t ret = param_load(_VAL_NAMESPACE, key, Data);
-    ESP_LOGI(TAG, "read nvs %s=%d", key, *Data);
-
+    if (ESP_OK == ret) {
+        ESP_LOGI(TAG, "read nvs %s=%d", key, *Data);
+    } else {
+        ESP_LOGE(TAG, "read nvs %s error", key);
+    }
     /* Return ReadStatus value: (0: variable exist, 1: variable doesn't exist) */
     return ret == ESP_OK ? 0 : 1;
 }