better file name to actually reflect what the content is about
This commit is contained in:
parent
b1bc340ffc
commit
f60bd6c683
|
@ -21,7 +21,6 @@
|
|||
*.txt text eol=lf
|
||||
*.yaml text eol=lf
|
||||
*.ini text eol=lf
|
||||
*.input text eol=lf
|
||||
*.rules text eol=lf
|
||||
|
||||
# KiCad files
|
||||
|
|
|
@ -19,11 +19,11 @@
|
|||
* todo https://github.com/rusefi/rusefi/issues/197
|
||||
* three locations have to be changed manually
|
||||
* 1) we inherit from generated ts_outputs_s based on output_channels.txt
|
||||
* 2) '[OutputChannels]' block in rusefi.input
|
||||
* 2) '[OutputChannels]' block in tunerstudio.template.ini
|
||||
* 3) com.rusefi.core.Sensor enum in rusEFI console source code
|
||||
* 4) static constexpr LogField fields[] SD card logging
|
||||
*
|
||||
* see also [OutputChannels] in rusefi.input
|
||||
* see also [OutputChannels] in tunerstudio.template.ini
|
||||
* see also TS_OUTPUT_SIZE in rusefi_config.txt
|
||||
*/
|
||||
struct TunerStudioOutputChannels : output_channels_s { };
|
||||
|
|
|
@ -943,7 +943,7 @@ void doInitElectronicThrottle() {
|
|||
printf("doInitElectronicThrottle %s\n", boolToString(hasPedal));
|
||||
#endif // EFI_UNIT_TEST
|
||||
|
||||
// these status flags are consumed by TS see rusefi.input TODO should those be outputs/live data not configuration?!
|
||||
// these status flags are consumed by TS see tunerstudio.template.ini TODO should those be outputs/live data not configuration?!
|
||||
engineConfiguration->etb1configured = engineConfiguration->etb2configured = false;
|
||||
|
||||
// todo: technical debt: we still have DC motor code initialization in ETB-specific file while DC motors are used not just as ETB
|
||||
|
|
|
@ -435,7 +435,7 @@ int getSavedBenchTestPinStates(uint32_t durationsInStateMs[2]) {
|
|||
}
|
||||
|
||||
static void handleCommandX14(uint16_t index) {
|
||||
// todo: define ts_14_command magic constants and use those in rusefi.input file!
|
||||
// todo: define ts_14_command magic constants and use those in tunerstudio.template.ini file!
|
||||
switch (index) {
|
||||
case TS_GRAB_TPS_CLOSED:
|
||||
grabTPSIsClosed();
|
||||
|
|
|
@ -4,7 +4,7 @@
|
|||
|
||||
#include <cstdint>
|
||||
|
||||
// Keep this list in sync with fuelIgnCutCodeList in rusefi.input!
|
||||
// Keep this list in sync with fuelIgnCutCodeList in tunerstudio.template.ini!
|
||||
enum class ClearReason : uint8_t {
|
||||
None, // 0
|
||||
Fatal, // 1
|
||||
|
@ -27,8 +27,8 @@ enum class ClearReason : uint8_t {
|
|||
GdiComms,
|
||||
PleaseBrake,
|
||||
|
||||
// Keep this list in sync with fuelIgnCutCodeList in rusefi.input!
|
||||
// todo: add a code generator between ClearReason and fuelIgnCutCodeList in rusefi.input
|
||||
// Keep this list in sync with fuelIgnCutCodeList in tunerstudio.template.ini!
|
||||
// todo: add a code generator between ClearReason and fuelIgnCutCodeList in tunerstudio.template.ini
|
||||
};
|
||||
|
||||
enum class TpsState : uint8_t {
|
||||
|
@ -43,7 +43,7 @@ enum class TpsState : uint8_t {
|
|||
NotConfigured, // 8
|
||||
Redundancy, // 9
|
||||
IntermittentPps, // 10
|
||||
// keep this list in sync with etbCutCodeList in rusefi.input!
|
||||
// keep this list in sync with etbCutCodeList in tunerstudio.template.ini!
|
||||
};
|
||||
|
||||
// Only allows clearing the value, but never resetting it.
|
||||
|
|
|
@ -41,7 +41,7 @@ float getAfr(SensorType type) {
|
|||
+ engineConfiguration->egoValueShift;
|
||||
}
|
||||
|
||||
// this method is only used for canned tunes now! User-facing selection is defined in rusefi.input using settingSelector
|
||||
// this method is only used for canned tunes now! User-facing selection is defined in tunerstudio.template.ini using settingSelector
|
||||
static void initEgoSensor(afr_sensor_s *sensor, ego_sensor_e type) {
|
||||
|
||||
switch (type) {
|
||||
|
|
|
@ -156,7 +156,7 @@ static uint8_t getTSErrorCode(brain_pin_diag_e diag)
|
|||
* 0 - output is not used
|
||||
* 1 - ok status/no diagnostic available (TODO: separate codes)
|
||||
* >1 - see brain_pin_diag_e, first least significant 1-bit position + 1 *
|
||||
* Keep in sync with outputDiagErrorList in rusefi.input
|
||||
* Keep in sync with outputDiagErrorList in tunerstudio.template.ini
|
||||
* Note:
|
||||
* diag can be combination of few errors,
|
||||
* while we report only one error to simplify hadling on TS side
|
||||
|
|
|
@ -7,8 +7,8 @@
|
|||
!
|
||||
! The format is unique to rusEFI but there is a guide to the format available in java_tools/config_definition/RusefiConfigGrammar.g4
|
||||
!
|
||||
! This file is used in combination with tunerstudio/rusefi.input to generate the .ini files used by turner TunerStudio.
|
||||
! The easiest way to find a specific variable within this config is to search within rusefi.input for the on screen text from tuner studio
|
||||
! This file is used in combination with tunerstudio/tunerstudio.template.ini to generate the .ini files used by turner TunerStudio.
|
||||
! The easiest way to find a specific variable within this config is to search within tunerstudio.template.ini for the on screen text from tuner studio
|
||||
! this should provide the actual variable name, for example searching for "Number of Cylinders" will provide the variable "cylindersCount".
|
||||
! Then you can search for "cylindersCount" in this file to find the definition.
|
||||
!
|
||||
|
|
|
@ -12,5 +12,5 @@
|
|||
#define TRIGGER_WITH_SYNC "isSynchronizationNeeded"
|
||||
#define TRIGGER_SYNC_EDGE "syncEdge"
|
||||
|
||||
! this is shared between rusefi.input and FiringOrderTSLogic
|
||||
#define IGNITION_OUTPUT "Ignition Output"
|
||||
! this is shared between tunerstudio.template.ini and FiringOrderTSLogic
|
||||
#define IGNITION_OUTPUT "Ignition Output"
|
||||
|
|
|
@ -92,7 +92,7 @@
|
|||
* [Changing gauge limits](http://www.tunerstudio.com/index.php/manuals/63-changing-gauge-limits)
|
||||
*
|
||||
* Definition of the Tunerstudio configuration interface, gauges, and indicators
|
||||
* tunerstudio/rusefi.input
|
||||
* tunerstudio/tunerstudio.template.ini
|
||||
*
|
||||
* @section config Persistent Configuration
|
||||
*
|
||||
|
|
|
@ -7,7 +7,7 @@ SIG_FILE = $(PROJECT_DIR)/$(META_OUTPUT_ROOT_FOLDER)tunerstudio/generated/signat
|
|||
CONFIG_INPUTS = \
|
||||
$(SIG_FILE) \
|
||||
$(PROJECT_DIR)/integration/rusefi_config.txt \
|
||||
$(PROJECT_DIR)/tunerstudio/rusefi.input \
|
||||
$(PROJECT_DIR)/tunerstudio/tunerstudio.template.ini \
|
||||
$(PROJECT_DIR)/console/binary/generated/output_channels.ini \
|
||||
$(PROJECT_DIR)/console/binary/generated/data_logs.ini \
|
||||
$(PROJECT_DIR)/console/binary/generated/fancy_content.ini \
|
||||
|
|
|
@ -16,7 +16,7 @@ directories .
|
|||
|
||||
```rusefi*.ini``` files are generated based on the following four inputs:
|
||||
1) ```rusefi_config.txt``` contains configuration region definition in proprietary text format.
|
||||
2) ```rusefi.input``` contains the UI - all the menus and dialogs. UI definition starts at ```menuDialog = main```
|
||||
2) ```tunerstudio.template.ini``` contains the UI - all the menus and dialogs. UI definition starts at ```menuDialog = main```
|
||||
line - here you will see all top level menus defined with internal IDs and visible text labels.
|
||||
3) ```mapping.yaml``` is a minor detail related to how pins are named in drop downs
|
||||
4) ```prepend.txt``` is a minor detail which allows you to hide elements of the UI using ```@@if_XXX``` syntax.
|
||||
|
@ -28,4 +28,4 @@ On Windows this may be run with ```gen_config.bat```.
|
|||
|
||||
Q: how do I offer my changes to TS project?
|
||||
|
||||
A: please PR only rusefi.input. Once merged, gen_config.bat would be executed automatically and results would be pushed by automation.
|
||||
A: please PR only tunerstudio.template.ini. Once merged, gen_config.bat would be executed automatically and results would be pushed by automation.
|
||||
|
|
|
@ -2,7 +2,7 @@
|
|||
;
|
||||
; This file has been generated by invoking gen_config.bat.
|
||||
; The input files are
|
||||
; rusefi.input the common template
|
||||
; tunerstudio.template.ini the common template
|
||||
; rusefi_config.txt the project specific file
|
||||
;
|
||||
; In TunerStudio some fields have little question mark on the left of the name for additional field tips.
|
|
@ -14,7 +14,7 @@ import static com.rusefi.util.IoUtils.CHARSET;
|
|||
* [Constants]
|
||||
*/
|
||||
public class TSProjectConsumer implements ConfigurationConsumer {
|
||||
private static final String TS_FILE_INPUT_NAME = "rusefi.input";
|
||||
private static final String TS_FILE_INPUT_NAME = "tunerstudio.template.ini";
|
||||
private static final String CONFIG_DEFINITION_START = "CONFIG_DEFINITION_START";
|
||||
private static final String CONFIG_DEFINITION_END = "CONFIG_DEFINITION_END";
|
||||
private static final String TS_CONDITION = "@@if_";
|
||||
|
@ -70,7 +70,7 @@ public class TSProjectConsumer implements ConfigurationConsumer {
|
|||
}
|
||||
|
||||
/**
|
||||
* rusefi.input has all the content of the future .ini file with the exception of data page
|
||||
* tunerstudio.template.ini has all the content of the future .ini file with the exception of data page
|
||||
* TODO: start generating [outputs] section as well
|
||||
*/
|
||||
private TsFileContent readTsTemplateInputFile(String tsPath) throws IOException {
|
||||
|
|
|
@ -47,8 +47,8 @@ public class TriggerWheelTSLogic {
|
|||
});
|
||||
|
||||
/*
|
||||
* these are templated into rusefi.input file
|
||||
* note that TT_TOOTHED_WHEEL is not mentioned in the meta file, we handle it manually right in rusefi.input file
|
||||
* these are templated into tunerstudio.template.ini file
|
||||
* note that TT_TOOTHED_WHEEL is not mentioned in the meta file, we handle it manually right in tunerstudio.template.ini file
|
||||
*/
|
||||
variableRegistry.register(TRIGGER_TYPE_WITHOUT_KNOWN_LOCATION, triggerTypesWithoutKnownLocation.toString());
|
||||
variableRegistry.register(TRIGGER_TYPE_WITH_SECOND_WHEEL, triggerTypesWithSecondWheel.toString());
|
||||
|
|
File diff suppressed because it is too large
Load Diff
Loading…
Reference in New Issue