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

more lua gauges

This commit is contained in:
rusefillc 2024-03-23 18:04:52 -04:00
parent c3828b3760
commit 0fec7d3fe9
3 changed files with 21 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
firmware/console/status_loop.cpp
View File

@ -472,6 +472,17 @@ static void updateVehicleSpeed() {
#endif /* EFI_VEHICLE_SPEED */ #endif /* EFI_VEHICLE_SPEED */
} }
static SensorType luaGaugeTypes[] = {
SensorType::LuaGauge1,
SensorType::LuaGauge2,
SensorType::LuaGauge3,
SensorType::LuaGauge4,
SensorType::LuaGauge5,
SensorType::LuaGauge6,
SensorType::LuaGauge7,
SensorType::LuaGauge8
};
static void updateRawSensors() { static void updateRawSensors() {
engine->outputChannels.rawTps1Primary = Sensor::getRaw(SensorType::Tps1Primary); engine->outputChannels.rawTps1Primary = Sensor::getRaw(SensorType::Tps1Primary);
engine->outputChannels.rawTps1Secondary = Sensor::getRaw(SensorType::Tps1Secondary); engine->outputChannels.rawTps1Secondary = Sensor::getRaw(SensorType::Tps1Secondary);
@ -491,8 +502,9 @@ static void updateRawSensors() {
engine->outputChannels.rawWastegatePosition = Sensor::getRaw(SensorType::WastegatePosition); engine->outputChannels.rawWastegatePosition = Sensor::getRaw(SensorType::WastegatePosition);
engine->outputChannels.rawIdlePositionSensor = Sensor::getRaw(SensorType::IdlePosition); engine->outputChannels.rawIdlePositionSensor = Sensor::getRaw(SensorType::IdlePosition);
engine->outputChannels.luaGauges[0] = Sensor::getOrZero(SensorType::LuaGauge1); for (size_t i = 0;i<LUA_GAUGE_COUNT;i++) {
engine->outputChannels.luaGauges[1] = Sensor::getOrZero(SensorType::LuaGauge2); engine->outputChannels.luaGauges[i] = Sensor::getOrZero(luaGaugeTypes[i]);
}
for (int i = 0; i < LUA_ANALOG_INPUT_COUNT; i++) { for (int i = 0; i < LUA_ANALOG_INPUT_COUNT; i++) {
adc_channel_e channel = engineConfiguration->auxAnalogInputs[i]; adc_channel_e channel = engineConfiguration->auxAnalogInputs[i];

2
firmware/integration/rusefi_config_shared.txt
View File

@ -36,7 +36,7 @@
#define IGN_BLEND_COUNT 4 #define IGN_BLEND_COUNT 4
#define VE_BLEND_COUNT 4 #define VE_BLEND_COUNT 4
#define BOOST_BLEND_COUNT 2 #define BOOST_BLEND_COUNT 2
#define LUA_GAUGE_COUNT 2 #define LUA_GAUGE_COUNT 8
#define GAUGE_NAME_VERSION "firmware" #define GAUGE_NAME_VERSION "firmware"

6
firmware/tunerstudio/rusefi.input
View File

@ -1372,6 +1372,12 @@ gaugeCategory = LUA
luaLastCycleDurationGauge = luaLastCycleDuration,"luaLastCycleDuration", "nt", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 luaLastCycleDurationGauge = luaLastCycleDuration,"luaLastCycleDuration", "nt", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0
luaGauges1gauge = luaGauges1, "Lua Gauge 1", "lua", -30000,30000, 0, 0, 30000, 30000, 3, 3 luaGauges1gauge = luaGauges1, "Lua Gauge 1", "lua", -30000,30000, 0, 0, 30000, 30000, 3, 3
luaGauges2gauge = luaGauges2, "Lua Gauge 2", "lua", -30000,30000, 0, 0, 30000, 30000, 3, 3 luaGauges2gauge = luaGauges2, "Lua Gauge 2", "lua", -30000,30000, 0, 0, 30000, 30000, 3, 3
luaGauges3gauge = luaGauges3, "Lua Gauge 3", "lua", -30000,30000, 0, 0, 30000, 30000, 3, 3
luaGauges4gauge = luaGauges4, "Lua Gauge 4", "lua", -30000,30000, 0, 0, 30000, 30000, 3, 3
luaGauges5gauge = luaGauges5, "Lua Gauge 5", "lua", -30000,30000, 0, 0, 30000, 30000, 3, 3
luaGauges6gauge = luaGauges6, "Lua Gauge 6", "lua", -30000,30000, 0, 0, 30000, 30000, 3, 3
luaGauges7gauge = luaGauges7, "Lua Gauge 7", "lua", -30000,30000, 0, 0, 30000, 30000, 3, 3
luaGauges8gauge = luaGauges8, "Lua Gauge 8", "lua", -30000,30000, 0, 0, 30000, 30000, 3, 3
gaugeCategory = Alternator PID gaugeCategory = Alternator PID
alternatorStatus_iTermGauge = alternatorStatus_iTerm,"Alternator PID iTerm", "", -10000.0,10000.0, -10000.0,10000.0, -10000.0,10000.0, 3,3 alternatorStatus_iTermGauge = alternatorStatus_iTerm,"Alternator PID iTerm", "", -10000.0,10000.0, -10000.0,10000.0, -10000.0,10000.0, 3,3