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

fan indicators + test buttons (#3002) 

* sd bits

* rusefi.input

* second fan bit

* fans
This commit is contained in:
Matthew Kennedy 2021-07-20 20:26:06 -07:00 committed by GitHub
parent ee992b30dd
commit 6f80bc72ae
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 21 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -240,6 +240,7 @@ struct TunerStudioOutputChannels {
// Offset 246: bits
uint8_t sd_logging_internal : 1; // bit 0
uint8_t sd_msd : 1; // bit 1
uint8_t isFan2On : 1; // bit 2
int8_t tcuCurrentGear; // 247

1
firmware/console/status_loop.cpp
View File

@ -691,6 +691,7 @@ void updateTunerStudioState(TunerStudioOutputChannels *tsOutputChannels DECLARE_
tsOutputChannels->isFuelPumpOn = enginePins.fuelPumpRelay.getLogicValue();
tsOutputChannels->isFanOn = enginePins.fanRelay.getLogicValue();
tsOutputChannels->isFan2On = enginePins.fanRelay2.getLogicValue();
tsOutputChannels->isO2HeaterOn = enginePins.o2heater.getLogicValue();
tsOutputChannels->isIgnitionEnabledIndicator = ENGINE(limpManager).allowIgnition();
tsOutputChannels->isInjectionEnabledIndicator = ENGINE(limpManager).allowInjection();

2
firmware/controllers/bench_test.cpp
View File

@ -320,7 +320,7 @@ static void handleBenchCategory(uint16_t index) {
case CMD_TS_BENCH_FAN_RELAY:
fanBench();
return;
case CMD_TS_BENCH_AC_FAN_RELAY:
case CMD_TS_BENCH_FAN_RELAY_2:
fan2Bench();
return;
default:

2
firmware/integration/rusefi_config.txt
View File

@ -1867,7 +1867,7 @@ end_struct
#define CMD_TS_BENCH_STARTER_ENABLE_RELAY 2
#define CMD_TS_BENCH_STARTER_DISABLE_RELAY 3
#define CMD_TS_BENCH_FAN_RELAY 4
#define CMD_TS_BENCH_AC_FAN_RELAY 5
#define CMD_TS_BENCH_FAN_RELAY_2 5
#define CMD_TS_BENCH_AC_COMPRESSOR_RELAY 6
#define CMD_TS_BENCH_CHECK_ENGINE_LIGHT 7
#define CMD_TS_BENCH_IDLE_VALVE 8

22
firmware/tunerstudio/rusefi.input
View File

@ -367,6 +367,7 @@ enable2ndByteCanID = false
tuneCrc16 = scalar, U16, 244, "crc16", 1, 0
sd_logging_internal = bits, U08, 246, [0:0], "true", "false"
sd_msd = bits, U08, 246, [1:1], "true", "false"
ind_fan_2 = bits, U08, 246, [2:2], "true", "false"
; Transmission
tcuCurrentGear = scalar, S08, 247, "gear", 1, 0
@ -1195,7 +1196,8 @@ gaugeCategory = DynoView
indicator = { ind_hasFatalError }, "Config Error", "Config Error", white, black, red, black
; minor info
indicator = { ind_fan}, "fan off", "fan on", white, black, green, black
indicator = { ind_fan }, "fan off", "fan on", white, black, green, black
indicator = { ind_fan_2 }, "fan 2 off", "fan 2 on", white, black, green, black
indicator = { isCylinderCleanupActivated}, "no cyl cleanup", "cyl cleanup", white, black, yellow, black
indicator = { ind_fuel_pump}, "pump off", "pump on", white, black, green, black
indicator = { clutchUpState }, "Clutch Up", "clutch Up", white, black, red, black
@ -1690,8 +1692,8 @@ cmd_test_fuel_pump = "@@TS_IO_TEST_COMMAND_char@@@@CMD_TS_BENCH_CATEG
cmd_test_starter_relay = "@@TS_IO_TEST_COMMAND_char@@@@CMD_TS_BENCH_CATEGORY_16_hex@@@@CMD_TS_BENCH_STARTER_ENABLE_RELAY_16_hex@@"
cmd_test_starter_disable_relay = "@@TS_IO_TEST_COMMAND_char@@@@CMD_TS_BENCH_CATEGORY_16_hex@@@@CMD_TS_BENCH_STARTER_DISABLE_RELAY_16_hex@@"
cmd_test_ac_relay = "@@TS_IO_TEST_COMMAND_char@@@@CMD_TS_BENCH_CATEGORY_16_hex@@@@CMD_TS_BENCH_AC_COMPRESSOR_RELAY_16_hex@@"
cmd_test_radiator_fan = "@@TS_IO_TEST_COMMAND_char@@@@CMD_TS_BENCH_CATEGORY_16_hex@@@@CMD_TS_BENCH_FAN_RELAY_16_hex@@"
cmd_test_ac_radiator_fan = "@@TS_IO_TEST_COMMAND_char@@@@CMD_TS_BENCH_CATEGORY_16_hex@@@@CMD_TS_BENCH_AC_FAN_RELAY_16_hex@@"
cmd_test_fan_1 = "@@TS_IO_TEST_COMMAND_char@@@@CMD_TS_BENCH_CATEGORY_16_hex@@@@CMD_TS_BENCH_FAN_RELAY_16_hex@@"
cmd_test_fan_2 = "@@TS_IO_TEST_COMMAND_char@@@@CMD_TS_BENCH_CATEGORY_16_hex@@@@CMD_TS_BENCH_FAN_RELAY_2_16_hex@@"
cmd_test_check_engine_light = "@@TS_IO_TEST_COMMAND_char@@@@CMD_TS_BENCH_CATEGORY_16_hex@@@@CMD_TS_BENCH_CHECK_ENGINE_LIGHT_16_hex@@"
cmd_test_idle_valve = "@@TS_IO_TEST_COMMAND_char@@@@CMD_TS_BENCH_CATEGORY_16_hex@@@@CMD_TS_BENCH_IDLE_VALVE_16_hex@@"
cmd_test_hpfp_valve = "@@TS_IO_TEST_COMMAND_char@@@@CMD_TS_BENCH_CATEGORY_16_hex@@@@CMD_TS_BENCH_HPFP_VALVE_16_hex@@"
@ -2728,6 +2730,14 @@ cmd_set_engine_type_default = "@@TS_IO_TEST_COMMAND_char@@\x00\x31\x00\x00"
field = "Enable with AC", enableFan2WithAc
field = "Disable when engine stopped", disableFan2WhenStopped
dialog = fanTest, "", xAxis
commandButton = "Test Fan 1", cmd_test_fan_1
commandButton = "Test Fan 2", cmd_test_fan_2
indicatorPanel = fanIndicators, 2
indicator = { ind_fan }, "fan 1 off", "fan 1 on", white, black, green, black
indicator = { ind_fan_2 }, "fan 2 off", "fan 2 on", white, black, green, black
dialog = acSettings, "A/C Settings"
field = "A/C switch", acSwitch
field = "A/C switch mode", acSwitchMode
@ -2740,6 +2750,8 @@ cmd_set_engine_type_default = "@@TS_IO_TEST_COMMAND_char@@\x00\x31\x00\x00"
dialog = fanSetting, "Fan Settings"
panel = fan1Settings
panel = fan2Settings
panel = fanTest
panel = fanIndicators
dialog = fuelPump, "Fuel Pump"
field = "Pin", fuelPumpPin
@ -3464,8 +3476,8 @@ cmd_set_engine_type_default = "@@TS_IO_TEST_COMMAND_char@@\x00\x31\x00\x00"
; commandButton = "Come To Pit", cmd_call_from_pit
commandButton = "Main Relay", cmd_test_main_relay@@if_ts_show_main_relay
commandButton = "Fuel Pump", cmd_test_fuel_pump
commandButton = "Radiator Fan", cmd_test_radiator_fan
commandButton = "A/C Fan", cmd_test_ac_radiator_fan
commandButton = "Cooling Fan", cmd_test_fan_1
commandButton = "Cooling Fan 2", cmd_test_fan_2
commandButton = "A/C Relay", cmd_test_ac_relay
commandButton = "Check Engine", cmd_test_check_engine_light
commandButton = "Idle Air Valve", cmd_test_idle_valve