diff --git a/firmware/console/binary/generated/total_live_data_generated.h b/firmware/console/binary/generated/total_live_data_generated.h index 52d5866b97..36fb64f716 100644 --- a/firmware/console/binary/generated/total_live_data_generated.h +++ b/firmware/console/binary/generated/total_live_data_generated.h @@ -1,2 +1,2 @@ // generated by gen_live_documentation.sh / UsagesReader.java -#define TS_TOTAL_OUTPUT_SIZE 1016 \ No newline at end of file +#define TS_TOTAL_OUTPUT_SIZE 1032 \ No newline at end of file diff --git a/firmware/console/binary/output_channels.txt b/firmware/console/binary/output_channels.txt index 3bc99b4b86..32967ac23c 100644 --- a/firmware/console/binary/output_channels.txt +++ b/firmware/console/binary/output_channels.txt @@ -241,6 +241,7 @@ uint16_t rpmAcceleration;dRPM;"RPM/s",1, 0, 0, 5, 0 uint16_t turboSpeed;@@GAUGE_NAME_TURBO_SPEED@@;"hz",1, 0, 0, 0, 0 struct pid_status_s + float autoscale pTerm;;"", 1, 0, -50000, 50000, 2 int16_t autoscale iTerm;;"", 0.01, 0, -327, 327, 2 int16_t autoscale dTerm;;"", 0.01, 0, -327, 327, 2 int16_t autoscale output;;"", 0.01, 0, -327, 327, 2 diff --git a/firmware/console/binary/output_channels_generated.h b/firmware/console/binary/output_channels_generated.h index d3bf805352..65de14451a 100644 --- a/firmware/console/binary/output_channels_generated.h +++ b/firmware/console/binary/output_channels_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 Wed Jun 29 03:16:45 EDT 2022 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) console/binary\output_channels.txt Fri Jul 08 09:42:21 EDT 2022 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -8,25 +8,29 @@ struct pid_status_s { /** * offset 0 */ - scaled_channel iTerm = (int16_t)0; - /** - * offset 2 - */ - scaled_channel dTerm = (int16_t)0; + scaled_channel pTerm = (float)0; /** * offset 4 */ - scaled_channel output = (int16_t)0; + scaled_channel iTerm = (int16_t)0; /** * offset 6 */ - scaled_channel error = (int16_t)0; + scaled_channel dTerm = (int16_t)0; /** * offset 8 */ + scaled_channel output = (int16_t)0; + /** + * offset 10 + */ + scaled_channel error = (int16_t)0; + /** + * offset 12 + */ uint32_t resetCounter = (uint32_t)0; }; -static_assert(sizeof(pid_status_s) == 12); +static_assert(sizeof(pid_status_s) == 16); // start of output_channels_s struct output_channels_s { @@ -1253,41 +1257,41 @@ struct output_channels_s { */ pid_status_s alternatorStatus; /** - * offset 452 + * offset 456 */ pid_status_s idleStatus; /** - * offset 464 + * offset 472 */ pid_status_s etbStatus; /** - * offset 476 + * offset 488 */ pid_status_s boostStatus; /** * aux speed 1 s - * offset 488 + * offset 504 */ uint16_t auxSpeed1 = (uint16_t)0; /** * aux speed 2 s - * offset 490 + * offset 506 */ uint16_t auxSpeed2 = (uint16_t)0; /** * @@GAUGE_NAME_ISS@@ RPM - * offset 492 + * offset 508 */ scaled_channel ISSValue = (uint16_t)0; /** - * offset 494 + * offset 510 */ uint8_t unusedAtTheEnd[78]; }; -static_assert(sizeof(output_channels_s) == 572); +static_assert(sizeof(output_channels_s) == 588); // end -// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) console/binary/output_channels.txt Wed Jun 29 03:16:45 EDT 2022 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) console/binary\output_channels.txt Fri Jul 08 09:42:21 EDT 2022