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

Merge pull request #1663 from ksmola/second_can 

added secondary can config
This commit is contained in:
rusefillc 2020-08-05 07:58:13 -04:00 committed by GitHub
parent 530439c424 c95cbcbb3e
commit 82da04ac07
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 30 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
firmware/config/boards/microrusefi/prepend.txt
View File

@ -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

1
firmware/config/boards/proteus/prepend.txt
View File

@ -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

18
firmware/integration/rusefi_config.txt
View File

@ -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

12
firmware/tunerstudio/rusefi.input
View File

@ -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