Merge pull request #15 from jaysalOC3/update-esp32-sigrok

Update ESP32 Sigrok integration with the latest version of the Sigrok software

Author: Ebiroll

main/analog.c

@@ -1,6 +1,6 @@
 #if 1
 #include "analog.h"
-#include <driver/adc.h>
+#include <esp_adc/adc_oneshot.h>
 #include "freertos/FreeRTOS.h"
 #include "freertos/semphr.h"
 #include "freertos/task.h"
@@ -11,7 +11,7 @@
 #include "sdkconfig.h"
 #define USE_SEMA 1
 #include "soc/efuse_reg.h"
-#include <esp_int_wdt.h>
+#include "esp_private/esp_int_wdt.h"
 
 
 #ifdef CONFIG_ESP32S2_DEFAULT_CPU_FREQ_MHZ
@@ -211,7 +211,7 @@ A(V) = [(240 -<Raw_Byte> ) * (<Volts_Div> / 25) - (<Volts_Div> * 4.6)]
 
 A(V) +  (<VD> * 4.6) = [(240 -<Raw_Byte> ) * (<VD> / 25) ] 
 
-AV/VD + 4.6/VD = (240 -R) / 25
+AV/VD + 4.6/VD = (240 - R) / 25
 
 (AV/VD + 4.6/VD ) *25 = 240 - R 
 
@@ -677,4 +677,3 @@ bool samples_finnished() {
 
     return ret;
 }
-#endif

main/app_main.c

@@ -39,8 +39,8 @@ SOFTWARE.
 #include "scpi_server.h"
 #include "analog.h"
 #include <driver/rmt.h>
-#include "driver/i2s.h"
-#include "driver/adc.h"
+#include "driver/i2s_std.h"
+#include "driver/adc_oneshot.h"
 #include "app-config.h"
 #include "Header.h"
 #include "ota_server.h"

main/collector.c

@@ -13,6 +13,9 @@
 #include "nvs_flash.h"
 #include "collector.h"
 #include "driver/ledc.h"
+#include <esp_adc/adc_oneshot.h>
+#include <spi_flash_mmap.h>
+#include <driver/i2s_std.h>
 
 #ifdef CONFIG_IDF_TARGET_ESP32
 #define LEDC_HS_TIMER          LEDC_TIMER_0
@@ -708,7 +711,7 @@ void i2s_parallel_setup(const i2s_parallel_config_t *cfg) {
   // Clear flags which are used in I2S serial mode
   //I2S0.sample_rate_conf.rx_bits_mod = 8;
   I2S0.sample_rate_conf.rx_bits_mod = 16;
-  //dev->sample_rate_conf.rx_bck_div_num = 16; //ToDo: Unsure about what this does...
+  //dev->sample_rate_conf.tx_bck_div_num = 16; //ToDo: Unsure about what this does...
   I2S0.sample_rate_conf.rx_bck_div_num = 1;  // datasheet says this must be 2 or greater (but 1 seems to work)
 
   // this combination is 20MHz
@@ -1001,4 +1004,4 @@ uint8_t* get_values() {
 }
 
 
-#endif
+#endif

main/sampler.c

@@ -330,4 +330,4 @@ uint8_t* get_values() {
   //return((uint16_t*)s_state->dma_buf[0]);
   return((uint8_t*)dma_buff);
 }
-#endif
+#endif

platformio.ini

@@ -1,19 +1,19 @@
-; PlatformIO Project Configuration File
-;
-;   Build options: build flags, source filter
-;   Upload options: custom upload port, speed and extra flags
-;   Library options: dependencies, extra library storages
-;   Advanced options: extra scripting
-;
-; Please visit documentation for the other options and examples
-; http://docs.platformio.org/page/projectconf.html
-
-[platformio]
-src_dir = main
-lib_dir = components
-
-[env:esp32dev]
-platform = espressif32
-board = esp32dev
-framework =  espidf
-lib_deps = libscpi
+; PlatformIO Project Configuration File
+;
+;   Build options: build flags, source filter
+;   Upload options: custom upload port, speed and extra flags
+;   Library options: dependencies, extra library storages
+;   Advanced options: extra scripting
+;
+; Please visit documentation for the other options and examples
+; http://docs.platformio.org/page/projectconf.html
+
+[platformio]
+src_dir = main
+lib_dir = components
+
+[env:esp32dev]
+platform = espressif32
+board = esp32dev
+framework =  espidf
+lib_deps = libscpi, esp_adc