andreika-git
/
rusefi
mirror of https://github.com/andreika-git/rusefi.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

only:hellen-112-17

This commit is contained in:
rusefillc 2023-09-10 11:52:50 -04:00 committed by Andrey
parent 8b5ac1c22b
commit 2449d588ae
7 changed files with 132 additions and 122 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
.github/workflows/build-firmware.yaml vendored
View File

@ -195,6 +195,11 @@ jobs:
ini-file: rusefi_hellen-nb1.ini
skip-rate: 99
- build-target: hellen-112-17
folder: config/boards/hellen/hellen-112-17
ini-file: rusefi_hellen-112-17.ini
skip-rate: 0
- build-target: hellen-gm-e67
folder: config/boards/hellen/hellen-gm-e67
ini-file: rusefi_hellen-gm-e67.ini

4
firmware/config/boards/hellen/hellen-112-17/board.mk
View File

@ -9,7 +9,7 @@ endif
DDEFS += -DEFI_MAIN_RELAY_CONTROL=TRUE
#DDEFS += -DADC_MUX_PIN=Gpio::F2
#no mux on mm100
# Add them all together
DDEFS += -DFIRMWARE_ID=\"hellen-112-17\" $(VAR_DEF_ENGINE_TYPE)
@ -18,5 +18,5 @@ DDEFS += -DFIRMWARE_ID=\"hellen-112-17\" $(VAR_DEF_ENGINE_TYPE)
DDEFS += -DSHORT_BOARD_NAME=hellen-112-17
DDEFS += -DHW_HELLEN_K=TRUE
include $(BOARDS_DIR)/hellen/hellen-common144.mk
include $(BOARDS_DIR)/hellen/hellen-common100.mk
DDEFS += -DHW_HELLEN_HONDA=1

110
firmware/config/boards/hellen/hellen-112-17/board_configuration.cpp
View File

@ -1,5 +1,5 @@
/**
* @file boards/hellen/hellen-honda-k/board_configuration.cpp
* @file boards/hellen/hellen-112-17/board_configuration.cpp
*
* See https://rusefi.com/s/XX
*
@ -9,20 +9,19 @@
#include "pch.h"
#include "defaults.h"
#include "hellen_meta.h"
#include "honda_k_dbc.h"
static void setInjectorPins() {
engineConfiguration->injectionPins[0] = Gpio::H144_LS_1;
engineConfiguration->injectionPins[1] = Gpio::H144_LS_2;
engineConfiguration->injectionPins[2] = Gpio::H144_LS_3;
engineConfiguration->injectionPins[3] = Gpio::H144_LS_4;
engineConfiguration->injectionPins[0] = Gpio::MM100_INJ1;
engineConfiguration->injectionPins[1] = Gpio::MM100_INJ2;
engineConfiguration->injectionPins[2] = Gpio::MM100_INJ3;
engineConfiguration->injectionPins[3] = Gpio::MM100_INJ4;
}
static void setIgnitionPins() {
engineConfiguration->ignitionPins[0] = Gpio::H144_IGN_1;
engineConfiguration->ignitionPins[1] = Gpio::H144_IGN_2;
engineConfiguration->ignitionPins[2] = Gpio::H144_IGN_3;
engineConfiguration->ignitionPins[3] = Gpio::H144_IGN_4;
engineConfiguration->ignitionPins[0] = Gpio::MM100_IGN1;
engineConfiguration->ignitionPins[1] = Gpio::MM100_IGN2;
engineConfiguration->ignitionPins[2] = Gpio::MM100_IGN3;
engineConfiguration->ignitionPins[3] = Gpio::MM100_IGN4;
}
static void setupVbatt() {
@ -34,32 +33,27 @@ static void setupVbatt() {
engineConfiguration->vbattDividerCoeff = (33 + 6.8) / 6.8; // 5.835
// pin input +12 from Main Relay
engineConfiguration->vbattAdcChannel = EFI_ADC_5; // 4T
engineConfiguration->vbattAdcChannel = MM100_IN_VBATT;
engineConfiguration->adcVcc = 3.29f;
}
static void setupDefaultSensorInputs() {
engineConfiguration->vehicleSpeedSensorInputPin = Gpio::H144_IN_VSS;
// engineConfiguration->vehicleSpeedSensorInputPin = Gpio::H144_IN_VSS;
engineConfiguration->tps1_1AdcChannel = H144_IN_TPS;
engineConfiguration->tps1_1AdcChannel = MM100_IN_TPS_ANALOG;
engineConfiguration->mafAdcChannel = EFI_ADC_NONE;
engineConfiguration->map.sensor.hwChannel = H144_IN_MAP1;
engineConfiguration->afr.hwChannel = EFI_ADC_NONE;
// engineConfiguration->afr.hwChannel = EFI_ADC_NONE;
engineConfiguration->clt.adcChannel = H144_IN_CLT;
engineConfiguration->clt.adcChannel = MM100_IN_CLT_ANALOG;
engineConfiguration->iat.adcChannel = H144_IN_IAT;
engineConfiguration->iat.adcChannel = MM100_IN_IAT_ANALOG;
}
void onBoardStandBy() {
efiPrintf("K: onBoardStandBy");
hellenBoardStandBy();
}
#include "hellen_leds_144.cpp"
#include "hellen_leds_100.cpp"
void setBoardConfigOverrides() {
setHellenMegaEnPin();
@ -74,8 +68,6 @@ void setBoardConfigOverrides() {
engineConfiguration->triggerInputPins[0] = Gpio::H144_IN_RES1;
engineConfiguration->camInputs[0] = Gpio::H144_IN_RES3;
// ex or in?
engineConfiguration->camInputs[1] = Gpio::H144_IN_RES2;
// //ETB1
@ -100,30 +92,28 @@ void setBoardConfigOverrides() {
void setBoardDefaultConfiguration() {
setInjectorPins();
setIgnitionPins();
setHondaK();
// not override since sometimes we have isues?
setHellenMMbaro();
// not override since sometimes we have issues?
// setHellenMMbaro();
engineConfiguration->displayLogicLevelsInEngineSniffer = true;
engineConfiguration->globalTriggerAngleOffset = 663;
engineConfiguration->globalTriggerAngleOffset = 0;
engineConfiguration->enableSoftwareKnock = true;
engineConfiguration->canTxPin = H176_CAN_TX;
engineConfiguration->canRxPin = H176_CAN_RX;
engineConfiguration->canTxPin = Gpio::MM100_CAN_TX;
engineConfiguration->canRxPin = Gpio::MM100_CAN_RX;
engineConfiguration->vvtPins[0] = Gpio::H144_OUT_PWM4;
gppwm_channel *vtsControl = &engineConfiguration->gppwm[0];
// vtsControl->pin = Gpio::H144_OUT_IO6;
engineConfiguration->fuelPumpPin = Gpio::H144_OUT_IO13;;
engineConfiguration->idle.solenoidPin = Gpio::H144_LS_6;
engineConfiguration->fanPin = Gpio::H144_OUT_IO12;
engineConfiguration->mainRelayPin = Gpio::H144_OUT_IO3;
engineConfiguration->malfunctionIndicatorPin = Gpio::H144_OUT_IO7;
// engineConfiguration->fuelPumpPin = Gpio::H144_OUT_IO13;;
// engineConfiguration->idle.solenoidPin = Gpio::H144_LS_6;
// engineConfiguration->fanPin = Gpio::H144_OUT_IO12;
// engineConfiguration->mainRelayPin = Gpio::H144_OUT_IO3;
// engineConfiguration->malfunctionIndicatorPin = Gpio::H144_OUT_IO7;
// how come this is not denso 183?!
engineConfiguration->map.sensor.type = MT_CUSTOM;
@ -132,22 +122,16 @@ void setBoardDefaultConfiguration() {
engineConfiguration->map.sensor.highValue = 170.7;
engineConfiguration->mapHighValueVoltage = 4.8;
engineConfiguration->enableKline = true;
engineConfiguration->kLineBaudRate = 9600;
engineConfiguration->hondaK = true;
engineConfiguration->verboseKLine = true;
engineConfiguration->brakePedalPin = Gpio::H144_IN_CAM;
engineConfiguration->acRelayPin = Gpio::H144_LS_5;
engineConfiguration->tachOutputPin = Gpio::H144_OUT_IO10;
// engineConfiguration->brakePedalPin = Gpio::H144_IN_CAM;
// engineConfiguration->acRelayPin = Gpio::H144_LS_5;
// engineConfiguration->tachOutputPin = Gpio::H144_OUT_IO10;
// A/C switch on k-line
// "required" hardware is done - set some reasonable defaults
setupDefaultSensorInputs();
engineConfiguration->enableVerboseCanTx = true;
engineConfiguration->etbFunctions[0] = DC_None;
engineConfiguration->etbFunctions[1] = DC_Wastegate;
engineConfiguration->etbFunctions[0] = DC_Throttle1;
// Some sensible defaults for other options
setCrankOperationMode();
@ -160,28 +144,16 @@ void setBoardDefaultConfiguration() {
setCommonNTCSensor(&engineConfiguration->iat, HELLEN_DEFAULT_AT_PULLUP);
setTPS1Calibration(100, 650);
hellenWbo();
//hellenWbo();
}
static Gpio OUTPUTS[] = {
Gpio::H144_LS_1, // 1 inj 1
Gpio::H144_LS_2,
Gpio::H144_LS_3,
Gpio::H144_LS_4, // 4
Gpio::H144_LS_5, // 5 A/C relay
Gpio::H144_LS_6, // 6 idle air
Gpio::H144_LS_7, // 7 intake runner
Gpio::H144_LS_8, // 8 Lockout Solenoid
Gpio::H144_OUT_IO12, // 9 Radiator Relay Output
Gpio::H144_OUT_PWM6, // 10 B21 EVAP
Gpio::H144_OUT_PWM5, // 11 B23 VTC VVT
Gpio::H144_OUT_IO3, // E7 12 main relay
};
int getBoardMetaOutputsCount() {
return efi::size(OUTPUTS);
}
Gpio* getBoardMetaOutputs() {
return OUTPUTS;
}
//static Gpio OUTPUTS[] = {
//};
//
//int getBoardMetaOutputsCount() {
// return efi::size(OUTPUTS);
//}
//
//Gpio* getBoardMetaOutputs() {
// return OUTPUTS;
//}

110
firmware/config/boards/hellen/hellen-112-17/connectors/main.yaml
View File

@ -9,13 +9,13 @@ pins:
- pin: 101
meta: MM100_INJ5
# RZR wastegate
function: 101 low side 1.5A output
ts_name: ___ low side 1.5A output
class: outputs
type: ls
- pin: 102
meta: MM100_INJ6
# RZR fuel pump driver PWM
function: 102 low side 1.5A output
ts_name: ___ low side 1.5A output
class: outputs
type: ls
@ -38,8 +38,7 @@ pins:
# RZR start command
# VAZ mentions A/C pressure maybe switch? maybe AV?
# jumper
ts_name: 107
function: 107 TODO
ts_name: ___ TODO
- pin: 108
# jumper
function: Sometimes GND
@ -49,72 +48,72 @@ pins:
meta: MM100_IN_MAP2_ANALOG
# RZR Boost MAP
class: analog_inputs
function: Analog 109
ts_name: ___ Analog Input
- pin: 110
meta: MM100_IN_AUX1_ANALOG
# RZR Ambient Pressure
class: analog_inputs
function: 110 Analog Input
ts_name: ___ Analog Input
- pin: 111
meta: MM100_IN_AUX2_ANALOG
# jumper
# RZR & Polaris PPS2
class: analog_inputs
function: ___ PPS2
ts_name: 111 Analog Input
function: PPS2
ts_name: ___ Analog Input
- pin: 112
meta: MM100_IN_AUX3_ANALOG
# RZR Fuel Level
class: analog_inputs
function: 112 Analog Input
ts_name: 112 Analog Input
ts_name: ___ Analog Input
- pin: 113
meta: MM100_IN_D3
function: Brake Input
ts_name: 113 Brake Input
ts_name: ___ Brake Input
- pin: 114
meta: MM100_IN_O2S2_ANALOG
# jumper
# I cannot find where have I seen 114 as PPS2?
function: 114 Analog Input
ts_name: ___ Analog Input
class: analog_inputs
- pin: 115
meta: MM100_IGN8
class: outputs
type: ls
ts_name: Main Relay
ts_name: ___ Main Relay
function: Main Relay Control
- pin: 116
meta: MM100_IN_VBATT
function: Ignition Switch KL15 / Battery Voltage Analog Input
ts_name: 116 - Voltage From Key
ts_name: ___ Voltage From Key
color: white
- pin: 119
meta: MM100_IN_AUX4_ANALOG
class: analog_inputs
function: ___ Analog Input
ts_name: ___ Analog Input
- pin: 120
meta: MM100_IN_D4
function: 120 Switch
class: switch_inputs
ts_name: ___ Switch Input
- pin: 121
meta: MM100_IN_PPS_ANALOG
# jumper
# RZR Polaris VAZ PPS1
function: ___ PPS1
ts_name: ___ PPS1
class: analog_inputs
- pin: 123
meta: MM100_SPI3_MOSI
function: 123 Input
class: switch_inputs
ts_name: ___ Switch Input
- pin: 125
# jumper
@ -130,16 +129,19 @@ pins:
- pin: 128
meta: MM100_OUT_PWM1
function: Tach Output
class: outputs
ts_name: ___ Tach Output
- pin: 129
meta: MM100_OUT_PWM1
function: A29 output
meta: MM100_OUT_PWM2
class: outputs
type: ls
ts_name: ___ Fuel Consumption Output
- pin: 131
meta: MM100_OUT_PWM3
# Polaris Radiator Relay
function: 131 Relay Output
ts_name: ___ Relay Output
class: outputs
type: ls
@ -149,56 +151,61 @@ pins:
- pin: 134
meta: MM100_SPI2_SCK
function: 134 Switch
class: switch_inputs
ts_name: ___ Switch Input
- pin: 135
meta: MM100_SPI2_CS
class: switch_inputs
# VAZ brake pedal
function: ___ Switch Input
ts_name: ___ Switch Input
- pin: 136
meta: MM100_SPI3_SCK
# VAZ clutch pedal
function: 136 Switch Input
class: switch_inputs
ts_name: ___ Switch Input
- pin: 137
function: 137 Polaris
# jumper
function: ___ Analog Supply
- pin: 138
# jumper
function: 138 Analog Supply
function: ___ Analog Supply
color: black
- pin: 140
meta: MM100_IGN6
meta: MM100_IGN7
class: outputs
type: ls
function: 140 relay output
ts_name: ___ Relay Output
color: orange
- pin: 141
meta: MM100_OUT_PWM4
class: outputs
type: ls
function: Engine Radiator Fan
ts_name: ___ Engine Radiator Fan
color: orange
- pin: 142
meta: MM100_OUT_PWM5
class: outputs
type: ls
function: Fuel Pump Relay
ts_name: ___ Fuel Pump Relay
- pin: 144
function: CAN bus low
type: can
- pin: 147
class: switch_inputs
meta: MM100_SPI3_MISO
function: 147 Switch
ts_name: ___ Switch Input
- pin: 151
meta: MM100_IGN5
class: outputs
type: ls
function: 151 relay output
ts_name: ___ relay output
- pin: 152
meta: MM100_IGN6
class: outputs
type: ls
function: 152 relay output
ts_name: ___ relay output
- pin: 153
function: Power GND
type: GND
@ -213,7 +220,7 @@ pins:
- pin: 201
# jumper
function: Crank Sensor VR- Negative Input
ts_name: 201 Crank VR-
ts_name: ___ Crank VR-
- pin: 202
# via
function: 203 Oxygen Sensor
@ -221,7 +228,7 @@ pins:
- pin: 203
meta: MM100_IN_TPS_ANALOG
class: analog_inputs
function: ___ TPS Throttle Position 1
ts_name: ___ TPS Throttle Position 1
- pin: 204
function: Analog GND
@ -247,16 +254,16 @@ pins:
- pin: 213
# jumper
function: Crank Sensor VR+ Positive Input
ts_name: 213 Crank VR+
ts_name: ___ Crank VR+
- pin: 215
meta: MM100_IN_CLT_ANALOG
class: analog_inputs
ts_name: 215 CLT
ts_name: ___ CLT
function: CLT sensor
- pin: 219
meta: MM100_IN_MAP1_ANALOG
class: analog_inputs
ts_name: 219 MAP
ts_name: ___ MAP
function: Manifold Pressure Sensor
- pin: 220
@ -272,7 +279,7 @@ pins:
- pin: 227
class: analog_inputs
meta: MM100_IN_IAT_ANALOG
ts_name: 227 IAT
ts_name: ___ IAT
function: ___ Intake Air Temperature
- pin: 231
meta: MM100_IN_D1
@ -290,11 +297,12 @@ pins:
# jumper
# 1KHz-12KHz
# 1k pull-up to 5v or 12v with hardware mod/jumper https://github.com/rusefi/hellen-112-17/issues/10
function: MAF frequency
class: event_inputs
ts_name: ___ MAF frequency
- pin: 235
meta: MM100_INJ6
function: 135 Low Side Output?
meta: MM100_INJ7
ts_name: ___ Low Side Output
class: outputs
type: ls
- pin: 237
@ -309,7 +317,7 @@ pins:
meta: MM100_INJ2
class: outputs
type: ls
function: injector output 2
ts_name: ___ injector output 2
- pin: 243
meta: MM100_INJ3
class: outputs
@ -319,12 +327,12 @@ pins:
meta: MM100_INJ1
class: outputs
type: ls
function: injector output 1
ts_name: ___ injector output 1
- pin: 245
meta: MM100_INJ4
class: outputs
type: ls
function: injector output 4
ts_name: ___ injector output 4
- pin: 246
meta: MM100_INJ8
function: ___ low side 1.5A output
@ -348,16 +356,16 @@ pins:
color: purple
- pin: 253
meta: MM100_IGN2
function: Coil 2
ts_name: ___ Coil 2
- pin: 254
meta: MM100_IGN3
function: Coil 3
ts_name: ___ Coil 3
- pin: 255
meta: MM100_IGN4
function: Coil 4
ts_name: ___ Coil 4
- pin: 256
meta: MM100_IGN1
function: Coil 1
ts_name: ___ Coil 1
info:

13
firmware/config/boards/hellen/hellen-common100.mk Normal file
View File

@ -0,0 +1,13 @@
# 100 package MCU
ifeq ($(LED_CRITICAL_ERROR_BRAIN_PIN),)
LED_CRITICAL_ERROR_BRAIN_PIN = -DLED_CRITICAL_ERROR_BRAIN_PIN=Gpio::MM100_LED1_RED
endif
DDEFS += $(LED_CRITICAL_ERROR_BRAIN_PIN)
DDEFS += -DHELLEN_BOARD_ID_PIN_1=Gpio::MM100_BOARD_ID1 -DHELLEN_BOARD_ID_PIN_2=Gpio::MM100_BOARD_ID2
include $(BOARDS_DIR)/hellen/hellen-common.mk

11
firmware/config/boards/hellen/hellen_leds_100.cpp Normal file
View File

@ -0,0 +1,11 @@
Gpio getCommsLedPin() {
return Gpio::MM100_LED2; // blue
}
Gpio getRunningLedPin() {
return Gpio::MM100_LED3; // green
}
Gpio getWarningLedPin() {
return Gpio::MM100_LED4; // yellow
}

1
firmware/config/boards/hellen_meta.h
View File

@ -6,6 +6,7 @@
*/
#pragma once
#include "hellen_mm100_meta.h"
// see https://github.com/andreika-git/hellen-one/blob/master/board_id/board_ids.csv
#define BOARD_ID_154hyundai_c 10