docs & naming consistency
This commit is contained in:
parent
4141c7b4c2
commit
1bd4fb8f09
|
@ -32,16 +32,35 @@
|
||||||
#include "loggingcentral.h"
|
#include "loggingcentral.h"
|
||||||
#endif /* __cplusplus */
|
#endif /* __cplusplus */
|
||||||
|
|
||||||
// See also 'TS_GET_STRUCT'
|
/**
|
||||||
|
* reference to configuration parameter
|
||||||
|
*/
|
||||||
#define DISPLAY_CONFIG(x) x
|
#define DISPLAY_CONFIG(x) x
|
||||||
#define DISPLAY_PREFIX(x) x
|
/**
|
||||||
|
* The main annotation of live data - reference to dynamic state variable
|
||||||
|
* See also 'TS_GET_STRUCT'
|
||||||
|
*/
|
||||||
#define DISPLAY_FIELD(x) x
|
#define DISPLAY_FIELD(x) x
|
||||||
// we use this 'DISPLAY' macro if value is not used by C++ in current context
|
/**
|
||||||
|
* Advanced tag to access fields within data structures
|
||||||
|
* "running.fuel" variable would be referenced as DISPLAY_PREFIX(running).DISPLAY_FIELD(fuel)
|
||||||
|
*/
|
||||||
|
#define DISPLAY_PREFIX(x) x
|
||||||
|
|
||||||
|
/**
|
||||||
|
* we use this 'DISPLAY' macro if value is not used by C++ code in current context and we want to hide it from compiler
|
||||||
|
*/
|
||||||
#define DISPLAY(x)
|
#define DISPLAY(x)
|
||||||
|
|
||||||
#define DISPLAY_TAG(x)
|
#define DISPLAY_TAG(x)
|
||||||
|
/**
|
||||||
|
* Just a human-readable comment. '_' underscore symbols become spaces. EOL is handled as new line.
|
||||||
|
*/
|
||||||
#define DISPLAY_TEXT(x)
|
#define DISPLAY_TEXT(x)
|
||||||
#define DISPLAY_STATE(x)
|
#define DISPLAY_STATE(x)
|
||||||
|
/**
|
||||||
|
* Reference to one of 'output' channels/standard gauges.
|
||||||
|
*/
|
||||||
#define DISPLAY_SENSOR(x) {}
|
#define DISPLAY_SENSOR(x) {}
|
||||||
#define DISPLAY_IF(x) x
|
#define DISPLAY_IF(x) x
|
||||||
|
|
||||||
|
|
|
@ -2,6 +2,12 @@ rem TODO better place for this stuff, more automation so that each file does not
|
||||||
|
|
||||||
rm gen_config2.log
|
rm gen_config2.log
|
||||||
|
|
||||||
|
java -DSystemOut.name=gen_config2 ^
|
||||||
|
-jar ../java_tools/ConfigDefinition.jar ^
|
||||||
|
-definition integration/pid_state.txt ^
|
||||||
|
-java_destination ../java_console/models/src/com/rusefi/config/generated/PidState.java ^
|
||||||
|
-c_destination controllers/generated/pid_state_generated.h
|
||||||
|
|
||||||
java -DSystemOut.name=gen_config2 ^
|
java -DSystemOut.name=gen_config2 ^
|
||||||
-jar ../java_tools/ConfigDefinition.jar ^
|
-jar ../java_tools/ConfigDefinition.jar ^
|
||||||
-definition integration/engine_state.txt ^
|
-definition integration/engine_state.txt ^
|
||||||
|
@ -10,19 +16,19 @@ java -DSystemOut.name=gen_config2 ^
|
||||||
|
|
||||||
java -DSystemOut.name=gen_config2 ^
|
java -DSystemOut.name=gen_config2 ^
|
||||||
-jar ../java_tools/ConfigDefinition.jar ^
|
-jar ../java_tools/ConfigDefinition.jar ^
|
||||||
-definition integration/thermistor.txt ^
|
-definition integration/thermistor_state.txt ^
|
||||||
-java_destination ../java_console/models/src/com/rusefi/config/generated/ThermistorState.java ^
|
-java_destination ../java_console/models/src/com/rusefi/config/generated/ThermistorState.java ^
|
||||||
-c_destination controllers/generated/thermistor_generated.h
|
-c_destination controllers/generated/thermistor_generated.h
|
||||||
|
|
||||||
java -DSystemOut.name=gen_config2 ^
|
java -DSystemOut.name=gen_config2 ^
|
||||||
-jar ../java_tools/ConfigDefinition.jar ^
|
-jar ../java_tools/ConfigDefinition.jar ^
|
||||||
-definition integration/trigger.txt ^
|
-definition integration/trigger_state.txt ^
|
||||||
-java_destination ../java_console/models/src/com/rusefi/config/generated/TriggerState.java ^
|
-java_destination ../java_console/models/src/com/rusefi/config/generated/TriggerState.java ^
|
||||||
-c_destination controllers/generated/trigger_generated.h
|
-c_destination controllers/generated/trigger_generated.h
|
||||||
|
|
||||||
java -DSystemOut.name=gen_config2 ^
|
java -DSystemOut.name=gen_config2 ^
|
||||||
-jar ../java_tools/ConfigDefinition.jar ^
|
-jar ../java_tools/ConfigDefinition.jar ^
|
||||||
-definition integration/wall_fuel.txt ^
|
-definition integration/wall_fuel_state.txt ^
|
||||||
-java_destination ../java_console/models/src/com/rusefi/config/generated/WallFuelState.java ^
|
-java_destination ../java_console/models/src/com/rusefi/config/generated/WallFuelState.java ^
|
||||||
-c_destination controllers/generated/wall_fuel_generated.h
|
-c_destination controllers/generated/wall_fuel_generated.h
|
||||||
|
|
||||||
|
|
|
@ -0,0 +1,10 @@
|
||||||
|
struct_no_prefix pid_state_s
|
||||||
|
float iTerm;
|
||||||
|
float dTerm;we are remembering this only for debugging purposes
|
||||||
|
float target;only used for logging
|
||||||
|
float input;only used for logging
|
||||||
|
float output;only used for logging
|
||||||
|
float errorAmplificationCoef;
|
||||||
|
|
||||||
|
|
||||||
|
end_struct
|
Loading…
Reference in New Issue