ADC Testing

RotaxMonitor/src/datasave.cpp

@@ -1,8 +1,6 @@
 #include "datasave.h"
 #include <math.h>
 
-
-
 LITTLEFSGuard::LITTLEFSGuard()
 {
     if (!LittleFS.begin(true, "/littlefs", 10, "littlefs"))
@@ -12,7 +10,7 @@ LITTLEFSGuard::LITTLEFSGuard()
     else
     {
         LOG_INFO("LittleFS mounted successfully");
-        LOG_INFO("LittleFS Free KBytes:", (LittleFS.totalBytes() - LittleFS.usedBytes()) /1024);
+        LOG_INFO("LittleFS Free KBytes:", (LittleFS.totalBytes() - LittleFS.usedBytes()) / 1024);
     }
 }
 
@@ -51,28 +49,29 @@ void ignitionBoxStatusFiltered::update(const ignitionBoxStatus &new_status)
     // simple moving average calculation
     m_last.timestamp = new_status.timestamp; // keep timestamp of latest status
 
-    m_last.coils12.n_events = new_status.coils12.n_events;                           // sum events instead of averaging
-    m_last.coils12.n_missed_firing = new_status.coils12.n_missed_firing;             // sum missed firings instead of averaging
-    m_last.coils12.spark_status = new_status.coils12.spark_status;                   // take latest spark status
-    m_last.coils12.sstart_status = new_status.coils12.sstart_status;                 // take latest soft start status
-    filter(m_last.coils12.spark_delay, new_status.coils12.spark_delay, m_max_count); // incremental average calculation
-    filter(m_last.coils12.peak_p_in, new_status.coils12.peak_p_in, m_max_count);     // incremental average calculation
-    filter(m_last.coils12.peak_n_in, new_status.coils12.peak_n_in, m_max_count);     // incremental average calculation
-    filter(m_last.coils12.peak_p_out, new_status.coils12.peak_p_out, m_max_count);   // incremental average calculation
-    filter(m_last.coils12.peak_n_out, new_status.coils12.peak_n_out, m_max_count);   // incremental average calculation
+    m_last.coils12.n_events = new_status.coils12.n_events;               // sum events instead of averaging
+    m_last.coils12.n_missed_firing = new_status.coils12.n_missed_firing; // sum missed firings instead of averaging
+    m_last.coils12.spark_status = new_status.coils12.spark_status;       // take latest spark status
+    m_last.coils12.sstart_status = new_status.coils12.sstart_status;     // take latest soft start status
+    m_last.coils12.spark_delay = new_status.coils12.spark_delay;         // incremental average calculation
+    m_last.coils12.peak_p_in = new_status.coils12.peak_p_in;             // incremental average calculation
+    m_last.coils12.peak_n_in = new_status.coils12.peak_n_in;             // incremental average calculation
+    m_last.coils12.peak_p_out = new_status.coils12.peak_p_out;           // incremental average calculation
+    m_last.coils12.peak_n_out = new_status.coils12.peak_n_out;           // incremental average calculation
 
-    m_last.coils34.n_events = new_status.coils34.n_events;                           // sum events instead of averaging
-    m_last.coils34.n_missed_firing = new_status.coils34.n_missed_firing;             // sum missed firings instead of averaging
-    m_last.coils34.spark_status = new_status.coils34.spark_status;                   // take latest spark status
-    m_last.coils34.sstart_status = new_status.coils34.sstart_status;                 // take latest soft start status
-    filter(m_last.coils34.spark_delay, new_status.coils34.spark_delay, m_max_count); // incremental average calculation
-    filter(m_last.coils34.peak_p_in, new_status.coils34.peak_p_in, m_max_count);     // incremental average calculation
-    filter(m_last.coils34.peak_n_in, new_status.coils34.peak_n_in, m_max_count);     // incremental average calculation
-    filter(m_last.coils34.peak_p_out, new_status.coils34.peak_p_out, m_max_count);   // incremental average calculation
-    filter(m_last.coils34.peak_n_out, new_status.coils34.peak_n_out, m_max_count);   // incremental average calculation
-    filter(m_last.eng_rpm, new_status.eng_rpm, m_max_count);                         // incremental average calculation                   // incremental average calculation
-    filter(m_last.adc_read_time, m_last.adc_read_time, m_max_count);                 // incremental average calculation
-    m_last.n_queue_errors = new_status.n_queue_errors;                               // take last of queue errors since it's a cumulative count of errors in the queue, not an average value
+    m_last.coils34.n_events = new_status.coils34.n_events;               // sum events instead of averaging
+    m_last.coils34.n_missed_firing = new_status.coils34.n_missed_firing; // sum missed firings instead of averaging
+    m_last.coils34.spark_status = new_status.coils34.spark_status;       // take latest spark status
+    m_last.coils34.sstart_status = new_status.coils34.sstart_status;     // take latest soft start status
+    m_last.coils34.spark_delay = new_status.coils34.spark_delay;         // incremental average calculation
+    m_last.coils34.peak_p_in = new_status.coils34.peak_p_in;             // incremental average calculation
+    m_last.coils34.peak_n_in = new_status.coils34.peak_n_in;             // incremental average calculation
+    m_last.coils34.peak_p_out = new_status.coils34.peak_p_out;           // incremental average calculation
+    m_last.coils34.peak_n_out = new_status.coils34.peak_n_out;           // incremental average calculation
+
+    m_last.eng_rpm = new_status.eng_rpm;               // incremental average calculation
+    m_last.adc_read_time = m_last.adc_read_time;       // incremental average calculation
+    m_last.n_queue_errors = new_status.n_queue_errors; // take last of queue errors since it's a cumulative count of errors in the queue, not an average value
 
     if (m_count >= m_max_count)
     {
@@ -124,4 +123,3 @@ const ArduinoJson::JsonDocument ignitionBoxStatusFiltered::toJson() const
     }
     return doc;
 }
-

RotaxMonitor/src/devices.h

@@ -43,18 +43,13 @@ struct Devices
     std::unique_ptr<ADS1256> m_adc_b = nullptr;
 
     std::unique_ptr<ExternalIO> m_ext_io = nullptr;
-
 };
 
 // Adc read channel wrapper to selet mux before reading
 inline float adcReadChannel(ADS1256 *adc, const uint8_t ch)
 {
     adc->setMUX(ch);
-    // scarta 3 conversioni
-    for (int i = 0; i < 5; i++)
-    {
-        adc->readSingle();
-    }
+    adc->readSingle();
     // ora lettura valida a 30kSPS → ~100 µs di settling
     return adc->convertToVoltage(adc->readSingle());
 }

RotaxMonitor/src/main.cpp

@@ -53,7 +53,7 @@ void setup()
     IPAddress gateway(10, 11, 12, 1);
     IPAddress subnet(255, 255, 255, 0);
     WiFi.softAPConfig(local_IP, gateway, subnet);
-    WiFi.setTxPower(WIFI_POWER_13dBm); // reduce wifi power
+    WiFi.setTxPower(WIFI_POWER_5dBm); // reduce wifi power
     if (WiFi.softAP(WIFI_SSID, WIFI_PASSWORD))
     {
         LOG_INFO("WiFi AP Mode Started");
@@ -117,19 +117,42 @@ void loop()
 #endif
     // Init ADCs
     dev->m_adc_a = std::make_unique<ADS1256>(ADC_A_DRDY, ADS1256::PIN_UNUSED, ADS1256::PIN_UNUSED, ADC_A_CS, 2.5, &SPI_A);
-    #ifdef CH_B_ENABLE
+#ifdef CH_B_ENABLE
     dev->m_adc_b = std::make_unique<ADS1256>(ADC_B_DRDY, ADS1256::PIN_UNUSED, ADS1256::PIN_UNUSED, ADC_B_CS, 2.5, &SPI_B);
-    #endif
+#endif
     // Configure ADCs
     dev->m_adc_a->InitializeADC();
     dev->m_adc_a->setPGA(PGA_1);
-    dev->m_adc_a->setDRATE(DRATE_7500SPS);
-    #ifdef CH_B_ENABLE
+    // dev->m_adc_a->setDRATE(DRATE_15000SPS);
+#ifdef CH_B_ENABLE
     dev->m_adc_b->InitializeADC();
     dev->m_adc_b->setPGA(PGA_1);
-    dev->m_adc_b->setDRATE(DRATE_7500SPS);
+    dev->m_adc_b->setDRATE(DRATE_30000SPS);
 #endif
     LOG_DEBUG("Init SPI OK");
+    
+    uint8_t chs[8] = {
+        SING_0, SING_1, SING_2, SING_3, SING_4, SING_5, SING_6, SING_7
+    };
+    float res[8];
+
+    while (Serial.read() != 's') // The conversion is stopped by a character received from the serial port
+    {
+        clearScreen();
+        auto start = esp_timer_get_time();
+        for (int i = 0; i < 8; i++){
+           // dev->m_adc_a->setMUX(chs[i]);
+            res[i] = dev->m_adc_a->convertToVoltage(dev->m_adc_a->cycleSingle());
+        }
+        auto stop = esp_timer_get_time();
+        for (int j = 0; j < 8; j++){
+            Serial.printf("ADC_A SING_%d: %5.4f\n",j, res[j]);
+        }
+        Serial.printf("ADC Time: %u us\n", stop-start);
+        delay(100);
+        
+    }
+    dev->m_adc_a->stopConversion();
 
     //////// INIT I2C INTERFACES ////////
     LOG_DEBUG("Init I2C Interfaces");

RotaxMonitor/src/tasks.cpp

@@ -40,14 +40,13 @@ void rtIgnitionTask::rtIgnitionTask_realtime(void *pvParameters)
     QueueHandle_t rt_queue = params->rt_queue;
     Devices *dev = params->dev.get();
     ADS1256 *adc = params->name == "rtIgnTask_A" ? dev->m_adc_a.get() : dev->m_adc_b.get();
-    std::mutex& spi_mutex = params->name == "rtIgnTask_A" ? dev->m_spi_a_mutex : dev->m_spi_b_mutex;
-    ExternalIO* io = dev->m_ext_io.get();
+    std::mutex &spi_mutex = params->name == "rtIgnTask_A" ? dev->m_spi_a_mutex : dev->m_spi_b_mutex;
+    ExternalIO *io = dev->m_ext_io.get();
 
     TaskStatus_t rt_task_info;
     vTaskGetInfo(NULL, &rt_task_info, pdFALSE, eInvalid);
 
-    const auto rt_task_name = pcTaskGetName(rt_task_info.xHandle);
-    LOG_INFO("rtTask Params OK [", rt_task_name, "]");
+    LOG_INFO("rtTask Params OK [", params->name.c_str(), "]");
 
     ignitionBoxStatus ign_box_sts;
 
@@ -98,7 +97,7 @@ void rtIgnitionTask::rtIgnitionTask_realtime(void *pvParameters)
     attachInterruptArg(digitalPinToInterrupt(rt_int.spark_pin_12), rt_int.isr_ptr, (void *)&isr_params_sp12, RISING);
     attachInterruptArg(digitalPinToInterrupt(rt_int.spark_pin_34), rt_int.isr_ptr, (void *)&isr_params_sp34, RISING);
 
-    LOG_INFO("rtTask ISR Attach OK [", rt_task_name, "]");
+    LOG_INFO("rtTask ISR Attach OK [", params->name.c_str(), "]");
 
     // Global rt_task_ptr variables
     bool first_cycle = true;
@@ -236,7 +235,7 @@ void rtIgnitionTask::rtIgnitionTask_realtime(void *pvParameters)
             //  read adc channels: pickup12, out12 [ pos + neg ]
             if (adc) // read only if adc initialized
             {
-                std::lock_guard<std::mutex> lock (spi_mutex);
+                std::lock_guard<std::mutex> lock(spi_mutex);
                 uint32_t start_adc_read = esp_timer_get_time();
                 // from peak detector circuits
                 ign_box_sts.coils12.peak_p_in = adcReadChannel(adc, ADC_CH_PEAK_12P_IN);
@@ -256,10 +255,23 @@ void rtIgnitionTask::rtIgnitionTask_realtime(void *pvParameters)
             // outputs on io expander
             if (io)
             {
-                // [TODO] code to reset sample and hold and arm trigger level detectors
+                // Discharge Pulse
+                io->extDigitalWrite(rt_rst.sh_disch_12, true);
+                io->extDigitalWrite(rt_rst.sh_disch_34, true);
+                delayMicroseconds(250);
+                io->extDigitalWrite(rt_rst.sh_disch_12, false);
+                io->extDigitalWrite(rt_rst.sh_disch_34, false);
+                // Safety delay
+                delayMicroseconds(500);
+                // Re-Arm Pulse
+                io->extDigitalWrite(rt_rst.sh_arm_12, true);
+                io->extDigitalWrite(rt_rst.sh_arm_34, true);
+                delayMicroseconds(250);
+                io->extDigitalWrite(rt_rst.sh_arm_12, false);
+                io->extDigitalWrite(rt_rst.sh_arm_34, false);
             }
             else
-                vTaskDelay(pdMS_TO_TICKS(2));
+                vTaskDelay(pdMS_TO_TICKS(c_io_time));
 
             // send essage to main loop with ignition info, by copy so local static variable is ok
             if (rt_queue)
@@ -272,7 +284,7 @@ void rtIgnitionTask::rtIgnitionTask_realtime(void *pvParameters)
     }
     // Delete the timeout timer
     esp_timer_delete(timeout_timer);
-    LOG_WARN("rtTask Ending [", rt_task_name, "]");
+    LOG_WARN("rtTask Ending [", params->name.c_str(), "]");
     // Ignition A Interrupts DETACH
     detachInterrupt(rt_int.trig_pin_12p);
     detachInterrupt(rt_int.trig_pin_12n);

RotaxMonitorTester/platformio.ini

@@ -22,7 +22,7 @@ build_type = release
 [env:esp32-devtest-debug]
 board = esp32dev
 platform = https://github.com/pioarduino/platform-espressif32/releases/download/stable/platform-espressif32.zip
-
+framework = arduino
 lib_deps = 
 	hideakitai/DebugLog@^0.8.4
 board_build.flash_size = 4MB

RotaxMonitorTester/src/colors.h

@@ -0,0 +1,12 @@
+#pragma once
+
+// ANSI colors
+#define COLOR_RESET "\033[0m"
+#define COLOR_RED "\033[31m"
+#define COLOR_GREEN "\033[32m"
+#define COLOR_BLUE "\033[34m"
+#define COLOR_MAGENTA "\033[35m"
+#define COLOR_CYAN "\033[36m"
+#define COLOR_YELLOW "\033[33m"
+#define COLOR_WHITE "\033[37m"
+#define COLOR_LBLUE "\033[94m"

RotaxMonitorTester/src/main.cpp

@@ -4,6 +4,8 @@
 #include <DebugLog.h>
 
 #include "timer.h"
+#include "colors.h"
+
 #include <map>
 
 static hw_timer_t *timerA = NULL;
@@ -17,6 +19,12 @@ static uint32_t count = 0;
 #define SPARK_DLY_MIN 10
 #define SPARK_DLY_MAX 490
 
+#define COIL_PULSE_MIN 100
+#define COIL_PULSE_MAX 1000
+
+#define SPARK_PULSE_MIN 10
+#define SPARK_PULSE_MAX 500
+
 #define PAUSE_LONG_MIN 5000
 #define PAUSE_LONG_MAX PAUSE_LONG_MIN * 100
 
@@ -30,7 +38,8 @@ void clearScreen()
   Serial.flush();
 }
 
-static double filtered_rpm = 0;
+static uint32_t set_rpm = 500;
+static uint32_t set_delay = 100;
 
 static const std::map<const uint32_t, const char *> pin2Name = {
     {PIN_TRIG_A12P, "HIGH_PIN_TRIG_A12P"},
@@ -68,7 +77,7 @@ static timerStatus stsB = {
     .clock_period_us = (uint32_t)PERIOD_US,
     .pause_long_us = 10000,
     .pause_short_us = 1000,
-    .coil_pulse_us = 1000,
+    .coil_pulse_us = 500,
     .spark_pulse_us = 100,
     .spark_delay_us = 50,
     .pins = {
@@ -83,11 +92,14 @@ static timerStatus stsB = {
 static bool isEnabled_A = false;
 static bool isEnabled_B = false;
 
+static String last_command;
+
 void setup()
 {
 
   Serial.begin(115200);
   delay(1000);
+  Serial.setTimeout(100);
   LOG_ATTACH_SERIAL(Serial);
 
   pinMode(PIN_TRIG_A12P, OUTPUT);
@@ -133,63 +145,124 @@ void setup()
 
 void loop()
 {
-  LOG_INFO("Loop: ", count++);
-  uint32_t spark_delay = (uint32_t)(map(analogRead(SPARK_DELAY_POT), 0, 4096, SPARK_DLY_MIN, SPARK_DLY_MAX) / PERIOD_US);
-  stsA.spark_delay_us = spark_delay * PERIOD_US;
-  if (stsA.spark_delay_us > (SPARK_DLY_MIN + SPARK_DLY_MAX) / 2)
-  {
-    stsA.soft_start = true;
-    stsA.spark_delay_us -= (SPARK_DLY_MIN + SPARK_DLY_MAX) / 2;
-  }
-  else
-  {
-    stsA.soft_start = false;
-  }
-  stsB.soft_start = stsA.soft_start;
-  stsB.spark_delay_us = stsA.spark_delay_us;
+  clearScreen();
 
-  double new_rpm = (double)(map(analogRead(FREQ_POT), 0, 4096, RPM_MIN, RPM_MAX));
-  filtered_rpm = filtered_rpm + 0.1 * (new_rpm - filtered_rpm);
-  stsA.pause_long_us = (uint32_t)(60000000.0f / filtered_rpm / 2.0f);
-  stsB.pause_long_us = stsA.pause_long_us;
+  Serial.printf("\t++++ Loop: %u ++++\n", count++);
 
   if (isEnabled_A)
-    LOG_INFO("==== System A is ENABLED ====");
+    Serial.println("==== System A is" COLOR_GREEN " ENABLED" COLOR_RESET " ====");
   else
-    LOG_INFO("==== System A is DISABLED ====");
+    Serial.println("==== System A is" COLOR_RED " DISABLED" COLOR_RESET " ====");
 
   if (isEnabled_B)
-    LOG_INFO("==== System B is ENABLED ====");
+    Serial.println("==== System B is" COLOR_GREEN " ENABLED" COLOR_RESET " ====");
   else
-    LOG_INFO("==== System B is DISABLED ====");
+    Serial.println("==== System B is" COLOR_RED " DISABLED" COLOR_RESET " ====");
 
-  LOG_INFO("Spark Delay uS: ", stsA.spark_delay_us, "\tSoft Start: ", stsA.soft_start ? "TRUE" : "FALSE");
-  LOG_INFO("Engine Rpm: ", (uint32_t)(filtered_rpm));
-  LOG_INFO("Coil Pulse: ", stsA.coil_pulse_us, "us");
-  LOG_INFO("Spark Pulse: ", stsA.spark_pulse_us, "us");
+  Serial.printf("Spark Delay uS: %u\n", stsA.spark_delay_us);
+  Serial.printf("Soft Start: %s\n", stsA.soft_start ? "ENABLED" : "DISABLED");
+  Serial.printf("Engine Rpm: %u\n", (uint32_t)(set_rpm));
+  Serial.printf("Coil Pulse: %u uS\n", stsA.coil_pulse_us);
+  Serial.printf("Spark Pulse: %u uS\n", stsA.spark_pulse_us);
+  Serial.println(COLOR_CYAN "-------------------------------------");
+  Serial.println("E[a/b] > Enable Box a/b | D[a/b]  > Disable a/b");
+  Serial.println("S[ddd] > Spark Delay    | R[dddd] > Engine RPM");
+  Serial.println("C[ddd] > Spark Pulse    | P[ddd]  > Coil Pulse");
+  Serial.println("-------------------------------------" COLOR_RESET);
+  Serial.printf("Last Command: %s\n", last_command.c_str());
 
-  if (digitalRead(ENABLE_PIN_A) == LOW && !isEnabled_A)
+  auto str = Serial.readStringUntil('\n');
+  if (!str.isEmpty())
   {
-    timerStart(timerA);
-    isEnabled_A = true;
-  }
-  else if (digitalRead(ENABLE_PIN_A) == HIGH && isEnabled_A)
-  {
-    timerStop(timerA);
-    isEnabled_A = false;
+    last_command = str;
+    const auto cmd = str.charAt(0);
+    char c;
+    switch (cmd)
+    {
+    case 'E':
+    {
+      char box;
+      sscanf(str.c_str(), "%c%c\n", &c, &box);
+      if (box == 'a' && !isEnabled_A)
+      {
+        timerStart(timerA);
+        isEnabled_A = true;
+      }
+      else if (box == 'b' && !isEnabled_B)
+      {
+        timerStart(timerB);
+        isEnabled_B = true;
+      }
+      break;
+    }
+    case 'D':
+    {
+      char c;
+      char box;
+      sscanf(str.c_str(), "%c%c\n", &c, &box);
+      if (box == 'a' && isEnabled_A)
+      {
+        timerStop(timerA);
+        isEnabled_A = false;
+      }
+      else if (box == 'b' && isEnabled_B)
+      {
+        timerStop(timerB);
+        isEnabled_B = false;
+      }
+      break;
+    }
+    case 'R':
+    {
+      int new_rpm;
+      sscanf(str.c_str(), "%c%d\n", &c, &new_rpm);
+      new_rpm = min(RPM_MAX, max(RPM_MIN, new_rpm));
+      stsA.pause_long_us = (uint32_t)(60000000.0f / (float)new_rpm / 2.0f);
+      stsB.pause_long_us = stsA.pause_long_us;
+      set_rpm = (uint32_t)new_rpm;
+      break;
+    }
+    case 'S':
+    {
+      int new_delay;
+      sscanf(str.c_str(), "%c%d\n", &c, &new_delay);
+      new_delay = min(SPARK_DLY_MAX, max(SPARK_DLY_MIN, new_delay));
+      stsA.spark_delay_us = (uint32_t)(new_delay);
+      if (stsA.spark_delay_us > (SPARK_DLY_MIN + SPARK_DLY_MAX) / 2)
+      {
+        stsA.soft_start = true;
+        stsA.spark_delay_us -= (SPARK_DLY_MIN + SPARK_DLY_MAX) / 2;
+      }
+      else
+      {
+        stsA.soft_start = false;
+      }
+      stsB.soft_start = stsA.soft_start;
+      stsB.spark_delay_us = stsA.spark_delay_us;
+      break;
+    }
+    case 'P':
+    {
+      int new_pulse;
+      sscanf(str.c_str(), "%c%d\n", &c, &new_pulse);
+      new_pulse = min(COIL_PULSE_MAX, max(COIL_PULSE_MIN, new_pulse));
+      stsA.coil_pulse_us = stsB.coil_pulse_us = (uint32_t)new_pulse;
+      break;
+    }
+    case 'C':
+    {
+      int new_pulse;
+      sscanf(str.c_str(), "%c%d\n", &c, &new_pulse);
+      new_pulse = min(SPARK_PULSE_MAX, max(SPARK_PULSE_MIN, new_pulse));
+      stsA.spark_pulse_us = stsB.spark_pulse_us = (uint32_t)new_pulse;
+      break;
+    }
+    default:
+      break;
+    }
+    Serial.read();
   }
 
-  if (digitalRead(ENABLE_PIN_B) == LOW && !isEnabled_B)
-  {
-    timerStart(timerB);
-    isEnabled_B = true;
-  }
-  else if (digitalRead(ENABLE_PIN_B) == HIGH && isEnabled_B)
-  {
-    timerStop(timerB);
-    isEnabled_B = false;
-  }
-
-  delay(100);
-  clearScreen();
+  str.clear();
+  delay(1000);
 }