diff --git a/firmware/console/binary/output_channels.txt b/firmware/console/binary/output_channels.txt index 78498bed2d..43f27e7d45 100644 --- a/firmware/console/binary/output_channels.txt +++ b/firmware/console/binary/output_channels.txt @@ -89,7 +89,7 @@ uint16_t rpmAcceleration;dRPM;"RPM acceleration",1, 0, 0, 5, 2 uint16_t revolutionCounterSinceStart;;"",1, 0, 0, 0, 0 - uint16_t canReadCounter;CAN: Rx;"",1, 0, 0, 0, 0 + uint16_t canReadCounter;@@GAUGE_NAME_CAN_READ_OK@@;"",1, 0, 0, 64000, 0 int16_t autoscale tpsAccelFuel;@@GAUGE_NAME_FUEL_TPS_EXTRA@@;"ms",{1/@@PACK_MULT_MS@@}, 0, 0, 0, 3 ! Ignition uint8_t currentIgnitionMode;@@GAUGE_NAME_IGNITION_MODE@@ @@ -272,8 +272,8 @@ uint16_t rpmAcceleration;dRPM;"RPM acceleration",1, 0, 0, 5, 2 uint16_t maxLockedDuration;;"us", 1, 0, 0, 65535, 0 - uint16_t canWriteOk;CAN: Tx OK;"", 1, 0, -10000, 10000, 3 - uint16_t canWriteNotOk;CAN: Tx err;"", 1, 0, -10000, 10000, 3 + uint16_t canWriteOk;@@GAUGE_NAME_CAN_WRITE_OK@@;"", 1, 0, 0, 64000, 0 + uint16_t canWriteNotOk;@@GAUGE_NAME_CAN_WRITE_ERR@@;"", 1, 0, 0, 64000, 0 uint32_t triggerPrimaryFall;;"", 1, 0, -10000, 10000, 3 uint32_t triggerPrimaryRise;;"", 1, 0, -10000, 10000, 3 diff --git a/firmware/integration/rusefi_config_shared.txt b/firmware/integration/rusefi_config_shared.txt index cb18cfee81..80661d9d1b 100644 --- a/firmware/integration/rusefi_config_shared.txt +++ b/firmware/integration/rusefi_config_shared.txt @@ -43,6 +43,10 @@ #define GAUGE_NAME_TRG_GAP "Trigger Sync Latest Ratio" #define GAUGE_NAME_ADJUSTED_TIMING "Timing: ignition" +#define GAUGE_NAME_CAN_READ_OK "CAN: Rx" +#define GAUGE_NAME_CAN_WRITE_OK "CAN: Tx OK" +#define GAUGE_NAME_CAN_WRITE_ERR "CAN: Tx err" + #define GAUGE_CATEGORY_TIMING "Timing" #define GAUGE_CATEGORY_SYNC "Sync" #define GAUGE_CATEGORY_FUEL_MATH "Fuel: math" diff --git a/firmware/tunerstudio/rusefi.input b/firmware/tunerstudio/rusefi.input index 7a77283cbf..6a8b7d86bb 100644 --- a/firmware/tunerstudio/rusefi.input +++ b/firmware/tunerstudio/rusefi.input @@ -1305,9 +1305,9 @@ gaugeCategory = Etb PID wgStatus_resetCounterGauge = wastegateDcStatus_resetCounter,"WG PID resetCounter", "", 0,100.0, 0,100.0, 0,100.0, 0,0 gaugeCategory = CAN - canReadCounterGauge = canReadCounter,"canReadCounter", "", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 - canWriteOkGauge = canWriteOk,"canWriteOk", "", -10000.0,10000.0, -10000.0,10000.0, -10000.0,10000.0, 3,3 - canWriteNotOkGauge = canWriteNotOk,"canWriteNotOk", "", -10000.0,10000.0, -10000.0,10000.0, -10000.0,10000.0, 3,3 + canReadCounterGauge = canReadCounter,@@GAUGE_NAME_CAN_READ_OK@@, "", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 + canWriteOkGauge = canWriteOk,@@GAUGE_NAME_CAN_WRITE_OK@@, "", -10000.0,10000.0, -10000.0,10000.0, -10000.0,10000.0, 3,3 + canWriteNotOkGauge = canWriteNotOk,@@GAUGE_NAME_CAN_WRITE_ERR@@, "", -10000.0,10000.0, -10000.0,10000.0, -10000.0,10000.0, 3,3 gaugeCategory = GDI di_nextStartGauge = di_nextStart,"DI: next start", "v", 0.0,100.0, 0.0,100.0, 0.0,100.0, 0,0