mirror of https://github.com/FOME-Tech/fome-fw.git
Prepare debug & output for CJ125 (#558)
This commit is contained in:
parent
9cb2757492
commit
19dca45042
|
@ -72,6 +72,7 @@ extern bool main_loop_started;
|
|||
#include "max31855.h"
|
||||
#include "vehicle_speed.h"
|
||||
#include "SingleTimerExecutor.h"
|
||||
#include "CJ125.h"
|
||||
#endif /* EFI_PROD_CODE */
|
||||
|
||||
#if EFI_FSIO || defined(__DOXYGEN__)
|
||||
|
@ -802,6 +803,11 @@ void updateTunerStudioState(TunerStudioOutputChannels *tsOutputChannels DECLARE_
|
|||
tsOutputChannels->debugIntField2 = invalidResponsesCount;
|
||||
break;
|
||||
#endif /* EFI_HIP_9011 */
|
||||
#if EFI_CJ125 || defined(__DOXYGEN__)
|
||||
case DBG_CJ125:
|
||||
cjPostState(tsOutputChannels);
|
||||
break;
|
||||
#endif /* EFI_CJ125 */
|
||||
case DBG_ADC:
|
||||
tsOutputChannels->debugFloatField1 = (engineConfiguration->vbattAdcChannel != EFI_ADC_NONE) ? getVoltageDivided("vbatt", engineConfiguration->vbattAdcChannel) : 0.0f;
|
||||
tsOutputChannels->debugFloatField2 = (engineConfiguration->tpsAdcChannel != EFI_ADC_NONE) ? getVoltageDivided("tps", engineConfiguration->tpsAdcChannel) : 0.0f;
|
||||
|
|
|
@ -707,8 +707,8 @@ case GPIO_UNASSIGNED:
|
|||
}
|
||||
const char *getDebug_mode_e(debug_mode_e value){
|
||||
switch(value) {
|
||||
case DBG_25:
|
||||
return "DBG_25";
|
||||
case DBG_CJ125:
|
||||
return "DBG_CJ125";
|
||||
case DBG_26:
|
||||
return "DBG_26";
|
||||
case DBG_27:
|
||||
|
|
|
@ -751,7 +751,7 @@ typedef enum {
|
|||
DBG_INSTANT_RPM = 22,
|
||||
DBG_FSIO_EXPRESSION = 23,
|
||||
DBG_STATUS = 24,
|
||||
DBG_25 = 25,
|
||||
DBG_CJ125 = 25,
|
||||
DBG_26 = 26,
|
||||
DBG_27 = 27,
|
||||
DBG_28 = 28,
|
||||
|
|
|
@ -14,6 +14,10 @@
|
|||
#include "analog_input.h"
|
||||
#include "cyclic_buffer.h"
|
||||
|
||||
#if EFI_PROD_CODE || defined(__DOXYGEN__)
|
||||
#include "CJ125.h"
|
||||
#endif /* EFI_PROD_CODE */
|
||||
|
||||
EXTERN_ENGINE;
|
||||
|
||||
#ifdef EFI_NARROW_EGO_AVERAGING
|
||||
|
@ -88,10 +92,20 @@ void initEgoAveraging(DECLARE_ENGINE_PARAMETER_SIGNATURE) {
|
|||
#endif
|
||||
|
||||
bool hasAfrSensor(DECLARE_ENGINE_PARAMETER_SIGNATURE) {
|
||||
#if EFI_CJ125 || defined(__DOXYGEN__)
|
||||
if (boardConfiguration->isCJ125Enabled) {
|
||||
return cjHasAfrSensor(PASS_ENGINE_PARAMETER_SIGNATURE);
|
||||
}
|
||||
#endif /* EFI_CJ125 */
|
||||
return engineConfiguration->afr.hwChannel != EFI_ADC_NONE;
|
||||
}
|
||||
|
||||
float getAfr(DECLARE_ENGINE_PARAMETER_SIGNATURE) {
|
||||
#if EFI_CJ125 || defined(__DOXYGEN__)
|
||||
if (boardConfiguration->isCJ125Enabled) {
|
||||
return cjGetAfr(PASS_ENGINE_PARAMETER_SIGNATURE);
|
||||
}
|
||||
#endif /* EFI_CJ125 */
|
||||
afr_sensor_s * sensor = &CONFIG(afr);
|
||||
|
||||
float volts = getVoltageDivided("ego", sensor->hwChannel);
|
||||
|
|
|
@ -127,4 +127,15 @@ void initCJ125(Logging *sharedLogger) {
|
|||
|
||||
}
|
||||
|
||||
void cjPostState(TunerStudioOutputChannels *tsOutputChannels) {
|
||||
}
|
||||
|
||||
float cjGetAfr(DECLARE_ENGINE_PARAMETER_SIGNATURE) {
|
||||
return 0.0f;
|
||||
}
|
||||
|
||||
bool cjHasAfrSensor(DECLARE_ENGINE_PARAMETER_SIGNATURE) {
|
||||
return false;
|
||||
}
|
||||
|
||||
#endif /* EFI_CJ125 */
|
||||
|
|
|
@ -17,6 +17,9 @@
|
|||
|
||||
|
||||
void initCJ125(Logging *shared);
|
||||
void cjPostState(TunerStudioOutputChannels *tsOutputChannels);
|
||||
float cjGetAfr(DECLARE_ENGINE_PARAMETER_SIGNATURE);
|
||||
bool cjHasAfrSensor(DECLARE_ENGINE_PARAMETER_SIGNATURE);
|
||||
|
||||
typedef enum {
|
||||
CJ125_IDLE = 0
|
||||
|
|
|
@ -147,7 +147,7 @@ float baseFuel;+Fuel squirt duration while cranking\nA number of curves adjust t
|
|||
int16_t rpm;+Cranking mode threshold. Special cranking logic controls fuel and spark while RPM is below this threshold\nset cranking_rpm X;"RPM", 1, 0, 0, 3000, 0
|
||||
end_struct
|
||||
|
||||
#define debug_mode_e_enum "Alternator_PID", "TPS accel enrich", "Warmup PID", "IDLE", "EL accl enrich", "Trigger Counters", "FSIO_ADC", "AUX_PID_1", "VVT PID", "Cranking", "Timing", "Closed-loop fuel corr PID", "VSS", "SD card", "sr5", "Knock", "Trigger Sync", "Electronic Throttle", "Executor", "Bench Test", "Aux Valves", "ADC", "INSTANT_RPM", "FSIO_EXPRESSION", "Status", "mode25", "mode26", "mode27", "mode28", "mode29"
|
||||
#define debug_mode_e_enum "Alternator_PID", "TPS accel enrich", "Warmup PID", "IDLE", "EL accl enrich", "Trigger Counters", "FSIO_ADC", "AUX_PID_1", "VVT PID", "Cranking", "Timing", "Closed-loop fuel corr PID", "VSS", "SD card", "sr5", "Knock", "Trigger Sync", "Electronic Throttle", "Executor", "Bench Test", "Aux Valves", "ADC", "INSTANT_RPM", "FSIO_EXPRESSION", "Status", "CJ125", "mode26", "mode27", "mode28", "mode29"
|
||||
custom debug_mode_e 4 bits, U32, @OFFSET@, [0:4], @@debug_mode_e_enum@@
|
||||
|
||||
#define vvt_mode_e_enum "First half", "Second half", "2GZ", "Miata NB2", "mode4", "mode5", "mode6", "mode7"
|
||||
|
|
Loading…
Reference in New Issue