nvs_handle type

brawner · brawner · commit 756e44c6aa45 · 2020-09-25T15:05:28.000-07:00
diff --git a/driver/camera.c b/driver/camera.c
@@ -964,7 +964,7 @@ esp_err_t camera_probe(const camera_config_t* config, camera_model_t* out_camera
 
     ESP_LOGD(TAG, "Initializing SSCB");
     SCCB_Init(config->pin_sscb_sda, config->pin_sscb_scl);
-	
+
     if(config->pin_pwdn >= 0) {
         ESP_LOGD(TAG, "Resetting camera by power down line");
         gpio_config_t conf = { 0 };
@@ -1000,7 +1000,7 @@ esp_err_t camera_probe(const camera_config_t* config, camera_model_t* out_camera
         camera_disable_out_clock();
         return ESP_ERR_CAMERA_NOT_DETECTED;
     }
-    
+
     //slv_addr = 0x30;
     ESP_LOGD(TAG, "Detected camera at address=0x%02x", slv_addr);
     sensor_id_t* id = &s_state->sensor.id;
@@ -1455,15 +1455,11 @@ sensor_t * esp_camera_sensor_get()
     return &s_state->sensor;
 }
 
-esp_err_t esp_camera_save_to_nvs(const char *key) 
+esp_err_t esp_camera_save_to_nvs(const char *key)
 {
-#ifdef ESP_IDF_VERSION_MAJOR
-    nvs_handle_t handle;
-#else
     nvs_handle handle;
-#endif
     esp_err_t ret = nvs_open(key,NVS_READWRITE,&handle);
-    
+
     if (ret == ESP_OK) {
         sensor_t *s = esp_camera_sensor_get();
         if (s != NULL) {
@@ -1474,7 +1470,7 @@ esp_err_t esp_camera_save_to_nvs(const char *key)
             }
             return ret;
         } else {
-            return ESP_ERR_CAMERA_NOT_DETECTED; 
+            return ESP_ERR_CAMERA_NOT_DETECTED;
         }
         nvs_close(handle);
         return ret;
@@ -1483,17 +1479,13 @@ esp_err_t esp_camera_save_to_nvs(const char *key)
     }
 }
 
-esp_err_t esp_camera_load_from_nvs(const char *key) 
+esp_err_t esp_camera_load_from_nvs(const char *key)
 {
-#ifdef ESP_IDF_VERSION_MAJOR
-    nvs_handle_t handle;
-#else
-    nvs_handle handle;
-#endif
+  nvs_handle handle;
   uint8_t pf;
 
   esp_err_t ret = nvs_open(key,NVS_READWRITE,&handle);
-  
+
   if (ret == ESP_OK) {
       sensor_t *s = esp_camera_sensor_get();
       camera_status_t st;
@@ -1514,7 +1506,7 @@ esp_err_t esp_camera_load_from_nvs(const char *key)
             s->set_denoise(s,st.denoise);
             s->set_exposure_ctrl(s,st.aec);
             s->set_framesize(s,st.framesize);
-            s->set_gain_ctrl(s,st.agc);          
+            s->set_gain_ctrl(s,st.agc);
             s->set_gainceiling(s,st.gainceiling);
             s->set_hmirror(s,st.hmirror);
             s->set_lenc(s,st.lenc);
@@ -1527,7 +1519,7 @@ esp_err_t esp_camera_load_from_nvs(const char *key)
             s->set_wb_mode(s,st.wb_mode);
             s->set_whitebal(s,st.awb);
             s->set_wpc(s,st.wpc);
-        }  
+        }
         ret = nvs_get_u8(handle,CAMERA_PIXFORMAT_NVS_KEY,&pf);
         if (ret == ESP_OK) {
           s->set_pixformat(s,pf);
