diff --git a/firmware/console/binary/output_channels.txt b/firmware/console/binary/output_channels.txt index bfeb2fa82c..6718a6b58f 100644 --- a/firmware/console/binary/output_channels.txt +++ b/firmware/console/binary/output_channels.txt @@ -147,4 +147,30 @@ uint16_t rpmAcceleration;;"",1, 0, 0, 0, 0 ! These may or may not be the same value, depending on mode uint16_t autoscale fuelingLoad;;"",{1/100}, 0, 0, 0, 0 + uint16_t autoscale ignitionLoad;;"",{1/100}, 0, 0, 0, 0 +! we want a hash of engineMake+engineCode+vehicleName in the log file in order to match TS logs to rusEFI Online tune + uint16_t autoscale engineMakeCodeNameCrc16;;"",{1/1}, 0, 0, 0, 0 +! Errors + uint32_t autoscale totalTriggerErrorCounter;;"",{1/1}, 0, 0, 0, 0 + uint32_t autoscale orderingErrorCounter;;"",{1/1}, 0, 0, 0, 0 + + uint16_t autoscale warningCounter;;"",{1/1}, 0, 0, 0, 0 + uint16_t autoscale lastErrorCode;;"",{1/1}, 0, 0, 0, 0 + + uint16_t[8] recentErrorCodes;;"", 1, 0, 0, 0, 0 + + float autoscale debugFloatField1;;"", 1, 0, 0, 0, 0 + float autoscale debugFloatField2;;"", 1, 0, 0, 0, 0 + float autoscale debugFloatField3;;"", 1, 0, 0, 0, 0 + float autoscale debugFloatField4;;"", 1, 0, 0, 0, 0 + float autoscale debugFloatField5;;"", 1, 0, 0, 0, 0 + float autoscale debugFloatField6;;"", 1, 0, 0, 0, 0 + float autoscale debugFloatField7;;"", 1, 0, 0, 0, 0 + + uint32_t autoscale debugIntField1;;"", 1, 0, 0, 0, 0 + uint32_t autoscale debugIntField2;;"", 1, 0, 0, 0, 0 + uint32_t autoscale debugIntField3;;"", 1, 0, 0, 0, 0 + uint16_t autoscale debugIntField4;;"", 1, 0, 0, 0, 0 + uint16_t autoscale debugIntField5;;"", 1, 0, 0, 0, 0 + end_struct diff --git a/firmware/console/binary/ts_outputs_generated.h b/firmware/console/binary/ts_outputs_generated.h index 6e66d55e7c..7bfdbe6460 100644 --- a/firmware/console/binary/ts_outputs_generated.h +++ b/firmware/console/binary/ts_outputs_generated.h @@ -1,4 +1,4 @@ -// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) console/binary/output_channels.txt Fri Nov 26 19:33:53 EST 2021 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) console/binary/output_channels.txt Fri Nov 26 20:52:04 EST 2021 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -362,8 +362,84 @@ struct ts_outputs_s { * offset 134 */ scaled_channel fuelingLoad = (uint16_t)0; - /** total size 136*/ + /** + * offset 136 + */ + scaled_channel ignitionLoad = (uint16_t)0; + /** + * offset 138 + */ + scaled_channel engineMakeCodeNameCrc16 = (uint16_t)0; + /** + * offset 140 + */ + scaled_channel totalTriggerErrorCounter = (uint32_t)0; + /** + * offset 144 + */ + scaled_channel orderingErrorCounter = (uint32_t)0; + /** + * offset 148 + */ + scaled_channel warningCounter = (uint16_t)0; + /** + * offset 150 + */ + scaled_channel lastErrorCode = (uint16_t)0; + /** + * offset 152 + */ + uint16_t recentErrorCodes[8]; + /** + * offset 168 + */ + scaled_channel debugFloatField1 = (float)0; + /** + * offset 172 + */ + scaled_channel debugFloatField2 = (float)0; + /** + * offset 176 + */ + scaled_channel debugFloatField3 = (float)0; + /** + * offset 180 + */ + scaled_channel debugFloatField4 = (float)0; + /** + * offset 184 + */ + scaled_channel debugFloatField5 = (float)0; + /** + * offset 188 + */ + scaled_channel debugFloatField6 = (float)0; + /** + * offset 192 + */ + scaled_channel debugFloatField7 = (float)0; + /** + * offset 196 + */ + scaled_channel debugIntField1 = (uint32_t)0; + /** + * offset 200 + */ + scaled_channel debugIntField2 = (uint32_t)0; + /** + * offset 204 + */ + scaled_channel debugIntField3 = (uint32_t)0; + /** + * offset 208 + */ + scaled_channel debugIntField4 = (uint16_t)0; + /** + * offset 210 + */ + scaled_channel debugIntField5 = (uint16_t)0; + /** total size 212*/ }; // end -// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) console/binary/output_channels.txt Fri Nov 26 19:33:53 EST 2021 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) console/binary/output_channels.txt Fri Nov 26 20:52:04 EST 2021 diff --git a/firmware/console/binary/tunerstudio_outputs.h b/firmware/console/binary/tunerstudio_outputs.h index 916eb5659a..81dba0df86 100644 --- a/firmware/console/binary/tunerstudio_outputs.h +++ b/firmware/console/binary/tunerstudio_outputs.h @@ -44,31 +44,6 @@ enum class TsCalMode : uint8_t { struct TunerStudioOutputChannels : ts_outputs_s { /* see also [OutputChannels] in rusefi.input */ - scaled_channel ignitionLoad; // 136 - - // we want a hash of engineMake+engineCode+vehicleName in the log file in order to match TS logs to rusEFI Online tune - scaled_channel engineMakeCodeNameCrc16; // 138 - // Errors - scaled_channel totalTriggerErrorCounter; // 140 - int orderingErrorCounter; // 144 - scaled_channel warningCounter; // 148 - scaled_channel lastErrorCode; // 150 - int16_t recentErrorCodes[8]; // 152-166 - - // Debug - scaled_channel debugFloatField1; // 168 - scaled_channel debugFloatField2; - scaled_channel debugFloatField3; - scaled_channel debugFloatField4; - scaled_channel debugFloatField5; - scaled_channel debugFloatField6; - scaled_channel debugFloatField7; - scaled_channel debugIntField1; - scaled_channel debugIntField2; - scaled_channel debugIntField3; - scaled_channel debugIntField4; - scaled_channel debugIntField5; // 210 - // accelerometer scaled_percent accelerationX; // 212 scaled_percent accelerationY; // 214