From fe25c8162a0b8801e15af5ed87ad34728db2205f Mon Sep 17 00:00:00 2001 From: rusefi Date: Fri, 1 May 2020 17:52:25 -0400 Subject: [PATCH] Attempting cj125 --- firmware/config/engines/me7pnp.cpp | 4 +++- firmware/controllers/engine_controller.cpp | 2 +- firmware/hw_layer/sensors/cj125.cpp | 5 +++++ firmware/hw_layer/sensors/cj125_logic.cpp | 5 +++-- hardware/CJ125_board/known_issues.txt | 1 + 5 files changed, 13 insertions(+), 4 deletions(-) diff --git a/firmware/config/engines/me7pnp.cpp b/firmware/config/engines/me7pnp.cpp index 4806296a98..1bc2e95edd 100644 --- a/firmware/config/engines/me7pnp.cpp +++ b/firmware/config/engines/me7pnp.cpp @@ -95,9 +95,11 @@ void vag_18_Turbo(DECLARE_CONFIG_PARAMETER_SIGNATURE) { engineConfiguration->is_enabled_spi_3 = false; cj125defaultPinout(PASS_CONFIG_PARAMETER_SIGNATURE); - engineConfiguration->cj125ur = EFI_ADC_11; + engineConfiguration->cj125ur = EFI_ADC_11; // PC3 engineConfiguration->cj125CsPin = GPIOB_11; + engineConfiguration->debugMode = DBG_CJ125; + //Digital Inputs/Outputs #if (BOARD_TLE8888_COUNT > 0) engineConfiguration->tle8888spiDevice = SPI_DEVICE_1; diff --git a/firmware/controllers/engine_controller.cpp b/firmware/controllers/engine_controller.cpp index 5566bafb9e..2d4e423736 100644 --- a/firmware/controllers/engine_controller.cpp +++ b/firmware/controllers/engine_controller.cpp @@ -712,6 +712,6 @@ int getRusEfiVersion(void) { if (initBootloader() != 0) return 123; #endif /* EFI_BOOTLOADER_INCLUDE_CODE */ - return 20200429; + return 20200501; } #endif /* EFI_UNIT_TEST */ diff --git a/firmware/hw_layer/sensors/cj125.cpp b/firmware/hw_layer/sensors/cj125.cpp index a8c7ea4681..5862c9cbe8 100644 --- a/firmware/hw_layer/sensors/cj125.cpp +++ b/firmware/hw_layer/sensors/cj125.cpp @@ -175,6 +175,11 @@ static void cjPrintState() { globalInstance.state, globalInstance.diag, globalInstance.vUa, globalInstance.vUr, globalInstance.vUaCal, globalInstance.vUrCal); + + scheduleMsg(logger, "cj125 P=%f I=%f D=%f", + globalInstance.heaterPidConfig.pFactor, + globalInstance.heaterPidConfig.iFactor, + globalInstance.heaterPidConfig.dFactor); } static void cjInfo() { diff --git a/firmware/hw_layer/sensors/cj125_logic.cpp b/firmware/hw_layer/sensors/cj125_logic.cpp index bc129337c3..3ce7def93c 100644 --- a/firmware/hw_layer/sensors/cj125_logic.cpp +++ b/firmware/hw_layer/sensors/cj125_logic.cpp @@ -152,7 +152,8 @@ void CJ125::cjInitPid(DECLARE_ENGINE_PARAMETER_SIGNATURE) { heaterPidConfig.minValue = 0; heaterPidConfig.maxValue = 1; heaterPidConfig.offset = 0; - // todo: period? - heaterPidConfig.periodMs = 1.0f; + /** + * See hard-coded CJ125_TICK_DELAY - we run PID at 50Hz + */ heaterPid.reset(); } diff --git a/hardware/CJ125_board/known_issues.txt b/hardware/CJ125_board/known_issues.txt index eb8c1581e8..9942aa27d6 100644 --- a/hardware/CJ125_board/known_issues.txt +++ b/hardware/CJ125_board/known_issues.txt @@ -5,6 +5,7 @@ 5) RESOLVED IN R0.3 Correct C9 should match C2 for 1kHz low pass filter. 6) RESOLVED IN R0.3 R12 is not routed right 7) RESOLVED IN R0.3 voltage divider on UR and UA channels, 5V --> 3V (not clear if we need this on the little board - we can always use external divider) + This is now implemented as R17/R18 and R19/R20. Default is 6.8k high side/10k low side = 1.68 ratio analogInputDividerCoefficient 8) RESOLVED IN R0.3 R3 is now 0R and C3 is now DNP. These are here incase a filter is needed, as shown in some of the OEM's documentation. 9) enlarge silkscreen font - current font is too small 10) match Frankenso GND/3v/5v pinout