diff --git a/firmware/config/boards/microrusefi/prepend.txt b/firmware/config/boards/microrusefi/prepend.txt index 9ccfdeab99..b8f924aff9 100644 --- a/firmware/config/boards/microrusefi/prepend.txt +++ b/firmware/config/boards/microrusefi/prepend.txt @@ -16,6 +16,7 @@ #define ts_show_tunerstudio_port false #define ts_show_main_relay false #define ts_show_main_relay_microRusEFI_message true +#define ts_show_can2 false #define show_test_presets false #define show_Frankenso_presets false diff --git a/firmware/config/boards/proteus/prepend.txt b/firmware/config/boards/proteus/prepend.txt index cf9b16a0f8..f1fee7c112 100644 --- a/firmware/config/boards/proteus/prepend.txt +++ b/firmware/config/boards/proteus/prepend.txt @@ -10,3 +10,4 @@ #define ts_show_sd_card false #define ts_show_can_pins false #define ts_show_tunerstudio_port false +#define ts_show_can2 false \ No newline at end of file diff --git a/firmware/integration/rusefi_config.txt b/firmware/integration/rusefi_config.txt index 88ed2b32af..88cda4b493 100644 --- a/firmware/integration/rusefi_config.txt +++ b/firmware/integration/rusefi_config.txt @@ -682,7 +682,7 @@ custom adc_channel_mode_e 4 bits, U32, @OFFSET@, [0:1], "Off", "Slow", "Fas pin_input_mode_e throttlePedalUpPinMode; uint8_t fsio_visible acIdleExtraOffset;+Additional idle PID offset while A/C is active;"Percent", 1, 0, 0, 255, 0 - int unusedAt712;;"units", 1, 0, -20, 100, 0 + int can2SleepPeriodMs;CANbus thread period, ms;"ms", 1, 0, 0, 1000.0, 2 int unusedAt716;;"units", 1, 0, -20, 100, 0 int unusedAt720;;"units", 1, 0, -20, 100, 0 int unusedAt724;;"units", 1, 0, -20, 100, 0 @@ -1118,8 +1118,21 @@ int16_t tps2Max;Full throttle#2. tpsMax value as 10 bit ADC value. Not Voltage!\ can_baudrate_e canBaudRate; set can_baudrate uint8_t un1used_former_warmup_target_afr;;"units", 1, 0, -20, 100, 0 can_baudrate_e can2BaudRate; + uint8_t unused_former_warmup_target_afr2;;"units", 1, 0, -20, 100, 0 - uint8_t[18] unused_former_warmup_target_afr;;"units", 1, 0, -20, 100, 0 + uint32_t verboseCan2BaseAddress;;"", 1, 0, 0, 536870911, 0 + bit enableVerboseCan2Tx;+CAN broadcast using custom rusEFI protocol\nenable can_broadcast/disable can_broadcast + bit can2ReadEnabled;enable can_read/disable can_read + bit can2WriteEnabled;enable can_write/disable can_write + bit unused1126 + bit unused1127 + bit unused1128 + bit unused1129 + bit unused1130 + can_nbc_e can2NbcType;set can_mode X + brain_pin_e can2TxPin;set_can2_tx_pin X + brain_pin_e can2RxPin;set_can2_rx_pin X + uint8_t[6] unused_former_warmup_target_afr;;"units", 1, 0, -20, 100, 0 float boostCutPressure;kPa value at which we need to cut fuel and spark, 0 if not enabled;"kPa", 1, 0, 0, 500, 0 @@ -1699,6 +1712,7 @@ end_struct #define ts_show_tunerstudio_port true #define ts_show_trigger_comparator false #define ts_show_auxserial_pins true +#define ts_show_can2 true #define show_test_presets true #define show_Frankenso_presets true diff --git a/firmware/tunerstudio/rusefi.input b/firmware/tunerstudio/rusefi.input index 15113c0dcf..5643cd795a 100644 --- a/firmware/tunerstudio/rusefi.input +++ b/firmware/tunerstudio/rusefi.input @@ -2497,6 +2497,17 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" field = "RX pin", canRxPin @@if_ts_show_can_pins field = "TX pin", canTxPin @@if_ts_show_can_pins + dialog = canBus2, "Secondary CAN Bus" + field = "Can Read Enabled", can2ReadEnabled + field = "Can Write Enabled", can2WriteEnabled + field = "Can Nbc Type", can2NbcType + field = "Can Baud Rate", can2BaudRate + field = "Enable rusEFI CAN broadcast", enableVerboseCan2Tx + field = "rusEfi CAN data base address", verboseCan2BaseAddress + field = "Can Sleep Period", can2SleepPeriodMs + field = "RX pin", can2RxPin @@if_ts_show_can_pins + field = "TX pin", can2TxPin @@if_ts_show_can_pins + dialog = auxSerial, "AUX Serial" field = "RX pin", auxSerialRxPin @@if_ts_show_auxserial_pins field = "TX pin", auxSerialTxPin @@if_ts_show_auxserial_pins @@ -2537,6 +2548,7 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" field = "ADC vRef voltage", adcVcc panel = tsPort @@if_ts_show_tunerstudio_port panel = canBus + panel = canBus2 @@if_ts_show_can2 panel = auxSerial panel = sdCard @@if_ts_show_sd_card panel = gpsReceiver @@if_ts_show_gps