2016-06-24 16:02:45 -07:00
|
|
|
/*
|
|
|
|
* @file CJ125.cpp
|
|
|
|
*
|
|
|
|
* @date: Jun 24, 2016
|
2018-01-20 17:55:31 -08:00
|
|
|
* @author Andrey Belomutskiy, (c) 2012-2018
|
2016-06-24 16:02:45 -07:00
|
|
|
*
|
|
|
|
*/
|
|
|
|
|
2016-07-17 00:01:48 -07:00
|
|
|
#include "engine.h"
|
2019-04-01 14:04:49 -07:00
|
|
|
#include "cj125.h"
|
2016-07-17 00:01:48 -07:00
|
|
|
#include "pwm_generator.h"
|
2018-01-29 11:26:42 -08:00
|
|
|
#include "rpm_calculator.h"
|
2016-07-17 00:01:48 -07:00
|
|
|
|
2019-04-12 17:52:51 -07:00
|
|
|
#if EFI_CJ125 && HAL_USE_SPI
|
2016-07-25 20:03:45 -07:00
|
|
|
|
2018-01-29 11:26:42 -08:00
|
|
|
#include "adc_inputs.h"
|
|
|
|
|
2020-01-06 05:44:23 -08:00
|
|
|
#if EFI_PROD_CODE
|
|
|
|
#include "mpu_util.h"
|
|
|
|
#endif
|
|
|
|
|
2018-09-25 12:45:17 -07:00
|
|
|
//#define CJ125_DEBUG
|
2018-01-29 11:26:42 -08:00
|
|
|
//#define CJ125_DEBUG_SPI
|
2016-08-01 19:04:24 -07:00
|
|
|
|
2016-07-17 00:01:48 -07:00
|
|
|
EXTERN_ENGINE;
|
|
|
|
|
2019-01-03 04:22:21 -08:00
|
|
|
#include "hardware.h"
|
|
|
|
#include "backup_ram.h"
|
|
|
|
#include "pin_repository.h"
|
|
|
|
|
2016-07-26 19:01:50 -07:00
|
|
|
static Logging *logger;
|
2018-01-29 11:26:42 -08:00
|
|
|
static unsigned char tx_buff[2];
|
2016-07-30 19:02:52 -07:00
|
|
|
static unsigned char rx_buff[1];
|
|
|
|
|
2019-01-03 05:26:42 -08:00
|
|
|
static CJ125 globalInstance;
|
|
|
|
|
2019-07-13 07:32:36 -07:00
|
|
|
static THD_WORKING_AREA(cj125ThreadStack, UTILITY_THREAD_STACK_SIZE);
|
2016-07-25 19:01:42 -07:00
|
|
|
|
2016-07-17 00:01:48 -07:00
|
|
|
static SPIDriver *driver;
|
|
|
|
|
2019-04-14 15:09:58 -07:00
|
|
|
static SPIConfig cj125spicfg = {
|
|
|
|
.circular = false,
|
|
|
|
.end_cb = NULL,
|
|
|
|
.ssport = NULL,
|
|
|
|
.sspad = 0,
|
2020-01-06 05:44:23 -08:00
|
|
|
.cr1 =
|
|
|
|
SPI_CR1_MSTR | SPI_CR1_CPHA |
|
|
|
|
SPI_CR1_8BIT_MODE,
|
|
|
|
.cr2 =
|
|
|
|
SPI_CR2_8BIT_MODE
|
|
|
|
};
|
2018-01-29 11:26:42 -08:00
|
|
|
|
|
|
|
static volatile int lastSlowAdcCounter = 0;
|
|
|
|
|
|
|
|
// LSU conversion tables. See cj125_sensor_type_e
|
|
|
|
// For LSU4.2, See http://www.bosch-motorsport.com/media/catalog_resources/Lambda_Sensor_LSU_42_Datasheet_51_en_2779111435pdf.pdf
|
|
|
|
// See LSU4.9, See http://www.bosch-motorsport.com/media/catalog_resources/Lambda_Sensor_LSU_49_Datasheet_51_en_2779147659pdf.pdf
|
2019-07-09 11:16:36 -07:00
|
|
|
|
2018-01-29 11:26:42 -08:00
|
|
|
// Pump current, mA
|
2019-07-09 11:16:36 -07:00
|
|
|
static constexpr float pumpCurrentLsu42[] = {
|
2018-01-29 11:26:42 -08:00
|
|
|
// LSU 4.2
|
2019-07-09 11:16:36 -07:00
|
|
|
-1.85f, -1.08f, -0.76f, -0.47f, 0.0f, 0.34f, 0.68f, 0.95f, 1.4f
|
|
|
|
};
|
|
|
|
|
|
|
|
static constexpr float pumpCurrentLsu49[] = {
|
2018-01-29 11:26:42 -08:00
|
|
|
// LSU 4.9
|
2019-07-09 11:16:36 -07:00
|
|
|
-2.0f, -1.602f, -1.243f, -0.927f, -0.8f, -0.652f, -0.405f, -0.183f, -0.106f, -0.04f, 0, 0.015f, 0.097f, 0.193f, 0.250f, 0.329f, 0.671f, 0.938f, 1.150f, 1.385f, 1.700f, 2.000f, 2.150f, 2.250f
|
2018-01-29 11:26:42 -08:00
|
|
|
};
|
2019-07-09 11:16:36 -07:00
|
|
|
|
|
|
|
// Corresponding lambda values for the above pump current
|
|
|
|
static constexpr float lambdaLsu42[] = {
|
2018-01-29 11:26:42 -08:00
|
|
|
// LSU 4.2
|
2019-07-09 11:16:36 -07:00
|
|
|
0.7f, 0.8f, 0.85f, 0.9f, 1.009f, 1.18f, 1.43f, 1.7f, 2.42f
|
|
|
|
};
|
|
|
|
|
|
|
|
static constexpr float lambdaLsu49[] = {
|
2018-01-29 11:26:42 -08:00
|
|
|
// LSU 4.9
|
2019-07-09 11:16:36 -07:00
|
|
|
0.65f, 0.7f, 0.75f, 0.8f, 0.822f, 0.85f, 0.9f, 0.95f, 0.97f, 0.99f, 1.003f, 1.01f, 1.05f, 1.1f, 1.132f, 1.179f, 1.429f, 1.701f, 1.990f, 2.434f, 3.413f, 5.391f, 7.506f, 10.119f
|
2018-01-29 11:26:42 -08:00
|
|
|
};
|
|
|
|
|
2019-01-03 04:22:21 -08:00
|
|
|
|
2018-01-29 11:26:42 -08:00
|
|
|
static int cjReadRegister(unsigned char regAddr) {
|
2019-04-12 17:52:51 -07:00
|
|
|
#if ! EFI_UNIT_TEST
|
2018-01-29 11:26:42 -08:00
|
|
|
spiSelect(driver);
|
|
|
|
tx_buff[0] = regAddr;
|
|
|
|
spiSend(driver, 1, tx_buff);
|
|
|
|
// safety?
|
|
|
|
chThdSleepMilliseconds(10);
|
|
|
|
|
|
|
|
rx_buff[0] = 0;
|
|
|
|
spiReceive(driver, 1, rx_buff);
|
|
|
|
spiUnselect(driver);
|
2016-07-25 19:01:42 -07:00
|
|
|
|
2018-01-29 11:26:42 -08:00
|
|
|
#ifdef CJ125_DEBUG_SPI
|
|
|
|
scheduleMsg(logger, "cjReadRegister: addr=%d answer=%d", regAddr, rx_buff[0]);
|
2019-01-03 04:22:21 -08:00
|
|
|
#endif /* CJ125_DEBUG_SPI */
|
2018-01-29 11:26:42 -08:00
|
|
|
return rx_buff[0];
|
2019-01-03 04:22:21 -08:00
|
|
|
#else /* EFI_UNIT_TEST */
|
|
|
|
return 0;
|
|
|
|
#endif /* EFI_UNIT_TEST */
|
2018-01-29 11:26:42 -08:00
|
|
|
}
|
2016-07-25 19:01:42 -07:00
|
|
|
|
2018-01-29 11:26:42 -08:00
|
|
|
static void cjWriteRegister(unsigned char regAddr, unsigned char regValue) {
|
2019-03-25 17:30:36 -07:00
|
|
|
tx_buff[0] = regAddr;
|
|
|
|
tx_buff[1] = regValue;
|
2018-01-29 11:26:42 -08:00
|
|
|
#ifdef CJ125_DEBUG_SPI
|
|
|
|
scheduleMsg(logger, "cjWriteRegister: addr=%d value=%d", regAddr, regValue);
|
2019-01-03 04:22:21 -08:00
|
|
|
#endif /* CJ125_DEBUG_SPI */
|
2019-03-25 17:30:36 -07:00
|
|
|
// todo: extract 'sendSync' method?
|
2018-01-29 11:26:42 -08:00
|
|
|
spiSelect(driver);
|
|
|
|
spiSend(driver, 2, tx_buff);
|
|
|
|
spiUnselect(driver);
|
|
|
|
}
|
2016-07-25 19:01:42 -07:00
|
|
|
|
2018-01-29 11:26:42 -08:00
|
|
|
static float getUr() {
|
2019-01-03 04:22:21 -08:00
|
|
|
#if ! EFI_UNIT_TEST
|
2018-01-29 11:26:42 -08:00
|
|
|
if (CONFIG(cj125ur) != EFI_ADC_NONE) {
|
2018-11-03 08:44:57 -07:00
|
|
|
#if EFI_PROD_CODE
|
2019-09-03 15:44:05 -07:00
|
|
|
if (!engineConfiguration->cj125isUrDivided) {
|
2018-01-29 11:26:42 -08:00
|
|
|
// in case of directly connected Ur signal from CJ125 to the ADC pin of MCU
|
2019-09-22 07:02:07 -07:00
|
|
|
return getVoltage("cj125ur", CONFIG(cj125ur) PASS_ENGINE_PARAMETER_SUFFIX);
|
2019-09-03 15:44:05 -07:00
|
|
|
} else {
|
2018-01-29 11:26:42 -08:00
|
|
|
// if a standard voltage division scheme with OpAmp is used
|
2019-09-22 06:56:06 -07:00
|
|
|
return getVoltageDivided("cj125ur", CONFIG(cj125ur) PASS_ENGINE_PARAMETER_SUFFIX);
|
2019-09-03 15:44:05 -07:00
|
|
|
}
|
2018-11-03 08:44:57 -07:00
|
|
|
#endif /* EFI_PROD_CODE */
|
2018-01-29 11:26:42 -08:00
|
|
|
}
|
|
|
|
return 0.0f;
|
2019-01-03 04:22:21 -08:00
|
|
|
#else /* EFI_UNIT_TEST */
|
|
|
|
return 0;
|
|
|
|
#endif /* EFI_UNIT_TEST */
|
2016-07-25 19:01:42 -07:00
|
|
|
}
|
|
|
|
|
2018-01-29 11:26:42 -08:00
|
|
|
static float getUa() {
|
2019-01-03 04:22:21 -08:00
|
|
|
#if ! EFI_UNIT_TEST
|
2018-06-17 12:07:42 -07:00
|
|
|
if (CONFIG(cj125ua) != EFI_ADC_NONE) {
|
2018-11-03 08:44:57 -07:00
|
|
|
#if EFI_PROD_CODE
|
2018-06-17 12:07:42 -07:00
|
|
|
if (engineConfiguration->cj125isUaDivided) {
|
2019-09-22 06:56:06 -07:00
|
|
|
return getVoltageDivided("cj125ua", CONFIG(cj125ua) PASS_ENGINE_PARAMETER_SUFFIX);
|
2018-06-17 12:07:42 -07:00
|
|
|
} else {
|
|
|
|
return getVoltage("cj125ua", CONFIG(cj125ua));
|
|
|
|
}
|
2018-11-03 08:44:57 -07:00
|
|
|
#endif /* EFI_PROD_CODE */
|
2018-06-17 12:07:42 -07:00
|
|
|
}
|
|
|
|
|
2018-01-29 11:26:42 -08:00
|
|
|
return 0.0f;
|
2019-01-03 04:22:21 -08:00
|
|
|
#else /* EFI_UNIT_TEST */
|
|
|
|
return 0;
|
|
|
|
#endif /* EFI_UNIT_TEST */
|
2018-01-29 11:26:42 -08:00
|
|
|
}
|
2016-07-25 19:01:42 -07:00
|
|
|
|
2018-01-29 11:26:42 -08:00
|
|
|
static float getVoltageFrom16bit(uint32_t stored) {
|
|
|
|
return ((float)stored) / CJ125_VOLTAGE_TO_16BIT_FACTOR;
|
|
|
|
}
|
2016-07-30 19:02:52 -07:00
|
|
|
|
2018-01-29 11:26:42 -08:00
|
|
|
static uint32_t get16bitFromVoltage(float v) {
|
|
|
|
return (uint32_t)(v * CJ125_VOLTAGE_TO_16BIT_FACTOR);
|
|
|
|
}
|
2016-07-30 19:02:52 -07:00
|
|
|
|
2018-01-29 11:26:42 -08:00
|
|
|
static void cjPrintData(void) {
|
|
|
|
#ifdef CJ125_DEBUG
|
2019-02-01 22:45:26 -08:00
|
|
|
scheduleMsg(logger, "cj125: state=%d diag=0x%x (vUa=%.3f vUr=%.3f) (vUaCal=%.3f vUrCal=%.3f)", state, globalInstance.diag, vUa, vUr, globalInstance.vUaCal, globalInstance.vUrCal);
|
2018-01-29 11:26:42 -08:00
|
|
|
#endif
|
|
|
|
}
|
2016-07-30 19:02:52 -07:00
|
|
|
|
2018-01-29 11:26:42 -08:00
|
|
|
static void cjPrintErrorCode(cj125_error_e errCode) {
|
|
|
|
const char *errString = nullptr;
|
|
|
|
switch (errCode) {
|
|
|
|
case CJ125_ERROR_HEATER_MALFUNCTION:
|
|
|
|
errString = "Heater malfunction (Too long preheat)";
|
|
|
|
break;
|
|
|
|
case CJ125_ERROR_OVERHEAT:
|
|
|
|
errString = "Sensor overheating";
|
|
|
|
break;
|
2019-12-01 22:52:54 -08:00
|
|
|
case CJ125_NO_ERROR:
|
2018-01-29 11:26:42 -08:00
|
|
|
errString = "N/A";
|
|
|
|
break;
|
2018-07-22 11:17:51 -07:00
|
|
|
case CJ125_ERROR_WRONG_IDENT:
|
|
|
|
errString = "W_IDENT";
|
|
|
|
break;
|
|
|
|
case CJ125_ERROR_WRONG_INIT:
|
|
|
|
errString = "W_INIT";
|
|
|
|
break;
|
2019-12-02 06:59:53 -08:00
|
|
|
case CJ125_ERROR_DISABLED:
|
|
|
|
errString = "DISABLED";
|
|
|
|
break;
|
2018-01-29 11:26:42 -08:00
|
|
|
}
|
|
|
|
scheduleMsg(logger, "cj125 ERROR: %s.", errString);
|
|
|
|
}
|
2016-07-30 19:02:52 -07:00
|
|
|
|
2019-02-01 22:06:45 -08:00
|
|
|
class RealSpi : public Cj125SpiStream {
|
|
|
|
public:
|
|
|
|
uint8_t ReadRegister(uint8_t reg) override {
|
|
|
|
return cjReadRegister(reg);
|
2018-01-29 11:26:42 -08:00
|
|
|
}
|
2019-02-01 22:06:45 -08:00
|
|
|
|
|
|
|
void WriteRegister(uint8_t regAddr, uint8_t regValue) {
|
|
|
|
cjWriteRegister(regAddr, regValue);
|
2018-01-29 11:26:42 -08:00
|
|
|
}
|
2019-02-01 22:06:45 -08:00
|
|
|
};
|
|
|
|
|
|
|
|
static RealSpi spi;
|
2016-07-30 19:02:52 -07:00
|
|
|
|
2019-01-03 04:22:21 -08:00
|
|
|
static void cjUpdateAnalogValues() {
|
|
|
|
#if EFI_PROD_CODE
|
|
|
|
// todo: some solution for testing
|
2018-01-29 11:26:42 -08:00
|
|
|
waitForSlowAdc(lastSlowAdcCounter);
|
2019-01-03 04:22:21 -08:00
|
|
|
#endif
|
2019-02-01 22:45:26 -08:00
|
|
|
globalInstance.vUr = getUr();
|
|
|
|
globalInstance.vUa = getUa();
|
2019-01-03 04:22:21 -08:00
|
|
|
#if EFI_PROD_CODE
|
|
|
|
// todo: some solution for testing
|
2018-01-29 11:26:42 -08:00
|
|
|
lastSlowAdcCounter = getSlowAdcCounter();
|
2019-01-03 04:22:21 -08:00
|
|
|
#endif
|
2016-07-25 19:01:42 -07:00
|
|
|
}
|
2016-06-24 16:02:45 -07:00
|
|
|
|
2018-01-29 11:26:42 -08:00
|
|
|
static void cjCalibrate(void) {
|
2019-02-01 22:06:45 -08:00
|
|
|
globalInstance.cjIdentify();
|
2016-07-17 00:01:48 -07:00
|
|
|
|
2018-01-29 11:26:42 -08:00
|
|
|
scheduleMsg(logger, "cj125: Starting calibration...");
|
2019-02-01 22:45:26 -08:00
|
|
|
globalInstance.cjSetMode(CJ125_MODE_CALIBRATION);
|
2018-01-29 11:26:42 -08:00
|
|
|
int init1 = cjReadRegister(INIT_REG1_RD);
|
|
|
|
// check if our command has been accepted
|
|
|
|
if (init1 != CJ125_INIT1_CALBRT) {
|
|
|
|
scheduleMsg(logger, "cj125: Calibration error (init1=0x%02x)! Failed!", init1);
|
2019-02-01 22:45:26 -08:00
|
|
|
globalInstance.cjSetMode(CJ125_MODE_NORMAL_17);
|
2016-07-17 00:01:48 -07:00
|
|
|
return;
|
2018-01-29 11:26:42 -08:00
|
|
|
}
|
2019-01-03 04:22:21 -08:00
|
|
|
#if EFI_PROD_CODE
|
|
|
|
// todo: some testing solution
|
2018-01-29 11:26:42 -08:00
|
|
|
// wait for the start of the calibration
|
|
|
|
chThdSleepMilliseconds(CJ125_CALIBRATION_DELAY);
|
2019-01-03 04:22:21 -08:00
|
|
|
#endif
|
2019-02-01 22:45:26 -08:00
|
|
|
globalInstance.vUaCal = 0.0f;
|
|
|
|
globalInstance.vUrCal = 0.0f;
|
2018-01-29 11:26:42 -08:00
|
|
|
// wait for some more ADC samples
|
|
|
|
for (int i = 0; i < CJ125_CALIBRATE_NUM_SAMPLES; i++) {
|
|
|
|
cjUpdateAnalogValues();
|
|
|
|
cjPrintData();
|
2018-06-23 14:10:59 -07:00
|
|
|
|
2019-04-12 17:52:51 -07:00
|
|
|
#if EFI_TUNER_STUDIO
|
2018-06-23 14:10:59 -07:00
|
|
|
if (engineConfiguration->debugMode == DBG_CJ125) {
|
|
|
|
cjPostState(&tsOutputChannels);
|
|
|
|
}
|
2019-01-03 04:22:21 -08:00
|
|
|
#endif /* EFI_TUNER_STUDIO */
|
2018-06-23 14:10:59 -07:00
|
|
|
|
2019-02-01 22:45:26 -08:00
|
|
|
globalInstance.vUaCal += globalInstance.vUa;
|
|
|
|
globalInstance.vUrCal += globalInstance.vUr;
|
2018-01-29 11:26:42 -08:00
|
|
|
}
|
|
|
|
// find average
|
2019-02-01 22:45:26 -08:00
|
|
|
globalInstance.vUaCal /= (float)CJ125_CALIBRATE_NUM_SAMPLES;
|
|
|
|
globalInstance.vUrCal /= (float)CJ125_CALIBRATE_NUM_SAMPLES;
|
2018-01-29 11:26:42 -08:00
|
|
|
// restore normal mode
|
2019-02-01 22:45:26 -08:00
|
|
|
globalInstance.cjSetMode(CJ125_MODE_NORMAL_17);
|
2019-01-03 04:22:21 -08:00
|
|
|
#if EFI_PROD_CODE
|
|
|
|
// todo: testing solution
|
2018-01-29 11:26:42 -08:00
|
|
|
chThdSleepMilliseconds(CJ125_CALIBRATION_DELAY);
|
2019-01-03 04:22:21 -08:00
|
|
|
#endif
|
2018-01-29 11:26:42 -08:00
|
|
|
// check if everything is ok
|
2019-02-01 22:06:45 -08:00
|
|
|
globalInstance.diag = cjReadRegister(DIAG_REG_RD);
|
2018-01-29 11:26:42 -08:00
|
|
|
cjUpdateAnalogValues();
|
|
|
|
cjPrintData();
|
|
|
|
|
|
|
|
// store new calibration data
|
2019-02-01 22:45:26 -08:00
|
|
|
uint32_t storedLambda = get16bitFromVoltage(globalInstance.vUaCal);
|
|
|
|
uint32_t storedHeater = get16bitFromVoltage(globalInstance.vUrCal);
|
2018-01-29 11:26:42 -08:00
|
|
|
scheduleMsg(logger, "cj125: Done! Saving calibration data (%d %d).", storedLambda, storedHeater);
|
2018-11-03 10:17:58 -07:00
|
|
|
#if EFI_PROD_CODE
|
2018-01-29 11:26:42 -08:00
|
|
|
backupRamSave(BACKUP_CJ125_CALIBRATION_LAMBDA, storedLambda);
|
|
|
|
backupRamSave(BACKUP_CJ125_CALIBRATION_HEATER, storedHeater);
|
2019-01-03 04:22:21 -08:00
|
|
|
#endif /* EFI_PROD_CODE */
|
2018-01-29 11:26:42 -08:00
|
|
|
|
2019-01-03 05:26:42 -08:00
|
|
|
globalInstance.state = CJ125_IDLE;
|
2018-01-29 11:26:42 -08:00
|
|
|
}
|
|
|
|
|
2019-01-03 04:22:21 -08:00
|
|
|
static void cjStart(DECLARE_ENGINE_PARAMETER_SIGNATURE) {
|
2019-12-11 14:48:55 -08:00
|
|
|
if (!CONFIG(isCJ125Enabled)) {
|
2018-01-29 11:26:42 -08:00
|
|
|
scheduleMsg(logger, "cj125 is disabled.");
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2019-02-01 22:06:45 -08:00
|
|
|
globalInstance.cjIdentify();
|
2018-01-29 11:26:42 -08:00
|
|
|
|
|
|
|
// Load calibration values
|
2018-11-03 10:45:36 -07:00
|
|
|
#if EFI_PROD_CODE
|
2018-01-29 11:26:42 -08:00
|
|
|
uint32_t storedLambda = backupRamLoad(BACKUP_CJ125_CALIBRATION_LAMBDA);
|
|
|
|
uint32_t storedHeater = backupRamLoad(BACKUP_CJ125_CALIBRATION_HEATER);
|
2018-11-03 10:45:36 -07:00
|
|
|
#else
|
|
|
|
uint32_t storedLambda = 0;
|
|
|
|
uint32_t storedHeater = 0;
|
|
|
|
#endif
|
2018-01-29 11:26:42 -08:00
|
|
|
// if no calibration, try to calibrate now and store new values
|
|
|
|
if (storedLambda == 0 || storedHeater == 0) {
|
|
|
|
cjCalibrate();
|
|
|
|
} else {
|
|
|
|
scheduleMsg(logger, "cj125: Loading stored calibration data (%d %d)", storedLambda, storedHeater);
|
2019-02-01 22:45:26 -08:00
|
|
|
globalInstance.vUaCal = getVoltageFrom16bit(storedLambda);
|
|
|
|
globalInstance.vUrCal = getVoltageFrom16bit(storedHeater);
|
2018-01-29 11:26:42 -08:00
|
|
|
// Start normal measurement mode
|
2019-02-01 22:45:26 -08:00
|
|
|
globalInstance.cjSetMode(CJ125_MODE_NORMAL_17);
|
2018-01-29 11:26:42 -08:00
|
|
|
}
|
|
|
|
cjPrintData();
|
|
|
|
|
2019-01-03 04:22:21 -08:00
|
|
|
#if EFI_PROD_CODE
|
|
|
|
// todo: testig solution
|
2018-01-29 11:26:42 -08:00
|
|
|
lastSlowAdcCounter = getSlowAdcCounter();
|
2019-01-03 04:22:21 -08:00
|
|
|
#endif
|
2018-01-29 11:26:42 -08:00
|
|
|
}
|
|
|
|
|
2019-02-01 20:16:34 -08:00
|
|
|
void CJ125::setError(cj125_error_e errCode DECLARE_ENGINE_PARAMETER_SUFFIX) {
|
2018-01-29 11:26:42 -08:00
|
|
|
errorCode = errCode;
|
|
|
|
state = CJ125_ERROR;
|
|
|
|
cjPrintErrorCode(errorCode);
|
|
|
|
// This is for safety:
|
|
|
|
scheduleMsg(logger, "cj125: Controller Shutdown!");
|
2019-02-01 20:16:34 -08:00
|
|
|
SetHeater(0 PASS_ENGINE_PARAMETER_SUFFIX);
|
2018-01-29 11:26:42 -08:00
|
|
|
// Software-reset of CJ125
|
|
|
|
cjWriteRegister(INIT_REG2_WR, CJ125_INIT2_RESET);
|
|
|
|
}
|
|
|
|
|
2018-06-17 12:07:42 -07:00
|
|
|
// engineConfiguration->spi2SckMode = PAL_STM32_OTYPE_OPENDRAIN; // 4
|
|
|
|
// engineConfiguration->spi2MosiMode = PAL_STM32_OTYPE_OPENDRAIN; // 4
|
|
|
|
// engineConfiguration->spi2MisoMode = PAL_STM32_PUDR_PULLUP; // 32
|
2019-12-11 14:48:55 -08:00
|
|
|
// CONFIG(cj125CsPin) = GPIOA_15;
|
2018-06-17 12:07:42 -07:00
|
|
|
// engineConfiguration->cj125CsPinMode = OM_OPENDRAIN;
|
|
|
|
|
2019-01-03 04:22:21 -08:00
|
|
|
void cj125defaultPinout(DECLARE_ENGINE_PARAMETER_SIGNATURE) {
|
2018-06-17 16:14:46 -07:00
|
|
|
engineConfiguration->cj125ua = EFI_ADC_13; // PC3
|
|
|
|
engineConfiguration->cj125ur = EFI_ADC_4; // PA4
|
2019-12-11 14:48:55 -08:00
|
|
|
CONFIG(wboHeaterPin) = GPIOC_13;
|
2018-06-17 12:07:42 -07:00
|
|
|
|
2019-12-11 14:48:55 -08:00
|
|
|
CONFIG(isCJ125Enabled) = false;
|
2018-06-17 12:07:42 -07:00
|
|
|
|
2019-12-11 14:48:55 -08:00
|
|
|
CONFIG(spi2mosiPin) = GPIOB_15;
|
|
|
|
CONFIG(spi2misoPin) = GPIOB_14;
|
|
|
|
CONFIG(spi2sckPin) = GPIOB_13;
|
2018-06-17 12:07:42 -07:00
|
|
|
|
2019-12-11 14:48:55 -08:00
|
|
|
CONFIG(cj125CsPin) = GPIOB_0;
|
|
|
|
CONFIG(isCJ125Enabled) = true;
|
|
|
|
CONFIG(is_enabled_spi_2) = true;
|
2018-06-17 12:07:42 -07:00
|
|
|
}
|
|
|
|
|
2019-01-03 04:22:21 -08:00
|
|
|
static void cjStartSpi(DECLARE_ENGINE_PARAMETER_SIGNATURE) {
|
2019-12-11 14:48:55 -08:00
|
|
|
globalInstance.cj125Cs.initPin("cj125 CS", CONFIG(cj125CsPin),
|
2016-07-17 00:01:48 -07:00
|
|
|
&engineConfiguration->cj125CsPinMode);
|
2019-01-11 05:33:34 -08:00
|
|
|
// Idle CS pin - SPI CS is high when idle
|
2019-02-01 20:48:11 -08:00
|
|
|
globalInstance.cj125Cs.setValue(true);
|
2016-07-17 00:01:48 -07:00
|
|
|
|
2019-03-25 19:41:31 -07:00
|
|
|
cj125spicfg.cr1 += getSpiPrescaler(_150KHz, engineConfiguration->cj125SpiDevice);
|
|
|
|
|
2019-12-11 14:48:55 -08:00
|
|
|
cj125spicfg.ssport = getHwPort("cj125", CONFIG(cj125CsPin));
|
|
|
|
cj125spicfg.sspad = getHwPin("cj125", CONFIG(cj125CsPin));
|
2018-11-03 08:44:57 -07:00
|
|
|
driver = getSpiDevice(engineConfiguration->cj125SpiDevice);
|
2019-03-26 06:38:23 -07:00
|
|
|
if (driver == NULL) {
|
|
|
|
// error already reported
|
|
|
|
return;
|
|
|
|
}
|
2018-01-29 11:26:42 -08:00
|
|
|
scheduleMsg(logger, "cj125: Starting SPI driver");
|
|
|
|
spiStart(driver, &cj125spicfg);
|
|
|
|
}
|
2016-07-17 00:01:48 -07:00
|
|
|
|
2019-01-03 04:22:21 -08:00
|
|
|
/**
|
|
|
|
* @return true if currently in IDLE or ERROR state
|
|
|
|
*/
|
2019-02-01 20:16:34 -08:00
|
|
|
static bool cj125periodic(CJ125 *instance DECLARE_ENGINE_PARAMETER_SUFFIX) {
|
2019-01-03 04:22:21 -08:00
|
|
|
{
|
|
|
|
efitick_t nowNt = getTimeNowNt();
|
2018-01-29 11:26:42 -08:00
|
|
|
bool isStopped = engine->rpmCalculator.isStopped(PASS_ENGINE_PARAMETER_SIGNATURE);
|
|
|
|
|
|
|
|
cjUpdateAnalogValues();
|
|
|
|
|
|
|
|
// If the controller is disabled
|
2019-01-03 05:26:42 -08:00
|
|
|
if (instance->state == CJ125_IDLE || instance->state == CJ125_ERROR) {
|
2019-01-03 04:22:21 -08:00
|
|
|
return true;
|
2018-01-29 11:26:42 -08:00
|
|
|
}
|
|
|
|
|
2019-01-03 05:26:42 -08:00
|
|
|
if (instance->state == CJ125_CALIBRATION) {
|
2018-01-29 11:26:42 -08:00
|
|
|
cjCalibrate();
|
|
|
|
// Start normal operation
|
2019-01-03 05:26:42 -08:00
|
|
|
instance->state = CJ125_INIT;
|
2019-02-01 22:45:26 -08:00
|
|
|
globalInstance.cjSetMode(CJ125_MODE_NORMAL_17);
|
2018-01-29 11:26:42 -08:00
|
|
|
}
|
|
|
|
|
2019-02-01 22:06:45 -08:00
|
|
|
globalInstance.diag = cjReadRegister(DIAG_REG_RD);
|
2018-01-29 11:26:42 -08:00
|
|
|
|
|
|
|
// check heater state
|
2019-02-01 22:45:26 -08:00
|
|
|
if (globalInstance.vUr > CJ125_UR_PREHEAT_THR || instance->heaterDuty < CJ125_PREHEAT_MIN_DUTY) {
|
2018-01-29 11:26:42 -08:00
|
|
|
// Check if RPM>0 and it's time to start pre-heating
|
2019-01-03 05:26:42 -08:00
|
|
|
if (instance->state == CJ125_INIT && !isStopped) {
|
2018-01-29 11:26:42 -08:00
|
|
|
// start preheating
|
2019-01-03 05:26:42 -08:00
|
|
|
instance->state = CJ125_PREHEAT;
|
2019-02-01 20:16:34 -08:00
|
|
|
instance->startHeatingNt = instance->prevNt = getTimeNowNt();
|
2019-02-01 22:45:26 -08:00
|
|
|
globalInstance.cjSetMode(CJ125_MODE_NORMAL_17);
|
2018-01-29 11:26:42 -08:00
|
|
|
}
|
2019-02-01 22:45:26 -08:00
|
|
|
} else if (instance->vUr > CJ125_UR_GOOD_THR) {
|
2019-01-03 05:26:42 -08:00
|
|
|
instance->state = CJ125_HEAT_UP;
|
2019-02-01 22:45:26 -08:00
|
|
|
} else if (instance->vUr < CJ125_UR_OVERHEAT_THR) {
|
2019-01-03 05:26:42 -08:00
|
|
|
instance->state = CJ125_OVERHEAT;
|
2018-01-29 11:26:42 -08:00
|
|
|
} else {
|
|
|
|
// This indicates that the heater temperature is optimal for UA measurement
|
2019-01-03 05:26:42 -08:00
|
|
|
instance->state = CJ125_READY;
|
2018-01-29 11:26:42 -08:00
|
|
|
}
|
|
|
|
|
2019-02-01 20:16:34 -08:00
|
|
|
if (isStopped && instance->isWorkingState()) {
|
2019-01-03 05:26:42 -08:00
|
|
|
instance->state = CJ125_INIT;
|
2019-02-01 20:16:34 -08:00
|
|
|
instance->SetIdleHeater(PASS_ENGINE_PARAMETER_SIGNATURE);
|
2018-01-29 11:26:42 -08:00
|
|
|
}
|
|
|
|
|
|
|
|
#if 0
|
|
|
|
// Change amplification if AFR gets lean/rich for better accuracy
|
2019-02-01 22:45:26 -08:00
|
|
|
globalInstance.cjSetMode(globalInstance.lambda > 1.0f ? CJ125_MODE_NORMAL_17 : CJ125_MODE_NORMAL_8);
|
2018-01-29 11:26:42 -08:00
|
|
|
#endif
|
|
|
|
|
2019-01-03 05:26:42 -08:00
|
|
|
switch (instance->state) {
|
2018-01-29 11:26:42 -08:00
|
|
|
case CJ125_PREHEAT:
|
|
|
|
// use constant-speed startup heat-up
|
2019-02-01 20:16:34 -08:00
|
|
|
if (nowNt - instance->prevNt >= CJ125_HEATER_PREHEAT_PERIOD) {
|
|
|
|
float periodSecs = (float)(nowNt - instance->prevNt) / US2NT(US_PER_SECOND_LL);
|
2018-01-29 11:26:42 -08:00
|
|
|
// maintain speed at ~0.4V/sec
|
2019-02-01 20:16:34 -08:00
|
|
|
float preheatDuty = instance->heaterDuty + periodSecs * CJ125_HEATER_PREHEAT_RATE;
|
|
|
|
instance->SetHeater(preheatDuty PASS_ENGINE_PARAMETER_SUFFIX);
|
2018-01-29 11:26:42 -08:00
|
|
|
// If we are heating too long, and there's still no result, then something is wrong...
|
2019-02-01 20:16:34 -08:00
|
|
|
if (nowNt - instance->startHeatingNt > US2NT(US_PER_SECOND_LL) * CJ125_PREHEAT_TIMEOUT) {
|
|
|
|
instance->setError(CJ125_ERROR_HEATER_MALFUNCTION PASS_ENGINE_PARAMETER_SUFFIX);
|
2018-01-29 11:26:42 -08:00
|
|
|
}
|
|
|
|
cjPrintData();
|
2019-02-01 20:16:34 -08:00
|
|
|
instance->prevNt = nowNt;
|
2018-01-29 11:26:42 -08:00
|
|
|
}
|
|
|
|
break;
|
|
|
|
case CJ125_HEAT_UP:
|
|
|
|
case CJ125_READY:
|
|
|
|
// use PID for normal heater control
|
2019-02-01 20:16:34 -08:00
|
|
|
if (nowNt - instance->prevNt >= CJ125_HEATER_CONTROL_PERIOD) {
|
2018-05-27 17:47:40 -07:00
|
|
|
/* PID doesn't care about the target or the input, it knows only the
|
|
|
|
* error value as the difference of (target - input). and if we swap them we'll just get a sign inversion. If target=vUrCal, and input=vUr, then error=vUrCal-vUr, i.e. if vUr<vUrCal then the error will cause the heater to increase it's duty cycle. But it's not exactly what we want! Lesser vUr means HOTTER cell. That's why we even have this safety check for overheating: (vUr < CJ125_UR_OVERHEAT_THR)...
|
|
|
|
* So the simple trick is to inverse the error by swapping the target and input values.
|
|
|
|
*/
|
2019-04-25 18:31:33 -07:00
|
|
|
float duty = globalInstance.heaterPid.getOutput(globalInstance.vUr, globalInstance.vUrCal, MS2SEC(CJ125_TICK_DELAY));
|
2019-02-01 22:45:26 -08:00
|
|
|
globalInstance.heaterPid.showPidStatus(logger, "cj");
|
2019-02-01 20:16:34 -08:00
|
|
|
instance->SetHeater(duty PASS_ENGINE_PARAMETER_SUFFIX);
|
2018-01-29 11:26:42 -08:00
|
|
|
cjPrintData();
|
2019-02-01 20:16:34 -08:00
|
|
|
instance->prevNt = nowNt;
|
2018-01-29 11:26:42 -08:00
|
|
|
}
|
|
|
|
break;
|
|
|
|
case CJ125_OVERHEAT:
|
2019-02-01 20:16:34 -08:00
|
|
|
if (nowNt - instance->prevNt >= CJ125_HEATER_OVERHEAT_PERIOD) {
|
|
|
|
instance->setError(CJ125_ERROR_OVERHEAT PASS_ENGINE_PARAMETER_SUFFIX);
|
|
|
|
instance->prevNt = nowNt;
|
2018-01-29 11:26:42 -08:00
|
|
|
}
|
|
|
|
default:
|
|
|
|
;
|
|
|
|
}
|
2019-01-03 04:22:21 -08:00
|
|
|
}
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
|
|
|
static msg_t cjThread(void)
|
|
|
|
{
|
|
|
|
chRegSetThreadName("cj125");
|
|
|
|
|
|
|
|
chThdSleepMilliseconds(500);
|
|
|
|
|
2019-02-01 20:16:34 -08:00
|
|
|
globalInstance.startHeatingNt = 0;
|
|
|
|
globalInstance.prevNt = getTimeNowNt();
|
2019-01-03 04:22:21 -08:00
|
|
|
while (1) {
|
2019-02-01 20:16:34 -08:00
|
|
|
bool needIdleSleep = cj125periodic(&globalInstance PASS_ENGINE_PARAMETER_SUFFIX);
|
2019-01-03 04:22:21 -08:00
|
|
|
chThdSleepMilliseconds(needIdleSleep ? CJ125_IDLE_TICK_DELAY : CJ125_TICK_DELAY);
|
2016-07-17 00:01:48 -07:00
|
|
|
}
|
2018-01-29 11:26:42 -08:00
|
|
|
return -1;
|
|
|
|
}
|
2016-07-25 19:01:42 -07:00
|
|
|
|
2019-04-12 17:52:51 -07:00
|
|
|
#if ! EFI_UNIT_TEST
|
2018-01-29 11:26:42 -08:00
|
|
|
static bool cjCheckConfig(void) {
|
2019-12-11 14:48:55 -08:00
|
|
|
if (!CONFIG(isCJ125Enabled)) {
|
2018-01-29 11:26:42 -08:00
|
|
|
scheduleMsg(logger, "cj125 is disabled. Failed!");
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
return true;
|
|
|
|
}
|
2016-07-26 19:01:50 -07:00
|
|
|
|
2018-01-29 11:26:42 -08:00
|
|
|
static void cjStartCalibration(void) {
|
|
|
|
if (!cjCheckConfig())
|
|
|
|
return;
|
2019-02-01 20:16:34 -08:00
|
|
|
if (globalInstance.isWorkingState()) {
|
2018-01-29 11:26:42 -08:00
|
|
|
// todo: change this later for the normal thread operation (auto pre-heating)
|
|
|
|
scheduleMsg(logger, "cj125: Cannot start calibration. Please restart the board and make sure that your sensor is not heating");
|
|
|
|
return;
|
|
|
|
}
|
2019-01-03 05:26:42 -08:00
|
|
|
globalInstance.state = CJ125_CALIBRATION;
|
2018-01-29 11:26:42 -08:00
|
|
|
}
|
2016-07-25 19:01:42 -07:00
|
|
|
|
2018-01-29 11:26:42 -08:00
|
|
|
static void cjStartTest(void) {
|
|
|
|
if (!cjCheckConfig())
|
|
|
|
return;
|
2019-01-03 05:26:42 -08:00
|
|
|
globalInstance.state = CJ125_INIT;
|
2018-01-29 11:26:42 -08:00
|
|
|
}
|
2019-01-03 04:22:21 -08:00
|
|
|
#endif /* EFI_UNIT_TEST */
|
|
|
|
|
2016-07-25 19:01:42 -07:00
|
|
|
|
2018-01-29 11:26:42 -08:00
|
|
|
#ifdef CJ125_DEBUG
|
|
|
|
static void cjSetInit1(int v) {
|
|
|
|
cjWriteRegister(INIT_REG1_WR, v & 0xff);
|
|
|
|
v = cjReadRegister(INIT_REG1_RD);
|
|
|
|
scheduleMsg(logger, "cj125 INIT_REG1=0x%02x.", v);
|
2016-06-24 16:02:45 -07:00
|
|
|
}
|
|
|
|
|
2018-01-29 11:26:42 -08:00
|
|
|
static void cjSetInit2(int v) {
|
|
|
|
cjWriteRegister(INIT_REG2_WR, v & 0xff);
|
|
|
|
v = cjReadRegister(INIT_REG2_RD);
|
|
|
|
scheduleMsg(logger, "cj125 INIT_REG2=0x%02x.", v);
|
2018-01-28 10:04:19 -08:00
|
|
|
}
|
2018-01-29 11:26:42 -08:00
|
|
|
#endif /* CJ125_DEBUG */
|
2018-01-28 10:04:19 -08:00
|
|
|
|
|
|
|
float cjGetAfr(DECLARE_ENGINE_PARAMETER_SIGNATURE) {
|
2019-07-09 11:16:36 -07:00
|
|
|
// See CJ125 datasheet, page 6
|
|
|
|
float pumpCurrent = (globalInstance.vUa - globalInstance.vUaCal) * globalInstance.amplCoeff * (CJ125_PUMP_CURRENT_FACTOR / CJ125_PUMP_SHUNT_RESISTOR);
|
|
|
|
|
2018-08-08 17:42:55 -07:00
|
|
|
if (engineConfiguration->cj125isLsu49) {
|
2019-07-09 11:16:36 -07:00
|
|
|
globalInstance.lambda = interpolate2d("cj125Lsu", pumpCurrent, pumpCurrentLsu49, lambdaLsu49);
|
2018-08-08 17:42:55 -07:00
|
|
|
} else {
|
2019-07-09 11:16:36 -07:00
|
|
|
globalInstance.lambda = interpolate2d("cj125Lsu", pumpCurrent, pumpCurrentLsu42, lambdaLsu42);
|
2018-08-08 17:42:55 -07:00
|
|
|
}
|
2019-07-09 11:16:36 -07:00
|
|
|
|
2018-01-29 11:26:42 -08:00
|
|
|
// todo: make configurable stoich ratio
|
2019-02-01 22:45:26 -08:00
|
|
|
return globalInstance.lambda * CJ125_STOICH_RATIO;
|
2018-01-28 10:04:19 -08:00
|
|
|
}
|
|
|
|
|
|
|
|
bool cjHasAfrSensor(DECLARE_ENGINE_PARAMETER_SIGNATURE) {
|
2019-12-11 14:48:55 -08:00
|
|
|
if (!CONFIG(isCJ125Enabled))
|
2018-01-29 11:26:42 -08:00
|
|
|
return false;
|
2019-02-01 22:45:26 -08:00
|
|
|
return globalInstance.isValidState();
|
2018-01-29 11:26:42 -08:00
|
|
|
}
|
|
|
|
|
2019-04-12 17:52:51 -07:00
|
|
|
#if EFI_TUNER_STUDIO
|
2018-06-17 16:14:46 -07:00
|
|
|
// used by DBG_CJ125
|
2018-01-29 11:26:42 -08:00
|
|
|
void cjPostState(TunerStudioOutputChannels *tsOutputChannels) {
|
2019-02-01 20:16:34 -08:00
|
|
|
tsOutputChannels->debugFloatField1 = globalInstance.heaterDuty;
|
2019-02-01 22:45:26 -08:00
|
|
|
tsOutputChannels->debugFloatField2 = globalInstance.heaterPid.getIntegration();
|
|
|
|
tsOutputChannels->debugFloatField3 = globalInstance.heaterPid.getPrevError();
|
|
|
|
tsOutputChannels->debugFloatField4 = globalInstance.vUa;
|
|
|
|
tsOutputChannels->debugFloatField5 = globalInstance.vUr;
|
|
|
|
tsOutputChannels->debugFloatField6 = globalInstance.vUaCal;
|
|
|
|
tsOutputChannels->debugFloatField7 = globalInstance.vUrCal;
|
2019-01-03 05:26:42 -08:00
|
|
|
tsOutputChannels->debugIntField1 = globalInstance.state;
|
2019-02-01 22:06:45 -08:00
|
|
|
tsOutputChannels->debugIntField2 = globalInstance.diag;
|
2018-01-29 11:26:42 -08:00
|
|
|
}
|
2018-11-03 10:27:48 -07:00
|
|
|
#endif /* EFI_TUNER_STUDIO */
|
2018-01-29 11:26:42 -08:00
|
|
|
|
2018-11-03 10:38:02 -07:00
|
|
|
void initCJ125(Logging *sharedLogger DECLARE_ENGINE_PARAMETER_SUFFIX) {
|
2018-01-29 11:26:42 -08:00
|
|
|
logger = sharedLogger;
|
2019-02-01 22:06:45 -08:00
|
|
|
globalInstance.spi = &spi;
|
|
|
|
globalInstance.logger = sharedLogger;
|
2018-01-29 11:26:42 -08:00
|
|
|
|
2019-12-11 14:48:55 -08:00
|
|
|
if (!CONFIG(isCJ125Enabled)) {
|
2019-12-01 22:52:54 -08:00
|
|
|
globalInstance.errorCode = CJ125_ERROR_DISABLED;
|
2018-01-29 11:26:42 -08:00
|
|
|
return;
|
2019-12-01 22:52:54 -08:00
|
|
|
}
|
2018-01-29 11:26:42 -08:00
|
|
|
|
|
|
|
if (CONFIG(cj125ur) == EFI_ADC_NONE || CONFIG(cj125ua) == EFI_ADC_NONE) {
|
|
|
|
scheduleMsg(logger, "cj125 init error! cj125ur and cj125ua are required.");
|
2019-03-26 06:38:23 -07:00
|
|
|
warning(CUSTOM_CJ125_0, "cj ur ua");
|
2019-12-01 22:52:54 -08:00
|
|
|
globalInstance.errorCode = CJ125_ERROR_DISABLED;
|
2018-01-29 11:26:42 -08:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2019-12-11 14:48:55 -08:00
|
|
|
if (CONFIG(wboHeaterPin) == GPIO_UNASSIGNED) {
|
2018-01-29 11:26:42 -08:00
|
|
|
scheduleMsg(logger, "cj125 init error! wboHeaterPin is required.");
|
2019-03-26 06:38:23 -07:00
|
|
|
warning(CUSTOM_CJ125_1, "cj heater");
|
2019-12-01 22:52:54 -08:00
|
|
|
globalInstance.errorCode = CJ125_ERROR_DISABLED;
|
2018-01-29 11:26:42 -08:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2019-02-01 22:45:26 -08:00
|
|
|
globalInstance.cjInitPid(PASS_ENGINE_PARAMETER_SIGNATURE);
|
2019-01-03 04:22:21 -08:00
|
|
|
cjStartSpi(PASS_ENGINE_PARAMETER_SIGNATURE);
|
2019-03-26 06:38:23 -07:00
|
|
|
if (driver == NULL) {
|
|
|
|
// error already reported
|
|
|
|
return;
|
|
|
|
}
|
2019-02-01 20:48:11 -08:00
|
|
|
scheduleMsg(logger, "cj125: Starting heater control");
|
2019-04-12 17:11:27 -07:00
|
|
|
globalInstance.StartHeaterControl((pwm_gen_callback*)applyPinState PASS_ENGINE_PARAMETER_SUFFIX);
|
2019-01-03 04:22:21 -08:00
|
|
|
cjStart(PASS_ENGINE_PARAMETER_SIGNATURE);
|
2018-01-29 11:26:42 -08:00
|
|
|
|
|
|
|
#ifdef CJ125_DEBUG
|
2019-02-01 20:16:34 -08:00
|
|
|
// addConsoleActionF("cj125_heater", cjConsoleSetHeater);
|
2018-01-29 11:26:42 -08:00
|
|
|
addConsoleActionI("cj125_set_init1", cjSetInit1);
|
|
|
|
addConsoleActionI("cj125_set_init2", cjSetInit2);
|
|
|
|
#endif /* CJ125_DEBUG */
|
|
|
|
|
2019-01-03 04:22:21 -08:00
|
|
|
addConsoleAction("cj125", cjStartTest);
|
|
|
|
addConsoleAction("cj125_calibrate", cjStartCalibration);
|
|
|
|
|
2019-07-13 07:32:36 -07:00
|
|
|
chThdCreateStatic(cj125ThreadStack, sizeof(cj125ThreadStack), LOWPRIO, (tfunc_t)(void*) cjThread, NULL);
|
2018-01-28 10:04:19 -08:00
|
|
|
}
|
|
|
|
|
2019-02-01 20:16:34 -08:00
|
|
|
#endif /* EFI_CJ125 && HAL_USE_SPI */
|