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

some cheap used junkyard Accelerometer #2225 

MM5.10
This commit is contained in:
rusefillc 2021-10-06 00:19:33 -04:00
parent 60e14282a1
commit 49e87825f9
6 changed files with 27 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
firmware/console/binary/tunerstudio_outputs.h
View File

@ -281,9 +281,12 @@ struct TunerStudioOutputChannels {
scaled_voltage rawTps2Primary; // 302 scaled_voltage rawTps2Primary; // 302
scaled_voltage rawTps2Secondary; // 304 scaled_voltage rawTps2Secondary; // 304
scaled_channel<uint16_t> knockCount; scaled_channel<uint16_t> knockCount;// 306
uint8_t unusedAtTheEnd[30]; // we have some unused bytes to allow compatible TS changes scaled_channel<int16_t, PACK_MULT_PERCENT> accelerationZ; // 308
scaled_channel<int16_t, PACK_MULT_PERCENT> accelerationRoll; // 310
scaled_channel<int16_t, PACK_MULT_PERCENT> accelerationYaw; // 312
uint8_t unusedAtTheEnd[24]; // we have some unused bytes to allow compatible TS changes
// Temporary - will remove soon // Temporary - will remove soon
TsDebugChannels* getDebugChannels() { TsDebugChannels* getDebugChannels() {

3
firmware/console/status_loop.cpp
View File

@ -731,6 +731,9 @@ void updateTunerStudioState(TunerStudioOutputChannels *tsOutputChannels DECLARE_
tsOutputChannels->accelerationX = engine->sensors.accelerometer.x; tsOutputChannels->accelerationX = engine->sensors.accelerometer.x;
// 278 // 278
tsOutputChannels->accelerationY = engine->sensors.accelerometer.y; tsOutputChannels->accelerationY = engine->sensors.accelerometer.y;
tsOutputChannels->accelerationY = engine->sensors.accelerometer.z;
tsOutputChannels->accelerationRoll = engine->sensors.accelerometer.roll;
tsOutputChannels->accelerationYaw = engine->sensors.accelerometer.yaw;
#if EFI_DYNO_VIEW #if EFI_DYNO_VIEW
tsOutputChannels->VssAcceleration = getDynoviewAcceleration(PASS_ENGINE_PARAMETER_SIGNATURE); tsOutputChannels->VssAcceleration = getDynoviewAcceleration(PASS_ENGINE_PARAMETER_SIGNATURE);

2
firmware/controllers/algo/engine_parts.h
View File

@ -27,6 +27,8 @@ public:
float x = 0; // G value float x = 0; // G value
float y = 0; float y = 0;
float z = 0; float z = 0;
float yaw = 0;
float roll = 0;
}; };
class SensorsState { class SensorsState {

5
firmware/controllers/algo/rusefi_enums.h
View File

@ -754,7 +754,10 @@ typedef enum {
Force_4_bytes_size_can_vss_nbc_e = ENUM_32_BITS, Force_4_bytes_size_can_vss_nbc_e = ENUM_32_BITS,
} can_vss_nbc_e; } can_vss_nbc_e;
// inertia measurement unit, yawn accelerometer /**
* inertia measurement unit, yawn accelerometer
* By the way both kinds of BOSCH use Housing : TE 1-967640-1, pins 144969-1 seal 967056-1 plug 967067-2
*/
typedef enum __attribute__ ((__packed__)) { typedef enum __attribute__ ((__packed__)) {
IMU_NONE = 0, IMU_NONE = 0,
IMU_VAG = 1, IMU_VAG = 1,

2
firmware/integration/rusefi_config.txt
View File

@ -1806,6 +1806,8 @@ end_struct
#define GAUGE_NAME_ACCEL_X "Acceleration: X" #define GAUGE_NAME_ACCEL_X "Acceleration: X"
#define GAUGE_NAME_ACCEL_Y "Acceleration: Y" #define GAUGE_NAME_ACCEL_Y "Acceleration: Y"
#define GAUGE_NAME_ACCEL_Z "Acceleration: Z" #define GAUGE_NAME_ACCEL_Z "Acceleration: Z"
#define GAUGE_NAME_ACCEL_ROLL "Acceleration: Roll"
#define GAUGE_NAME_ACCEL_YAW "Acceleration: Yaw"
#define GAUGE_NAME_BARO_PRESSURE "Barometric pressure" #define GAUGE_NAME_BARO_PRESSURE "Barometric pressure"

13
firmware/tunerstudio/rusefi.input
View File

@ -342,6 +342,9 @@ enable2ndByteCanID = false
; Accel ; Accel
accelerationX = scalar, S16, 212, "G", {1/@@PACK_MULT_PERCENT@@}, 0 accelerationX = scalar, S16, 212, "G", {1/@@PACK_MULT_PERCENT@@}, 0
accelerationY = scalar, S16, 214, "G", {1/@@PACK_MULT_PERCENT@@}, 0 accelerationY = scalar, S16, 214, "G", {1/@@PACK_MULT_PERCENT@@}, 0
accelerationZ = scalar, S16, 308, "G", {1/@@PACK_MULT_PERCENT@@}, 0
accelerationRoll= scalar, S16, 310, "G", {1/@@PACK_MULT_PERCENT@@}, 0
accelerationYaw = scalar, S16, 312, "G", {1/@@PACK_MULT_PERCENT@@}, 0
; egt ; egt
egt1 = scalar, S16, 216, "deg C", 1, 0 egt1 = scalar, S16, 216, "deg C", 1, 0
@ -1039,6 +1042,9 @@ gaugeCategory = Sensors - Extra 1
VSSGauge = vehicleSpeedKph, "Vehicle speed", "kmh", 0, 200, 0, 1, 3, 4, 1, 1 VSSGauge = vehicleSpeedKph, "Vehicle speed", "kmh", 0, 200, 0, 1, 3, 4, 1, 1
accelerationXGauge = accelerationX, @@GAUGE_NAME_ACCEL_X@@, "acc", -11, 11, 1.0, 1.2, 100, 100, 3, 1 accelerationXGauge = accelerationX, @@GAUGE_NAME_ACCEL_X@@, "acc", -11, 11, 1.0, 1.2, 100, 100, 3, 1
accelerationYGauge = accelerationY, @@GAUGE_NAME_ACCEL_Y@@, "acc", -11, 11, 1.0, 1.2, 100, 100, 3, 1 accelerationYGauge = accelerationY, @@GAUGE_NAME_ACCEL_Y@@, "acc", -11, 11, 1.0, 1.2, 100, 100, 3, 1
accelerationZGauge = accelerationZ, @@GAUGE_NAME_ACCEL_Z@@, "acc", -11, 11, 1.0, 1.2, 100, 100, 3, 1
accelerationRollGauge=accelerationRoll, @@GAUGE_NAME_ACCEL_ROLL@@, "acc", -11, 11, 1.0, 1.2, 100, 100, 3, 1
accelerationYawGauge=accelerationYaw, @@GAUGE_NAME_ACCEL_YAW@@, "acc", -11, 11, 1.0, 1.2, 100, 100, 3, 1
atmPresCGauge = baroPressure, @@GAUGE_NAME_BARO_PRESSURE@@, "kPa", 0, 1024, 0, 0, 0, 0, 0, 0 atmPresCGauge = baroPressure, @@GAUGE_NAME_BARO_PRESSURE@@, "kPa", 0, 1024, 0, 0, 0, 0, 0, 0
vvtPositionB1IGauge = vvtPositionB1I, @@GAUGE_NAME_VVT_B1I@@, "deg", -60, 60, -60, -60, 60, 60, 1, 1 vvtPositionB1IGauge = vvtPositionB1I, @@GAUGE_NAME_VVT_B1I@@, "deg", -60, 60, -60, -60, 60, 60, 1, 1
vvtPositionB1EGauge = vvtPositionB1E, @@GAUGE_NAME_VVT_B1E@@, "deg", -60, 60, -60, -60, 60, 60, 1, 1 vvtPositionB1EGauge = vvtPositionB1E, @@GAUGE_NAME_VVT_B1E@@, "deg", -60, 60, -60, -60, 60, 60, 1, 1
@ -1290,8 +1296,11 @@ gaugeCategory = DynoView
entry = totalFuelConsumption, @@GAUGE_NAME_FUEL_CONSUMPTION@@, int, "%d" entry = totalFuelConsumption, @@GAUGE_NAME_FUEL_CONSUMPTION@@, int, "%d"
entry = fuelFlowRate, @@GAUGE_NAME_FUEL_FLOW@@, float, "%.2f" entry = fuelFlowRate, @@GAUGE_NAME_FUEL_FLOW@@, float, "%.2f"
entry = accelerationX, @@GAUGE_NAME_ACCEL_X@@, float,"%.2f", { LIS302DLCsPin != 0 || imuType != 0 } entry = accelerationX, @@GAUGE_NAME_ACCEL_X@@, float,"%.2f", { LIS302DLCsPin != 0 || imuType != 0 }
entry = accelerationY, @@GAUGE_NAME_ACCEL_Y@@, float,"%.2f", { LIS302DLCsPin != 0 || imuType != 0 } entry = accelerationY, @@GAUGE_NAME_ACCEL_Y@@, float,"%.2f", { LIS302DLCsPin != 0 || imuType != 0 }
entry = accelerationZ, @@GAUGE_NAME_ACCEL_Z@@, float,"%.2f", { LIS302DLCsPin != 0 || imuType != 0 }
entry = accelerationRoll,@@GAUGE_NAME_ACCEL_ROLL@@,float,"%.2f", { LIS302DLCsPin != 0 || imuType != 0 }
entry = accelerationYaw, @@GAUGE_NAME_ACCEL_YAW@@, float,"%.2f", { LIS302DLCsPin != 0 || imuType != 0 }
entry = egt1, "EGT1", float,"%.1f", { max31855_cs1 != 0} entry = egt1, "EGT1", float,"%.1f", { max31855_cs1 != 0}
entry = egt2, "EGT2", float,"%.1f", { max31855_cs2 != 0} entry = egt2, "EGT2", float,"%.1f", { max31855_cs2 != 0}
entry = egt3, "EGT3", float,"%.1f", { max31855_cs3 != 0} entry = egt3, "EGT3", float,"%.1f", { max31855_cs3 != 0}