Add APPS sensors

Author: ashabelnikov

sources/bc_input.c

@@ -46,7 +46,7 @@
 
 /**Declare blink codes. Indexes in the array must correspond to numbers of bits of corresponding CE errors in ce_errors.h */
 PGM_DECLARE(uint8_t blink_codes[ECUERROR_NUM]) =
- {0x21, 0x13, 0x14, 0x31, 0x32, 0x22, 0x23, 0x24, 0x41, 0x25, 0x26, 0x27, 0x28, 0x51, 0x52, 0, 0x53, 0x54, 0x55, 0x56, 0x33, 0x15, 0x34, 0x16, 0x35};
+ {0x21, 0x13, 0x14, 0x31, 0x32, 0x22, 0x23, 0x24, 0x41, 0x25, 0x26, 0x27, 0x28, 0x51, 0x52, 0, 0x53, 0x54, 0x55, 0x56, 0x33, 0x15, 0x34, 0x16, 0x35, 0x29};
 
 
 void bc_init_ports(void)

sources/ce_errors.c

@@ -214,6 +214,30 @@ void check(ce_sett_t *cesd)
  else
   { ce_clear_error(ECUERROR_TPS_SENSOR_FAIL); }
 
+ //checking APPS1 & APPS2 sensors (DBW)
+#if !defined(SECU3T)
+ if (IOCFG_CHECK(IOP_APPS1))
+ {
+  if (IOCFG_CHECK(IOP_APPS2))
+  { //both APPS are present - OK
+   uint16_t apps1_raw = IOCFG_GETA(IOP_APPS1);
+   uint16_t apps2_raw = IOCFG_GETA(IOP_APPS2);   
+   uint16_t appsdiff = abs((int16_t)apps1_raw - ((int16_t)apps2_raw * 2));
+   if (appsdiff > cesd->appsdiff_thrd)
+    ce_set_error(ECUERROR_APPS);
+   else
+    ce_clear_error(ECUERROR_APPS);
+  }
+  else
+  { ce_set_error(ECUERROR_APPS); } //only 1st APPS
+ }
+ else if (IOCFG_CHECK(IOP_APPS2))
+ {  ce_set_error(ECUERROR_APPS); } //only 2nd APPS
+ else
+ { ce_clear_error(ECUERROR_APPS); } //no APPS at all - no errors
+#endif
+
+
  //checking ADD_I1 sensor
  if ((d.sens.add_i1_raw < cesd->add_i1_v_min) || (d.sens.add_i1_raw > cesd->add_i1_v_max))
   ce_set_error(ECUERROR_ADD_I1_SENSOR);

sources/ce_errors.h

@@ -58,7 +58,8 @@
 #define ECUERROR_INJDUTY_LIMIT         22  //!< Injector's duty limit reached
 #define ECUERROR_EEPROM_LTFT_BROKEN    23  //!< LTFT table is corrupted
 #define ECUERROR_STEPPERIC_FAULT       24  //!< Stepper IC fault
-#define ECUERROR_NUM                   25  //!< number of ECU error codes
+#define ECUERROR_APPS                  25  //!< Gas pedal errors (DBW)
+#define ECUERROR_NUM                   26  //!< number of ECU error codes
 
 /**checks for errors and manages the CE lamp
  * Uses d ECU data structure

sources/ecudata.h

@@ -96,6 +96,8 @@ typedef struct sensors_t
  uint16_t tps;                           //!< Throttle position sensor (0...100%, x64)
 #if !defined(SECU3T)
  uint16_t tps_dbw;                       //!< Throttle position sensor (0...100+%, x64)
+ int16_t  apps1_raw;                     //!< Voltage on the APPS1
+ uint16_t apps1;                         //!< Accelerator pedal position sensor (0...100%, x64)
 #endif
  uint16_t add_i1;                        //!< ADD_I1 input voltage
  uint16_t add_i2;                        //!< ADD_I2 input voltage

sources/ioconfig.h

@@ -462,8 +462,8 @@ uint16_t iocfg_g_add_i4i(uint8_t doa);   //!< set  ADD_I4 input       (inverted)
 #define IOP_ALTRN_I     100     //!< ALTRN_I         (input)
 #define IOP_FPS         101     //!< FPS             (input)
 #define IOP_TPS2        102     //!< TPS2            (input)
-#define IOP_RESERVED56  103     //!< reserved plug   ()
-#define IOP_RESERVED57  104     //!< reserved plug   ()
+#define IOP_APPS1       103     //!< APPS1           (input)
+#define IOP_APPS2       104     //!< APPS2           (input)
 #define IOP_RESERVED58  105     //!< reserved plug   ()
 #define IOP_RESERVED59  106     //!< reserved plug   ()
 #define IOP_RESERVED60  107     //!< reserved plug   ()

sources/magnitude.h

@@ -50,6 +50,9 @@
 /**One discrete of the system timer is 10ms*/
 #define SYSTIM_MULTIPLIER 100
 
+/**APPS multiplier*/
+#define APPS_MULT 64
+
 /* Following macros are necessary when transforming floating point constant-values into integers.
  * Values of phisical magnitudes stored in integers
  */
@@ -100,4 +103,7 @@
 /**VSS distance, value in km*/
 #define VSSDIST_MAG(dst) ROUND32((dst)*125)
 
+/**Transforms floating point value of APPS in % to integer value*/
+#define APPS_MAG(p) ROUND ((p) * APPS_MULT)
+
 #endif //_MAGNITUDE_H_

sources/measure.c

@@ -456,6 +456,19 @@ void meas_average_measured_values(ce_sett_t *cesd)
  else
   d.sens.fps = 0; //input is not selected
 #endif
+
+#ifndef SECU3T
+ if (IOCFG_CHECK(IOP_APPS1))
+ {//APPS1
+  d.sens.apps1_raw = IOCFG_GETA(IOP_APPS1);
+  d.sens.apps1 = tps_adc_to_pc(d.sens.apps1_raw, d.param.apps1_curve_offset, d.param.apps1_curve_gradient);
+  if (d.sens.apps1 > APPS_MAG(100))
+   d.sens.apps1 = APPS_MAG(100);
+ }
+ else
+  d.sens.apps1 = 0; //input is not selected
+#endif
+
 }
 
 //Call this function for making preliminary measurements before starting engine. Call it only after

sources/ringbuff.c

@@ -31,6 +31,9 @@ void init_buffer(struct ringbuff_t* p_rb, uint8_t avnum)
 {
  p_rb->avnum = avnum;
  p_rb->size = 0;
+ p_rb->idx = 0;
+ p_rb->sum = 0;
+ p_rb->buff[0] = 0;
 }
 
 void update_buffer(struct ringbuff_t* p_rb, uint16_t value)

sources/ringbuff.h

@@ -29,7 +29,7 @@
 
 #include <stdint.h>
 
-#define CIRCBUFFMAX    24                       //!< Maximum size of ring buffer in items
+#define CIRCBUFFMAX    32                       //!< Maximum size of ring buffer in items
 
 /**Describes ring buffer for one input*/
 typedef struct ringbuff_t

sources/tables.c

@@ -415,7 +415,7 @@ PGM_FIXED_ADDR_OBJ(fw_data_t fw_data, ".firmware_data") =
     _FNC(iocfg_g_stub), _FNC(iocfg_g_stub), _FNC(iocfg_g_stub), _FNC(iocfg_g_stub),
     _FNC(iocfg_g_stub), _FNC(iocfg_g_stub), _FNC(iocfg_g_stub), _FNC(iocfg_g_stub),
     _FNC(iocfg_g_stub), _FNC(iocfg_g_stub), _FNC(iocfg_g_stub), _FNC(iocfg_g_stub),
-    _FNC(iocfg_g_stub), _FNC(iocfg_g_stub), _FNC(iocfg_s_stub), _FNC(iocfg_s_stub),
+    _FNC(iocfg_g_stub), _FNC(iocfg_g_stub), _FNC(iocfg_g_stub), _FNC(iocfg_g_stub),
     _FNC(iocfg_s_stub), _FNC(iocfg_s_stub), _FNC(iocfg_s_stub),
    },
 
@@ -787,6 +787,9 @@ PGM_FIXED_ADDR_OBJ(fw_data_t fw_data, ".firmware_data") =
   .ltft_learn_load =             {PRESSURE_MAGNITUDE(10.0), PRESSURE_MAGNITUDE(100.0)},
   .ltft_dead_band =              {EGO_CORR(0.6), EGO_CORR(0.6)}, //+-0.6%
 
+  .apps1_curve_offset =          VOLTAGE_MAGNITUDE(0.720),
+  .apps1_curve_gradient =        542, //26.45%/V
+
   .reserved =                    {0},
   .crc =                         0
  },
@@ -932,7 +935,9 @@ PGM_FIXED_ADDR_OBJ(fw_data_t fw_data, ".firmware_data") =
 
    .stepperic_flg = 1,  //process stepper IC fault
 
-   .tpsdiff_thrd = VOLTAGE_MAGNITUDE(0.1),
+   .tpsdiff_thrd = VOLTAGE_MAGNITUDE(0.20),
+   .appsdiff_thrd = VOLTAGE_MAGNITUDE(0.30),
+
    .reserved = {0}
   },
 

sources/tables.h

@@ -407,8 +407,9 @@ typedef struct ce_sett_t
  uint8_t stepperic_flg;   //process stepper IC fault (0 - ignore, 1 - process)
 
  uint16_t tpsdiff_thrd;
+ uint16_t appsdiff_thrd;
 
- uint8_t reserved[29];
+ uint8_t reserved[27];
 }ce_sett_t;
 
 /**Describes separate tables stored in the firmware
@@ -1027,11 +1028,14 @@ typedef struct params_t
   uint16_t ltft_learn_load[2]; //!< lower and upper thresholds of load for learning, value * 64
   uint8_t ltft_dead_band[2];   //!< EGO correction thresholds (- and +) below which LTFT will not work, value * 512
 
+  int16_t  apps1_curve_offset;          //!< offset of curve in volts
+  int16_t  apps1_curve_gradient;        //!< gradient of curve in Percentage/V
+
   /**Following reserved bytes required for keeping binary compatibility between
    * different versions of firmware. Useful when you add/remove members to/from
    * this structure. */
 
-  uint8_t  reserved[91];
+  uint8_t  reserved[87];
 
   /**CRC of this structure (for checking correctness of data after loading from EEPROM) */
   uint16_t crc;

sources/uart.c

@@ -470,10 +470,14 @@ void uart_send_packet(uint8_t send_mode)
    build_i16h(d.param.inj_cyl_disp);        //used for calculations on SECU-3 Manager side
    build_i32h(d.param.mafload_const);
    build_i16h(d.sens.tps_raw);              //for TPS learning
+   //
    build_i16h(d.param.gps_curve_offset);   //GPS
    build_i16h(d.param.gps_curve_gradient); //GPS
    build_i16h(d.param.fps_curve_offset);   //FPS
    build_i16h(d.param.fps_curve_gradient); //FPS
+   build_i16h(d.param.apps1_curve_offset);   //APPS1
+   build_i16h(d.param.apps1_curve_gradient); //APPS1
+   build_i16h(d.sens.apps1_raw);            //Redundant: for APPS1 learning
    break;
 
   case STARTR_PAR:
@@ -848,6 +852,11 @@ void uart_send_packet(uint8_t send_mode)
    build_i16h(d.sens.fps);                 //Fuel Pressure Sensor
 #else
    build_i16h(0);
+#endif
+#ifndef SECU3T
+   build_i16h(d.sens.apps1);               //APPS1
+#else
+   build_i16h(0);
 #endif
    break;
 
@@ -2042,6 +2051,8 @@ uint8_t uart_recept_packet(void)
    d.param.gps_curve_gradient = recept_i16h(); //GPS
    d.param.fps_curve_offset = recept_i16h();   //FPS
    d.param.fps_curve_gradient = recept_i16h(); //FPS
+   d.param.apps1_curve_offset = recept_i16h();   //APPS1
+   d.param.apps1_curve_gradient = recept_i16h(); //APPS1
    break;
 
   case STARTR_PAR:

sources/ufcodes.h

@@ -36,7 +36,7 @@
 #define   CARBUR_PAR   'k'   //!< carburetor's parameters
 #define   IDLREG_PAR   'l'   //!< idling regulator parameters
 #define   ANGLES_PAR   'm'   //!< advance angle (ign. timing) parameters
-#define   FUNSET_PAR   'n'   //!< parametersrelated to set of functions (lookup tables)
+#define   FUNSET_PAR   'n'   //!< parameters related to set of functions (lookup tables)
 #define   STARTR_PAR   'o'   //!< engine start parameters
 
 #define   FNNAME_DAT   'p'   //!< used for transfering of names of set of functions (lookup tables)