clean-up some code

Author: ves011

ad7811/ad7811.c

@@ -4,6 +4,7 @@
  *  Created on: Nov 30, 2023
  *      Author: viorel_serbu
  */
+#include "freertos/projdefs.h"
 #include "project_specific.h"
 #ifdef ADC_AD7811
 #include <stdio.h>
@@ -27,7 +28,6 @@
 #include "spicom.h"
 #include "ad7811.h"
 
-
 static const char* TAG = "AD op:";
 static int vref;
 static gptimer_handle_t adc_timer;
@@ -235,6 +235,7 @@ int do_ad(int argc, char **argv)
 	int nerrors = arg_parse(argc, argv, (void **)&ad_args);
 	int chnn, nrs;
 	int16_t s_data[200];
+	int data;
 	int dbin;
 	if (nerrors != 0)
 		{
@@ -251,10 +252,14 @@ int do_ad(int argc, char **argv)
 			nrs = ad_args.arg1->ival[0];
 		else
 			nrs = 1;
-		adc_get_data(chnn, s_data, nrs);
+		//adc_get_data(chnn, s_data, nrs);
 		for(int i = 0; i < nrs; i++)
-			read_ADmv(chnn, (int *)&s_data[i], &dbin);
-		ESP_LOGI(TAG, "chn: %d = %d / %d, %d, %d, %d",  chnn, s_data[0], s_data[1], s_data[2], s_data[3], s_data[4]);
+			{
+			read_ADmv(chnn, &data, &dbin);
+			ESP_LOGI(TAG, "chn: %d = %d",  chnn, data);
+			vTaskDelay(pdMS_TO_TICKS(50));
+			}
+		//ESP_LOGI(TAG, "chn: %d = %d / %d, %d, %d, %d",  chnn, s_data[0], s_data[1], s_data[2], s_data[3], s_data[4]);
 		}
 	else if(strcmp(ad_args.op->sval[0], "mr") == 0)
 		{

comm/spicom.c

@@ -8,6 +8,8 @@
 
 #include <stdio.h>
 #include <string.h>
+
+#ifdef ADC_7811
 #include "soc/gpio_reg.h"
 #include "soc/dport_access.h"
 #include "driver/spi_master.h"
@@ -135,3 +137,4 @@ void register_spi()
 		};
 	ESP_ERROR_CHECK(esp_console_cmd_register(&spi_cmd));
 	}
+#endif

gpios.xlsx

@@ -27,15 +27,7 @@
 #include "external_defs.h"
 #include "tcp_log.h"
 #include "project_specific.h"
-#ifdef ADC_7811
-	#include "adc7811.h"
-#elif defined ADC_ESP32
-	#include "adc_op.h"
-#endif
-#if ACTIVE_CONTROLLER == PUMP_CONTROLLER || ACTIVE_CONTROLLER == WP_CONTROLLER
-	//#include "adc_op.h"
-	#include "pumpop.h"
-#endif
+
 
 #if ACTIVE_CONTROLLER == WESTA_CONTROLLER
 #include "westaop.h"
@@ -230,9 +222,8 @@ int spiffs_storage_check()
 				//esp_vfs_spiffs_unregister(conf.partition_label);
 				return ret;
 				}
-			else
-				ESP_LOGI(TAG, "SPIFFS_check() successful");
 			}
     	}
+	ESP_LOGI(TAG, "SPIFFS_check() successful");
     return ESP_OK;
     }