rusefi
/
custom-board-bundle-sample-fork-of-rusefi
mirror of https://github.com/rusefi/custom-board-bundle-sample-fork-of-rusefi.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

new attempt at better simulator

This commit is contained in:
rusefi 2020-04-13 13:12:55 -04:00
parent 63b83332a3
commit 33eb9fd2ec
2 changed files with 27 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
firmware/hw_layer/sensors/cj125.cpp
View File

@ -17,11 +17,13 @@
EXTERN_ENGINE; EXTERN_ENGINE;
#if EFI_CJ125 && HAL_USE_SPI #if EFI_CJ125
#include "adc_inputs.h" #include "adc_inputs.h"
#if HAL_USE_SPI
#include "mpu_util.h" #include "mpu_util.h"
#endif /* HAL_USE_SPI */
//#define CJ125_DEBUG //#define CJ125_DEBUG
//#define CJ125_DEBUG_SPI //#define CJ125_DEBUG_SPI
@ -37,7 +39,11 @@ static uint8_t rx_buff[1] NO_CACHE;
static CJ125 globalInstance; static CJ125 globalInstance;
#if ! EFI_UNIT_TEST
static THD_WORKING_AREA(cj125ThreadStack, UTILITY_THREAD_STACK_SIZE); static THD_WORKING_AREA(cj125ThreadStack, UTILITY_THREAD_STACK_SIZE);
#endif /* EFI_UNIT_TEST */
#if HAL_USE_SPI
static SPIDriver *driver; static SPIDriver *driver;
@ -53,6 +59,8 @@ static SPIConfig cj125spicfg = {
SPI_CR2_8BIT_MODE SPI_CR2_8BIT_MODE
}; };
#endif /* HAL_USE_SPI */
static volatile int lastSlowAdcCounter = 0; static volatile int lastSlowAdcCounter = 0;
// LSU conversion tables. See cj125_sensor_type_e // LSU conversion tables. See cj125_sensor_type_e
@ -106,9 +114,11 @@ static void cjWriteRegister(uint8_t regAddr, uint8_t regValue) {
scheduleMsg(logger, "cjWriteRegister: addr=%d value=%d", regAddr, regValue); scheduleMsg(logger, "cjWriteRegister: addr=%d value=%d", regAddr, regValue);
#endif /* CJ125_DEBUG_SPI */ #endif /* CJ125_DEBUG_SPI */
// todo: extract 'sendSync' method? // todo: extract 'sendSync' method?
#if HAL_USE_SPI
spiSelect(driver); spiSelect(driver);
spiSend(driver, 2, tx_buff); spiSend(driver, 2, tx_buff);
spiUnselect(driver); spiUnselect(driver);
#endif /* HAL_USE_SPI */
} }
static float getUr() { static float getUr() {
@ -165,13 +175,17 @@ static void cjPrintState() {
static void cjInfo() { static void cjInfo() {
cjPrintState(); cjPrintState();
#if HAL_USE_SPI
printSpiConfig(logger, "cj125", CONFIG(cj125SpiDevice)); printSpiConfig(logger, "cj125", CONFIG(cj125SpiDevice));
#endif /* HAL_USE_SPI */
} }
static void cjPrintData(void) { static void cjPrintData() {
#if ! EFI_UNIT_TEST
if (engineConfiguration->isCJ125Verbose) { if (engineConfiguration->isCJ125Verbose) {
cjPrintState(); cjPrintState();
} }
#endif /* EFI_UNIT_TEST */
} }
static void cjPrintErrorCode(cj125_error_e errCode) { static void cjPrintErrorCode(cj125_error_e errCode) {
@ -334,7 +348,8 @@ void CJ125::setError(cj125_error_e errCode DECLARE_ENGINE_PARAMETER_SUFFIX) {
cjWriteRegister(INIT_REG2_WR, CJ125_INIT2_RESET); cjWriteRegister(INIT_REG2_WR, CJ125_INIT2_RESET);
} }
static void cjStartSpi(DECLARE_ENGINE_PARAMETER_SIGNATURE) { static bool cjStartSpi(DECLARE_ENGINE_PARAMETER_SIGNATURE) {
#if HAL_USE_SPI
globalInstance.cj125Cs.initPin("cj125 CS", CONFIG(cj125CsPin), globalInstance.cj125Cs.initPin("cj125 CS", CONFIG(cj125CsPin),
&engineConfiguration->cj125CsPinMode); &engineConfiguration->cj125CsPinMode);
// Idle CS pin - SPI CS is high when idle // Idle CS pin - SPI CS is high when idle
@ -347,10 +362,12 @@ static void cjStartSpi(DECLARE_ENGINE_PARAMETER_SIGNATURE) {
driver = getSpiDevice(engineConfiguration->cj125SpiDevice); driver = getSpiDevice(engineConfiguration->cj125SpiDevice);
if (driver == NULL) { if (driver == NULL) {
// error already reported // error already reported
return; return false;
} }
scheduleMsg(logger, "cj125: Starting SPI driver %s", getSpi_device_e(engineConfiguration->cj125SpiDevice)); scheduleMsg(logger, "cj125: Starting SPI driver %s", getSpi_device_e(engineConfiguration->cj125SpiDevice));
spiStart(driver, &cj125spicfg); spiStart(driver, &cj125spicfg);
#endif /* HAL_USE_SPI */
return true;
} }
/** /**
@ -448,6 +465,8 @@ static bool cj125periodic(CJ125 *instance DECLARE_ENGINE_PARAMETER_SUFFIX) {
return false; return false;
} }
#if ! EFI_UNIT_TEST
static msg_t cjThread(void) static msg_t cjThread(void)
{ {
chRegSetThreadName("cj125"); chRegSetThreadName("cj125");
@ -463,7 +482,6 @@ static msg_t cjThread(void)
return -1; return -1;
} }
#if ! EFI_UNIT_TEST
static bool cjCheckConfig(void) { static bool cjCheckConfig(void) {
if (!CONFIG(isCJ125Enabled)) { if (!CONFIG(isCJ125Enabled)) {
scheduleMsg(logger, "cj125 is disabled. Failed!"); scheduleMsg(logger, "cj125 is disabled. Failed!");
@ -568,11 +586,8 @@ void initCJ125(Logging *sharedLogger DECLARE_ENGINE_PARAMETER_SUFFIX) {
} }
globalInstance.cjInitPid(PASS_ENGINE_PARAMETER_SIGNATURE); globalInstance.cjInitPid(PASS_ENGINE_PARAMETER_SIGNATURE);
cjStartSpi(PASS_ENGINE_PARAMETER_SIGNATURE); if (!cjStartSpi(PASS_ENGINE_PARAMETER_SIGNATURE))
if (driver == NULL) {
// error already reported
return; return;
}
scheduleMsg(logger, "cj125: Starting heater control"); scheduleMsg(logger, "cj125: Starting heater control");
globalInstance.StartHeaterControl((pwm_gen_callback*)applyPinState PASS_ENGINE_PARAMETER_SUFFIX); globalInstance.StartHeaterControl((pwm_gen_callback*)applyPinState PASS_ENGINE_PARAMETER_SUFFIX);
cjStart(PASS_ENGINE_PARAMETER_SIGNATURE); cjStart(PASS_ENGINE_PARAMETER_SIGNATURE);
@ -583,11 +598,13 @@ void initCJ125(Logging *sharedLogger DECLARE_ENGINE_PARAMETER_SUFFIX) {
addConsoleActionI("cj125_set_init2", cjSetInit2); addConsoleActionI("cj125_set_init2", cjSetInit2);
#endif /* CJ125_DEBUG */ #endif /* CJ125_DEBUG */
#if ! EFI_UNIT_TEST
addConsoleAction("cj125_info", cjInfo); addConsoleAction("cj125_info", cjInfo);
addConsoleAction("cj125_restart", cjRestart); addConsoleAction("cj125_restart", cjRestart);
addConsoleAction("cj125_calibrate", cjStartCalibration); addConsoleAction("cj125_calibrate", cjStartCalibration);
chThdCreateStatic(cj125ThreadStack, sizeof(cj125ThreadStack), LOWPRIO, (tfunc_t)(void*) cjThread, NULL); chThdCreateStatic(cj125ThreadStack, sizeof(cj125ThreadStack), LOWPRIO, (tfunc_t)(void*) cjThread, NULL);
#endif /* ! EFI_UNIT_TEST */
} }
#endif /* EFI_CJ125 && HAL_USE_SPI */ #endif /* EFI_CJ125 && HAL_USE_SPI */

1
unit_tests/global.h
View File

@ -38,6 +38,7 @@ extern "C"
#endif /* __cplusplus */ #endif /* __cplusplus */
#define CH_FREQUENCY 1000 #define CH_FREQUENCY 1000
#define NO_CACHE
typedef int bool_t; typedef int bool_t;
typedef uint32_t systime_t; typedef uint32_t systime_t;