Merging is often not a piece of cake, these comments with the timestamp of when the tool has generated a file are not helping. Anyway, some progress, please take my latest versions.
1) engine_configuration_generates_structures.h rusefi_config.txt rusefi.ini should be in sync with your field comments, can you please take my version with my dates to unify?
2) adc_inputs.cpp & allsensors.cpp looks like the difference is just a new line somewhere, do we really need this?
3) engine_configuration.cpp should be in sync, I believe
Code: Select all
+ boardConfiguration->clutchDownPin = GPIO_UNASSIGNED;
+ boardConfiguration->clutchDownPinMode = PI_PULLUP;
+ boardConfiguration->clutchUpPin = GPIO_UNASSIGNED;
+ boardConfiguration->clutchUpPinMode = PI_PULLUP;
is not needed since same stuff is already set by prepareVoidConfiguration() method, but I could be wrong
4) main_trigger_callback.cpp something is weird around assigning true and false to boardConfiguration->enabledStep1Limiter. These are supposed to be persistent configuration settings, we should not be changing these dynamically. For dynamic stuff, the best way is probably a new field on EngineState?