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

automation around outputs section #197

This commit is contained in:
rusefillc 2021-11-26 15:53:01 -05:00
parent 631d71cea7
commit 95a28e0dda
4 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
firmware/integration/output_channels.txt → firmware/console/binary/output_channels.txt
View File

@ -64,5 +64,8 @@ uint16_t rpmAcceleration;;"",1, 0, 0, 0, 0
uint16_t autoscale vBatt;;"",{1/@@PACK_MULT_VOLTAGE@@}, 0, 0, 0, 0 uint16_t autoscale vBatt;;"",{1/@@PACK_MULT_VOLTAGE@@}, 0, 0, 0, 0
uint16_t autoscale oilPressure;;"",{1/@@PACK_MULT_PRESSURE@@}, 0, 0, 0, 0
uint16_t autoscale vvtPositionB1I;;"",{1/@@PACK_MULT_ANGLE@@}, 0, 0, 0, 0
end_struct end_struct

14
firmware/console/binary/ts_outputs_generated.h
View File

@ -1,4 +1,4 @@
// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) integration/output_channels.txt Sun Nov 21 09:35:08 EST 2021 // this section was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) console/binary/output_channels.txt Fri Nov 26 15:52:23 EST 2021
// by class com.rusefi.output.CHeaderConsumer // by class com.rusefi.output.CHeaderConsumer
// begin // begin
#pragma once #pragma once
@ -181,8 +181,16 @@ struct ts_outputs_s {
* offset 38 * offset 38
*/ */
scaled_channel<uint16_t, 1000, 1> vBatt = (uint16_t)0; scaled_channel<uint16_t, 1000, 1> vBatt = (uint16_t)0;
/** total size 40*/ /**
* offset 40
*/
scaled_channel<uint16_t, 30, 1> oilPressure = (uint16_t)0;
/**
* offset 42
*/
scaled_channel<uint16_t, 50, 1> vvtPositionB1I = (uint16_t)0;
/** total size 44*/
}; };
// end // end
// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) integration/output_channels.txt Sun Nov 21 09:35:08 EST 2021 // this section was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) console/binary/output_channels.txt Fri Nov 26 15:52:23 EST 2021

3
firmware/console/binary/tunerstudio_outputs.h
View File

@ -44,9 +44,6 @@ enum class TsCalMode : uint8_t {
struct TunerStudioOutputChannels : ts_outputs_s { struct TunerStudioOutputChannels : ts_outputs_s {
/* see also [OutputChannels] in rusefi.input */ /* see also [OutputChannels] in rusefi.input */
scaled_pressure oilPressure; // 40
scaled_angle vvtPositionB1I; // 42
// Fuel math // Fuel math
scaled_channel<uint16_t, 1000> chargeAirMass; // 44 cylinder airmass in mg, 0-65 grams scaled_channel<uint16_t, 1000> chargeAirMass; // 44 cylinder airmass in mg, 0-65 grams
scaled_fuel_mass_mg crankingFuelMass; // 46 scaled_fuel_mass_mg crankingFuelMass; // 46

2
firmware/gen_output_channels.sh
View File

@ -8,7 +8,7 @@ java -DSystemOut.name=logs/gen_output_channels \
-jar ../java_tools/ConfigDefinition.jar \ -jar ../java_tools/ConfigDefinition.jar \
-cache_zip_file tunerstudio/generated/cache.zip \ -cache_zip_file tunerstudio/generated/cache.zip \
-prepend integration/rusefi_config.txt \ -prepend integration/rusefi_config.txt \
-definition integration/output_channels.txt \ -definition console/binary/output_channels.txt \
-cache . \ -cache . \
-with_c_defines false \ -with_c_defines false \
-c_destination console/binary/ts_outputs_generated.h -c_destination console/binary/ts_outputs_generated.h