Change sampling of sensors. Option added to split MAP sampling from other sensors. Changes in the x-tau algorithm

Author: ashabelnikov

sources/adc.c

@@ -89,7 +89,7 @@ uint16_t adc_get_add_i3_value(void);
 /** Get latest measured value from throttle gate position sensor
  * \return value in ADC discretes
  */
-uint16_t adc_get_carb_value(void);
+uint16_t adc_get_tps_value(void);
 
 #if defined(FUEL_INJECT) || defined(GD_CONTROL)
 /** Get TPSdot value (dv/dt)
@@ -108,24 +108,40 @@ int16_t adc_get_mapdot_value(void);
  */
 uint16_t adc_get_knock_value(void);
 
-/**Starts measuring values from sensors, but only in the case when previous measurement has been completed
- * \param speed2x Double ADC clock, 0 - normal speed, 1 - double speed
+/** Start measuring MAP (standalone). Call this function only if MAP sampling mode is synchronous with CKP (see adc_set_map_to_ckp()
+ * function for more information). If previous standalone MAP sampling is not finished yet, then this function does nothing.
  */
-void adc_begin_measure(uint8_t speed2x);
+void adc_begin_measure_map(void);
+
+/**Start of sampling of sensors. If ADC is busy by other sensors, this function sets request flag.
+ * If MAP measurement mode is regular (not synchronized with CKP), then this function measures MAP too.
+ */
+void adc_begin_measure(void);
 
 #ifndef TPIC8101
 /**Starts measuring value from the knock channel's integrator. As after setting INT/HOLD signal to 0
- * INTOUT output go into a fully correct state only after a 20us (approx.), then do first measurement
- * dummy, thus our subsequent actual measurement will be correct.
- * \param speed2x Double ADC clock, 0 - normal speed, 1 - double speed
+ * INTOUT output go into a fully correct state only after a 20us (approx.), then do first dummy measurement,
+ * thus our subsequent actual measurement will be correct.
  */
-void adc_begin_measure_knock(uint8_t speed2x);
+void adc_begin_measure_knock(void);
 #endif
 
+#define ADCRDY_MAP   0   //!< MAP
+#ifndef TPIC8101
+#define ADCRDY_KNOCK 1   //!< Knock
+#endif
+#define ADCRDY_SENS  2   //!< rest of the sensors
+
 /**Check if ADC is ready
+ * \param what See definitions of ADCRDY_* constants
  *\return return non-zero value if measuremtnt is ready (ADC is not busy)
  */
-uint8_t adc_is_measure_ready(void);
+uint8_t adc_is_measure_ready(uint8_t what);
+
+/** Sets sampling mode for MAP sensor
+ * \param mtckp 0 - measure MAP with other sensors regularly, 1 - measure MAP synchronously with CKP in each stroke
+ */
+void adc_set_map_to_ckp(uint8_t mtckp);
 
 /**Initialization of ADC and its state variables */
 void adc_init(void);

sources/adc.h

@@ -137,7 +137,7 @@ void measure_voltage(void)
  do
  {
   adc_measure_voltage();
-  meas_update_values_buffers(0, &ram_extabs.cesd); //<-- all
+  meas_update_values_buffers(&ram_extabs.cesd);
   _DELAY_US(100);
   wdt_reset_timer();
  }while(--i);

sources/bc_input.c

@@ -1339,10 +1339,12 @@ static void process_ckps_cogs(void)
    {
     knock_set_integration_mode(KNOCK_INTMODE_HOLD);
     if (CHECKBIT(flags, F_USEKNK))
+    {
      knock_start_settings_latching();//start the process of downloading the settings into the HIP9011 (and getting ADC result for TPIC8101)
 #ifndef TPIC8101
-    adc_begin_measure_knock(_AB(ckps.stroke_period, 1) < 4);
+     adc_begin_measure_knock();   //Sample INTOUT output
 #endif
+    }
    }
   }
 
@@ -1362,7 +1364,7 @@ static void process_ckps_cogs(void)
 #ifdef SPLIT_ANGLE
    ckps.advance_angle1 = ckps.advance_angle_buffered1; //advance angle with all the adjustments (say, 15°)
 #endif
-   adc_begin_measure(_AB(ckps.stroke_period, 1) < 4);//start the process of measuring analog input values
+   adc_begin_measure_map();                //start the process of MAP sampling
 #ifdef STROBOSCOPE
    if (0==i)
     ckps.strobe = 1; //strobe!

sources/ckps-cs.c

@@ -1103,7 +1103,7 @@ ISR(TIMER1_COMPA_vect)
   }
 
   case QID_MEASURE:
-   adc_begin_measure(_AB(ckps.stroke_period, 1) < 4);//start the process of measuring analog input values
+   adc_begin_measure_map(); //start the process of MAP sampling
    break;
 
   case QID_KNKBEG:
@@ -1119,7 +1119,7 @@ ISR(TIMER1_COMPA_vect)
    knock_set_integration_mode(KNOCK_INTMODE_HOLD);
    knock_start_settings_latching();//start the process of downloading the settings into the HIP9011 (and getting ADC result for TPIC8101)
 #ifndef TPIC8101
-   adc_begin_measure_knock(_AB(ckps.stroke_period, 1) < 4);
+   adc_begin_measure_knock();
 #endif
    break;
 
@@ -1355,7 +1355,7 @@ static void process_ckps_cogs(void)
    QUEUE_ADDF(1, ICR1, (uint16_t)delay, QID_RPMSAMP);
   }
 
-  //program queue for sensors' sample event
+  //program queue for MAP's sample event
   if (chanstate[ch].msr_tooth == ckps.cog)
   {
    uint16_t delay = FRAC_TO_TIME(chanstate[ch].msr_frac);

sources/ckps-odd.c

@@ -1344,10 +1344,12 @@ static void process_ckps_cogs(void)
    {
     knock_set_integration_mode(KNOCK_INTMODE_HOLD);
     if (CHECKBIT(flags, F_USEKNK))
+    {
      knock_start_settings_latching();//start the process of downloading the settings into the HIP9011 (and getting ADC result for TPIC8101)
 #ifndef TPIC8101
-    adc_begin_measure_knock(_AB(ckps.stroke_period, 1) < 4);
+     adc_begin_measure_knock();
 #endif
+    }
    }
   }
 
@@ -1367,7 +1369,7 @@ static void process_ckps_cogs(void)
 #ifdef SPLIT_ANGLE
    ckps.advance_angle1 = ckps.advance_angle_buffered1; //advance angle with all the adjustments (say, 15°)
 #endif
-   adc_begin_measure(_AB(ckps.stroke_period, 1) < 4);//start the process of measuring analog input values
+   adc_begin_measure_map();               //start the process of MAP sampling
 #ifdef STROBOSCOPE
    if (0==i)
     ckps.strobe = 1; //strobe!

sources/ckps.c

@@ -946,10 +946,12 @@ static void process_ckps_cogs(void)
    {
     knock_set_integration_mode(KNOCK_INTMODE_HOLD);
     if (CHECKBIT(flags, F_USEKNK))
+    {
      knock_start_settings_latching();//start the process of downloading the settings into the HIP9011 (and getting ADC result for TPIC8101)
 #ifndef TPIC8101
-    adc_begin_measure_knock(_AB(ckps.stroke_period, 1) < 4); //for HIP9011 only
+     adc_begin_measure_knock(); //for HIP9011 only
 #endif
+    }
    }
   }
 
@@ -969,7 +971,7 @@ static void process_ckps_cogs(void)
 #ifdef SPLIT_ANGLE
    ckps.advance_angle1 = ckps.advance_angle_buffered1; //advance angle with all the adjustments (say, 15°)
 #endif
-   adc_begin_measure(_AB(ckps.stroke_period, 1) < 4);//start the process of measuring analog input values
+   adc_begin_measure_map();               //start the process of MAP sampling
 #ifdef STROBOSCOPE
    if (0==i)
     ckps.strobe = 1; //strobe!

sources/ckps2ch.c

@@ -661,7 +661,7 @@ static inline void ProcessCogEdge(uint16_t tmr)
   hall.knkwnd_mode = 0;
  }
 
- adc_begin_measure(_AB(hall.stroke_period, 1) < 4);//start the process of measuring analog input values
+ adc_begin_measure_map(); //start the process of MAP sampling
 
 sync_skip:
  ++hall.cog;
@@ -732,7 +732,7 @@ ISR(TIMER0_COMPA_vect)
    knock_set_integration_mode(KNOCK_INTMODE_HOLD);
    knock_start_settings_latching();//start the process of downloading the settings into the HIP9011 (and getting of ADC result for TPIC8101)
 #ifndef TPIC8101
-   adc_begin_measure_knock(_AB(hall.stroke_period, 1) < 4);
+   adc_begin_measure_knock();
 #endif
    hall.knkwnd_mode = 0;
   }

sources/ckpsn+1.c

@@ -394,6 +394,9 @@ void diagnost_process(void)
  //perform initialization of digital inputs
  init_digital_inputs();
 
+ //regular mode (sample MAP together with other sensors)
+ adc_set_map_to_ckp(0);
+
 #ifndef SECU3T
  knock_expander_initialize();
 #endif
@@ -423,19 +426,15 @@ void diagnost_process(void)
     knock_set_channel(diag.ksp_channel);
     if (++diag.ksp_channel > KSP_CHANNEL_1)
      diag.ksp_channel = KSP_CHANNEL_0;
-    adc_begin_measure(0); //<--normal speed
     ++diag.fsm_state;
     break;
 
-   //wait for completion of measurements, start integration of current knock channel's signal
+   //start integration of current knock channel's signal
    case 1:
-    if (adc_is_measure_ready())
-    {
      if (!(d.diag_out & _OBV(24)))
       knock_set_integration_mode(KNOCK_INTMODE_INT);
-     _DELAY_US(1000);   //1ms
+     _DELAY_US(2000);   //2ms
      ++diag.fsm_state;
-    }
     break;
 
    //start measurements (knock signal)
@@ -449,7 +448,9 @@ void diagnost_process(void)
 #endif
      knock_start_settings_latching();
 #ifndef TPIC8101
-    adc_begin_measure_knock(0); //HIP9011 only
+    _DISABLE_INTERRUPT();
+    adc_begin_measure_knock(); //HIP9011 only
+    _ENABLE_INTERRUPT();
 #endif
     ++diag.fsm_state;
     break;
@@ -463,7 +464,7 @@ void diagnost_process(void)
     {
      diag.knock_value[diag.ksp_channel] = knock_get_adc_value(); //get ADC value read from TPIC8101
 #else //HIP9011
-    if (adc_is_measure_ready())
+    if (adc_is_measure_ready(ADCRDY_KNOCK))
     {
      diag.knock_value[diag.ksp_channel] = adc_get_knock_value();
 #endif
@@ -494,7 +495,7 @@ void diagnost_process(void)
 #ifdef TPIC8101
    d.diag_inp.add_i4 = _ADC_COMPENSATE(adc_get_knock_value(), ADC_VREF_FACTOR, 0.0);
 #endif
-   d.diag_inp.carb = _ADC_COMPENSATE(adc_get_carb_value(), ADC_VREF_FACTOR, 0.0);
+   d.diag_inp.carb = _ADC_COMPENSATE(adc_get_tps_value(), ADC_VREF_FACTOR, 0.0);
 
 #if !defined(SECU3T) && defined(MCP3204)
    d.diag_inp.add_i5 = _ADC_COMPENSATE(adc_get_add_i5_value(), 0.488, 0.0);

sources/diagnost.c

@@ -1986,7 +1986,7 @@ uint32_t calc_dist(uint16_t pulse_count)
 #endif
 
 #if defined(FUEL_INJECT) && defined(XTAU_CORR)
-//from adc.c
+//from injector.c
 extern volatile uint8_t xtau_str_cnt;
 extern volatile uint32_t xtau_str_int;
 
@@ -1995,7 +1995,7 @@ void calc_xtau(int32_t* pw1, int32_t* pw2)
  int16_t s_thrd = -((int16_t)d.param.inj_xtau_s_thrd); //kPa/sec
  int16_t f_thrd = -((int16_t)d.param.inj_xtau_f_thrd); //kPa/sec
  static uint32_t mpw[2] = {0};
- static uint32_t M[2] = {0};  //amuunt of fuel in the film
+ static uint32_t M[2] = {0};  //amount of fuel in the film
  static uint16_t xf = 0;      //coefficient of fuel falling into the film, value * 1024
  uint16_t tf = 0;             //fuel evaporation time constant, value in 0.1024ms units
  uint8_t chnum = (0x00!=d.param.lambda_selch) && !CHECKBIT(d.param.inj_lambda_flags, LAMFLG_MIXSEN) ? 2 : 1;
@@ -2049,7 +2049,7 @@ void calc_xtau(int32_t* pw1, int32_t* pw2)
   tf = simple_interpolation_u(d.sens.mapdot, tfd, tfa, f_thrd, dthrd, 1) >> 0;
  }
 
- //obtain value of passed time from interrupt. See adc.c for more information
+ //obtain value of passed time from interrupt. See injector.c for more information
  uint32_t dt;
  _DISABLE_INTERRUPT();
   dt = xtau_str_int;

sources/funconv.c

@@ -668,7 +668,7 @@ static inline void ProcessFallingEdge(uint16_t tmr)
    hall.knkwnd_mode = 0;
   }
 
-  adc_begin_measure(_AB(hall.stroke_period, 1) < 4);//start the process of measuring analog input values
+  adc_begin_measure_map(); //start the process of MAP sampling
  }
 #ifdef DWELL_CONTROL
  else if (!hall.rising_edge_spark)
@@ -846,7 +846,7 @@ ISR(TIMER0_COMPA_vect)
    knock_set_integration_mode(KNOCK_INTMODE_HOLD);
    knock_start_settings_latching();//start the process of downloading the settings into the HIP9011 (and getting ADC result from TPIC8101)
 #ifndef TPIC8101
-   adc_begin_measure_knock(_AB(hall.stroke_period, 1) < 4);
+   adc_begin_measure_knock();
 #endif
    hall.knkwnd_mode = 0;
   }

sources/hall.c

@@ -56,6 +56,12 @@
  #define INJ_OFF 0   //!< Injector is turned off
 #endif
 
+#if defined(XTAU_CORR)
+volatile uint8_t xtau_str_cnt = 0;
+volatile uint32_t xtau_str_int = 0;
+static volatile uint16_t xtau_tcnt = 0;
+#endif
+
 //from ckps.c
 uint16_t ckps_get_stroke_period(void);
 
@@ -420,6 +426,13 @@ void inject_start_inj(uint8_t chan)
  if (!inj.fuelcut || inj.prime_pulse)
   return; //fuel is OFF or prime pulse is active
 
+ //calculate "dltau" for X-tau algorithm. See calc_xtau() function for more information
+#if defined(XTAU_CORR)
+ xtau_str_int+=(TCNT1 - xtau_tcnt);       //measure time between events and add it to the sum
+ xtau_tcnt = TCNT1;
+ ++xtau_str_cnt;                          //update counter of events
+#endif
+
  if (CHECKBIT(inj.squirt_mask, chan))
  {
   if (inj.cfg < INJCFG_2BANK_ALTERN || inj.shrinktime == 2)