@@ -445,9 +445,15 @@ dialog = heater_settings, "Heater Settings"
445445; AFR CAN SETTINGS
446446;
447447
448+ dialog = padding
449+ field = " " , {}, {1}, {1}
450+
448451dialog = invalid_can_id
449452 displayOnlyField = " !Invalid CAN ID"
450453
454+ dialog = same_can_id
455+ displayOnlyField = " !Same CAN ID on both channels!"
456+
451457dialog = haltech_afr0_can_settings, " " , yAxis
452458 settingSelector = " Device Id"
453459 settingOption = " A" , ExtraCanAfrIdx0 =0
@@ -515,17 +521,28 @@ dialog = afr1_can_settings, "AFR 1 (right) channel CAN Settings", yAxis
515521 field = " "
516522 panel = extra_can_afr1_settings
517523
518- dialog = can_afr_settings , " CAN AFR Settings" , xAxis
524+ dialog = can_afr_settings_wrapped , " CAN AFR Settings" , xAxis
519525 panel = afr0_can_settings
520526 panel = afr1_can_settings
521527
528+ dialog = can_afr_settings " " , border
529+ panel = can_afr_settings_wrapped, North
530+
531+
522532;
523533; EGT CAN SETTINGS
524534;
525535
536+ dialog = extra_can_egt_channel0_enable, " "
537+ field = " CAN output for channel 0 (left)" , ExtraCanEgtTx0En
538+
539+ dialog = extra_can_egt_channel1_enable, " "
540+ field = " CAN output for channel 1 (right)" , ExtraCanEgtTx1En
541+
526542dialog = extra_can_egt_channel_enable, " " , xAxis
527- field = " EGT 0 (left) channel" , ExtraCanEgtTx0En
528- field = " EGT 1 (right) channel" , ExtraCanEgtTx1En
543+ panel = extra_can_egt_channel0_enable
544+ panel = padding
545+ panel = extra_can_egt_channel1_enable
529546
530547dialog = extra_can_egt_device_id, " " , yAxis
531548 field = " Dev index" , ExtraCanEgtIdx0
@@ -546,19 +563,25 @@ dialog = aemnet0305_egt1_can_settings, "", yAxis
546563 field = " Dev index" , ExtraCanEgtIdx1
547564 displayOnlyField = " Device ID: 0xA0305 + IDX [0-5]" , Egt1CanId, { 1 }, { ExtraCanEgtTx1 == 1 }, displayInHex ; AEMnet 0305 format
548565
549- dialog = aemnet0305_egt_can_settings, " " , border
550- panel = aemnet0305_egt0_can_settings, East
551- panel = aemnet0305_egt1_can_settings, West
566+ dialog = aemnet0305_egt_can_settings, " " , xAxis
567+ panel = aemnet0305_egt0_can_settings, { ExtraCanEgtTx0En == 1 }
568+ panel = padding
569+ panel = aemnet0305_egt1_can_settings, { ExtraCanEgtTx1En == 1 }
552570
553- dialog = extra_can_egt_settings, " " , yAxis
554- field = " Extra Can Output:"
571+ dialog = extra_can_egt_protocol, " " , yAxis
555572 field = " Protocol" , ExtraCanEgtTx0
573+
574+ dialog = extra_can_egt_settings, " Extra Can Output:" , yAxis
575+ panel = extra_can_egt_protocol
576+ panel = padding
556577 panel = extra_can_egt_channel_enable, { 1 }, { ExtraCanEgtTx0 > 0 }
557578 panel = extra_can_egt_device_id, { 1 }, { ExtraCanEgtTx0 > 0 && ExtraCanEgtTx0 != 1 }
579+
558580 panel = aemnet0305_egt_can_settings, { 1 }, { ExtraCanEgtTx0 > 0 && ExtraCanEgtTx0 == 1 } ; AEMnet 0305 needs separate offsets for channel 0 and 1
581+ panel = same_can_id, {1}, { (ExtraCanEgtTx0 == 1) && (ExtraCanEgtTx1 == 1) && (ExtraCanEgtTx0En == 1) && (ExtraCanEgtTx1En == 1) && (ExtraCanEgtIdx0 == ExtraCanEgtIdx1) }
559582
560- dialog = can_egt_settings, " CAN EGT Settings"
561- panel = extra_can_egt_settings
583+ dialog = can_egt_settings, " CAN EGT Settings" , border
584+ panel = extra_can_egt_settings, North
562585
563586dialog = auxOut0, " AUX analog out 0 Settings"
564587 field = " Signal" , Aux0InputSel
0 commit comments