parent
d7778b258d
commit
dc9268a5ee
|
@ -171,6 +171,7 @@ enum class SentEtbType : uint8_t {
|
|||
NONE = 0,
|
||||
GM_TYPE_1 = 1,
|
||||
FORD_TYPE_1 = 2,
|
||||
CUSTOM = 3,
|
||||
};
|
||||
|
||||
typedef enum __attribute__ ((__packed__)) {
|
||||
|
|
|
@ -54,7 +54,18 @@ void sentTpsDecode() {
|
|||
if (!isDigitalTps1()) {
|
||||
return;
|
||||
}
|
||||
float value = getSentValue(0);
|
||||
sentTps.setValidValue(value, getTimeNowNt());
|
||||
// todo: move away from weird float API
|
||||
float sentValue = getSentValue(0);
|
||||
float tpsValue;
|
||||
switch (engineConfiguration->sentEtbType) {
|
||||
case SentEtbType::GM_TYPE_1:
|
||||
tpsValue = interpolateClamped(0, 0xE48, 100, 0x1A0, sentValue);
|
||||
break;
|
||||
default:
|
||||
tpsValue = interpolateClamped(0, engineConfiguration->customSentTpsMin, 100, engineConfiguration->customSentTpsMax, sentValue);
|
||||
break;
|
||||
}
|
||||
|
||||
sentTps.setValidValue(tpsValue, getTimeNowNt());
|
||||
#endif // EFI_SENT_SUPPORT
|
||||
}
|
|
@ -297,7 +297,7 @@ end_struct
|
|||
#define ego_sensor_e_enum "BPSX", "Innovate", "14Point7", "Narrow", "PLX", "Custom"
|
||||
custom ego_sensor_e 1 bits, S08, @OFFSET@, [0:2], @@ego_sensor_e_enum@@
|
||||
|
||||
#define SentEtbType_enum "None", "GM type 1", "Ford type 1"
|
||||
#define SentEtbType_enum "None", "GM type 1", "Ford type 1", "Custom"
|
||||
custom SentEtbType 1 bits, S08, @OFFSET@, [0:1], @@SentEtbType_enum@@
|
||||
|
||||
struct cranking_parameters_s
|
||||
|
@ -1555,8 +1555,8 @@ int16_t ALSMaxDuration;;"sec", 1, 0, 0, 10, 0
|
|||
uint8_t alsMinTimeBetween;;"", 1, 0, 0, 20000, 0
|
||||
uint8_t alsEtbPosition;;"", 1, 0, 0, 20000, 0
|
||||
uint8_t acRelayAlternatorDutyAdder
|
||||
uint8_t[2] unusedA11lignmentFill_at_33
|
||||
SentEtbType sentEtbType
|
||||
uint16_t customSentTpsMin
|
||||
int ALSIdleAdd;;"%", 1, 0, 0, 100, 2
|
||||
int ALSEtbAdd;;"%", 1, 0, 0, 100, 2
|
||||
float ALSSkipRatio;;"", 1, 0, 0, 1, 1
|
||||
|
@ -1566,7 +1566,9 @@ uint8_t alsEtbPosition;;"", 1, 0, 0, 20000, 0
|
|||
uint8_t autoscale tpsSecondaryMaximum;For Ford TPS, use 53%. For Toyota ETCS-i, use ~65%;"%", 0.5, 0, 0, 100, 1
|
||||
uint8_t autoscale ppsSecondaryMaximum;For Toyota ETCS-i, use ~69%;"%", 0.5, 0, 0, 100, 1
|
||||
pin_input_mode_e[LUA_DIGITAL_INPUT_COUNT iterate] luaDigitalInputPinModes;
|
||||
uint8_t[48] mainUnusedEnd;;"units", 1, 0, 0, 1, 0
|
||||
uint16_t customSentTpsMax
|
||||
uint16_t unusedPaddingHere
|
||||
uint8_t[44] mainUnusedEnd;;"units", 1, 0, 0, 1, 0
|
||||
|
||||
! end of engine_configuration_s
|
||||
end_struct
|
||||
|
|
|
@ -4295,6 +4295,8 @@ dialog = tcuControls, "Transmission Settings"
|
|||
field = "boardUseD5PullDown", boardUseD5PullDown
|
||||
field = "SENT input 1", sentInputPins1
|
||||
field = "SENT sentEtbType", sentEtbType
|
||||
field = customSentTpsMin, customSentTpsMin
|
||||
field = customSentTpsMax, customSentTpsMax
|
||||
field = "etbDutyThreshold", etbDutyThreshold
|
||||
field = "etbDutyShutdownThreshold", etbDutyShutdownThreshold
|
||||
|
||||
|
|
Loading…
Reference in New Issue