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

refactoring: better field names

This commit is contained in:
rusefi 2018-07-26 15:51:06 -04:00
parent 2f95cd1e0d
commit 43da335306
11 changed files with 49 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
firmware/config/boards/Prometheus/board_configuration.cpp
View File

@ -169,10 +169,10 @@ void setBoardConfigurationOverrides(void) {
engineConfiguration->stepperEnablePin = GPIO_UNASSIGNED;
engineConfiguration->stepperEnablePinMode = OM_DEFAULT;
engineConfiguration->communicationPin = GPIO_UNASSIGNED;// GPIOA_13; // yellow LED
engineConfiguration->runningPin = GPIOA_13; //GPIOA_13; // yellow LED
engineConfiguration->fatalErrorPin = GPIOA_13;
engineConfiguration->warninigPin = GPIO_UNASSIGNED;
engineConfiguration->communicationLedPin = GPIO_UNASSIGNED;// GPIOA_13; // yellow LED
engineConfiguration->runningLedPin = GPIOA_13; //GPIOA_13; // yellow LED
engineConfiguration->fatalErrorLedPin = GPIOA_13;
engineConfiguration->warninigLedPin = GPIO_UNASSIGNED;
engineConfiguration->configResetPin = GPIO_UNASSIGNED;
boardConfiguration->triggerInputPins[0] = is469 ? GPIOA_5 : GPIOA_5;

18
firmware/console/status_loop.cpp
View File

@ -544,18 +544,18 @@ static THD_WORKING_AREA(lcdThreadStack, UTILITY_THREAD_STACK_SIZE);
*/
static THD_WORKING_AREA(blinkingStack, 128);
static OutputPin *leds[] = { &enginePins.warningPin, &enginePins.runningPin, &enginePins.checkEnginePin,
&enginePins.errorLedPin, &enginePins.communicationPin, &enginePins.checkEnginePin };
static OutputPin *leds[] = { &enginePins.warningLedPin, &enginePins.runningLedPin, &enginePins.checkEnginePin,
&enginePins.errorLedPin, &enginePins.communicationLedPin, &enginePins.checkEnginePin };
static void initStatusLeds(void) {
enginePins.communicationPin.initPin("led: comm status", engineConfiguration->communicationPin);
enginePins.communicationLedPin.initPin("led: comm status", engineConfiguration->communicationLedPin);
// we initialize this here so that we can blink it on start-up
enginePins.checkEnginePin.initPin("MalfunctionIndicator", boardConfiguration->malfunctionIndicatorPin, &boardConfiguration->malfunctionIndicatorPinMode);
#if EFI_WARNING_LED || defined(__DOXYGEN__)
enginePins.warningPin.initPin("led: warning status", LED_WARNING_BRAIN_PIN);
enginePins.runningPin.initPin("led: running status", engineConfiguration->runningPin);
enginePins.warningLedPin.initPin("led: warning status", LED_WARNING_BRAIN_PIN);
enginePins.runningLedPin.initPin("led: running status", engineConfiguration->runningLedPin);
#endif /* EFI_WARNING_LED */
}
@ -619,16 +619,16 @@ static void blinkingThread(void *arg) {
#endif
if (!hasFirmwareError() && !hasFirmwareErrorFlag) {
enginePins.communicationPin.setValue(0);
enginePins.communicationLedPin.setValue(0);
}
enginePins.warningPin.setValue(0);
enginePins.warningLedPin.setValue(0);
chThdSleepMilliseconds(delayMs);
enginePins.communicationPin.setValue(1);
enginePins.communicationLedPin.setValue(1);
#if EFI_ENGINE_CONTROL || defined(__DOXYGEN__)
if (isTriggerErrorNow() || isIgnitionTimingError() || consoleByteArrived) {
consoleByteArrived = false;
enginePins.warningPin.setValue(1);
enginePins.warningLedPin.setValue(1);
}
#endif
chThdSleepMilliseconds(delayMs);

6
firmware/controllers/algo/engine_configuration.cpp
View File

@ -382,7 +382,7 @@ void prepareVoidConfiguration(engine_configuration_s *engineConfiguration) {
void setDefaultBasePins(DECLARE_ENGINE_PARAMETER_SIGNATURE) {
engineConfiguration->fatalErrorPin = GPIOD_14;
engineConfiguration->warninigPin = GPIOD_13;
engineConfiguration->warninigLedPin = GPIOD_13;
engineConfiguration->configResetPin = GPIOB_1;
#if EFI_PROD_CODE || defined(__DOXYGEN__)
// call overrided board-specific serial configuration setup, if needed (for custom boards only)
@ -951,8 +951,8 @@ void setDefaultConfiguration(DECLARE_ENGINE_PARAMETER_SIGNATURE) {
engineConfiguration->alternatorPwmFrequency = 300;
engineConfiguration->communicationPin = GPIOD_15; // blue LED on discovery
engineConfiguration->runningPin = GPIOD_12; // greeb LED on discovery
engineConfiguration->communicationLedPin = GPIOD_15; // blue LED on discovery
engineConfiguration->runningLedPin = GPIOD_12; // greeb LED on discovery
setDefaultBasePins(PASS_ENGINE_PARAMETER_SIGNATURE);
setDefaultSerialParameters(PASS_ENGINE_PARAMETER_SIGNATURE);

10
firmware/controllers/algo/engine_configuration_generated_structures.h
View File

@ -1,4 +1,4 @@
// this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Sun Jul 22 11:54:40 EDT 2018
// this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Thu Jul 26 15:39:48 EDT 2018
// begin
#ifndef ENGINE_CONFIGURATION_GENERATED_H_
#define ENGINE_CONFIGURATION_GENERATED_H_
@ -1609,12 +1609,12 @@ typedef struct {
* blue LED on discovery by default
* offset 1908
*/
brain_pin_e communicationPin;
brain_pin_e communicationLedPin;
/**
* green LED on discovery by default
* offset 1912
*/
brain_pin_e runningPin;
brain_pin_e runningLedPin;
/**
* offset 1916
*/
@ -1746,7 +1746,7 @@ typedef struct {
* TODO: start using this property
* offset 2196
*/
brain_pin_e warninigPin;
brain_pin_e warninigLedPin;
/**
* offset 2200
*/
@ -2390,4 +2390,4 @@ typedef struct {
#endif
// end
// this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Sun Jul 22 11:54:40 EDT 2018
// this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Thu Jul 26 15:39:48 EDT 2018

12
firmware/controllers/algo/rusefi_generated.h
View File

@ -1136,10 +1136,10 @@
#define idleRpmPid_maxValue_offset_hex 76e
#define addedToWallCoef_offset 1904
#define addedToWallCoef_offset_hex 770
#define communicationPin_offset 1908
#define communicationPin_offset_hex 774
#define runningPin_offset 1912
#define runningPin_offset_hex 778
#define communicationLedPin_offset 1908
#define communicationLedPin_offset_hex 774
#define runningLedPin_offset 1912
#define runningLedPin_offset_hex 778
#define binarySerialTxPin_offset 1916
#define binarySerialTxPin_offset_hex 77c
#define binarySerialRxPin_offset 1920
@ -1196,8 +1196,8 @@
#define engineLoadAccelEnrichmentMultiplier_offset_hex 88c
#define fatalErrorPin_offset 2192
#define fatalErrorPin_offset_hex 890
#define warninigPin_offset 2196
#define warninigPin_offset_hex 894
#define warninigLedPin_offset 2196
#define warninigLedPin_offset_hex 894
#define configResetPin_offset 2200
#define configResetPin_offset_hex 898
#define uartConsoleSerialSpeed_offset 2204

6
firmware/controllers/engine_controller.cpp
View File

@ -104,13 +104,13 @@ static msg_t csThread(void) {
bool is_running = ENGINE(rpmCalculator).isRunning(PASS_ENGINE_PARAMETER_SIGNATURE);
if (is_running) {
// blinking while running
enginePins.runningPin.setValue(0);
enginePins.runningLedPin.setValue(0);
chThdSleepMilliseconds(50);
enginePins.runningPin.setValue(1);
enginePins.runningLedPin.setValue(1);
chThdSleepMilliseconds(50);
} else {
// constant on while cranking and off if engine is stopped
enginePins.runningPin.setValue(is_cranking);
enginePins.runningLedPin.setValue(is_cranking);
chThdSleepMilliseconds(100);
}
}

6
firmware/controllers/system/efiGpio.h
View File

@ -118,9 +118,9 @@ public:
* brain board RED LED by default
*/
OutputPin errorLedPin;
OutputPin communicationPin; // blue LED on brain board by default
OutputPin warningPin; // orange LED on brain board by default
OutputPin runningPin; // green LED on brain board by default
OutputPin communicationLedPin; // blue LED on brain board by default
OutputPin warningLedPin; // orange LED on brain board by default
OutputPin runningLedPin; // green LED on brain board by default
OutputPin idleSolenoidPin;
OutputPin alternatorPin;

2
firmware/global.h
View File

@ -131,7 +131,7 @@ typedef unsigned int time_t;
#define ON_FATAL_ERROR() \
palWritePad(LED_ERROR_PORT, LED_ERROR_PIN, 1); \
turnAllPinsOff(); \
enginePins.communicationPin.setValue(1);
enginePins.communicationLedPin.setValue(1);
/*
* Stack debugging

6
firmware/integration/rusefi_config.txt
View File

@ -760,8 +760,8 @@ custom pin_mode_e 4 bits, U32, @OFFSET@, [0:5], @@pin_mode_e_enum@@
int step1RpmWindow;RPMs prior to step1rpm point where ignition advance is retarded;"rpm", 1, 0, 0, 3000.0, 2
pid_s idleRpmPid;See cltIdleRpmBins
float addedToWallCoef;;"%", 1, 0, 0.0, 300.0, 2
brain_pin_e communicationPin;blue LED on discovery by default
brain_pin_e runningPin;green LED on discovery by default
brain_pin_e communicationLedPin;blue LED on discovery by default
brain_pin_e runningLedPin;green LED on discovery by default
brain_pin_e binarySerialTxPin;
brain_pin_e binarySerialRxPin;
brain_pin_e consoleSerialTxPin; todo: finish pin migration from hard-coded to configurable?
@ -801,7 +801,7 @@ custom pin_mode_e 4 bits, U32, @OFFSET@, [0:5], @@pin_mode_e_enum@@
brain_pin_e fatalErrorPin;RED led on Discovery by default. TODO: start using this property
brain_pin_e warninigPin;TODO: start using this property
brain_pin_e warninigLedPin;TODO: start using this property
brain_pin_e configResetPin;
uint32_t uartConsoleSerialSpeed;;"BPs", 1, 0, 0,1000000, 0
float tpsDecelEnleanmentThreshold;;"roc", 1, 0, 0, 200, 3

4
firmware/tunerstudio/rusefi.input
View File

@ -1889,8 +1889,8 @@ cmd_stop_engine = "w\x00\x99\x00\x00"
field = "Global fuel correction", globalFuelCorrection
field = "Ignition Math Logic @", ignMathCalculateAtIndex
field = "MAP Averaging Logic @", mapAveragingSchedulingAtIndex
field = "comm status pin", communicationPin
field = "running status", runningPin
field = "comm status light", communicationLedPin
field = "running status light", runningLedPin
; Engine->Base Engine Settings
dialog = engineChars, "Base Engine Settings"

20
java_console/models/src/com/rusefi/config/Fields.java
View File

@ -1,6 +1,6 @@
package com.rusefi.config;
// this file was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Fri Jun 22 11:35:17 CDT 2018
// this file was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Thu Jul 26 15:39:48 EDT 2018
public class Fields {
public static final int LE_COMMAND_LENGTH = 200;
public static final int BLOCKING_FACTOR = 400;
@ -779,10 +779,10 @@ public class Fields {
public static final int idleRpmPid_maxValue_offset = 1902;
public static final int addedToWallCoef_offset = 1904;
public static final int addedToWallCoef_offset_hex = 770;
public static final int communicationPin_offset = 1908;
public static final int communicationPin_offset_hex = 774;
public static final int runningPin_offset = 1912;
public static final int runningPin_offset_hex = 778;
public static final int communicationLedPin_offset = 1908;
public static final int communicationLedPin_offset_hex = 774;
public static final int runningLedPin_offset = 1912;
public static final int runningLedPin_offset_hex = 778;
public static final int binarySerialTxPin_offset = 1916;
public static final int binarySerialRxPin_offset = 1920;
public static final int binarySerialRxPin_offset_hex = 780;
@ -824,8 +824,8 @@ public class Fields {
public static final int engineLoadAccelEnrichmentMultiplier_offset = 2188;
public static final int fatalErrorPin_offset = 2192;
public static final int fatalErrorPin_offset_hex = 890;
public static final int warninigPin_offset = 2196;
public static final int warninigPin_offset_hex = 894;
public static final int warninigLedPin_offset = 2196;
public static final int warninigLedPin_offset_hex = 894;
public static final int configResetPin_offset = 2200;
public static final int configResetPin_offset_hex = 898;
public static final int uartConsoleSerialSpeed_offset = 2204;
@ -1682,8 +1682,8 @@ public class Fields {
public static final Field IDLERPMPID_MINVALUE = Field.create("IDLERPMPID_MINVALUE", 1900, FieldType.INT);
public static final Field IDLERPMPID_MAXVALUE = Field.create("IDLERPMPID_MAXVALUE", 1902, FieldType.INT);
public static final Field ADDEDTOWALLCOEF = Field.create("ADDEDTOWALLCOEF", 1904, FieldType.FLOAT);
public static final Field COMMUNICATIONPIN = Field.create("COMMUNICATIONPIN", 1908, FieldType.INT, brain_pin_e);
public static final Field RUNNINGPIN = Field.create("RUNNINGPIN", 1912, FieldType.INT, brain_pin_e);
public static final Field COMMUNICATIONLEDPIN = Field.create("COMMUNICATIONLEDPIN", 1908, FieldType.INT, brain_pin_e);
public static final Field RUNNINGLEDPIN = Field.create("RUNNINGLEDPIN", 1912, FieldType.INT, brain_pin_e);
public static final Field BINARYSERIALTXPIN = Field.create("BINARYSERIALTXPIN", 1916, FieldType.INT, brain_pin_e);
public static final Field BINARYSERIALRXPIN = Field.create("BINARYSERIALRXPIN", 1920, FieldType.INT, brain_pin_e);
public static final Field CONSOLESERIALTXPIN = Field.create("CONSOLESERIALTXPIN", 1924, FieldType.INT, brain_pin_e);
@ -1708,7 +1708,7 @@ public class Fields {
public static final Field ENGINELOADACCELENRICHMENTTHRESHOLD = Field.create("ENGINELOADACCELENRICHMENTTHRESHOLD", 2184, FieldType.FLOAT);
public static final Field ENGINELOADACCELENRICHMENTMULTIPLIER = Field.create("ENGINELOADACCELENRICHMENTMULTIPLIER", 2188, FieldType.FLOAT);
public static final Field FATALERRORPIN = Field.create("FATALERRORPIN", 2192, FieldType.INT, brain_pin_e);
public static final Field WARNINIGPIN = Field.create("WARNINIGPIN", 2196, FieldType.INT, brain_pin_e);
public static final Field WARNINIGLEDPIN = Field.create("WARNINIGLEDPIN", 2196, FieldType.INT, brain_pin_e);
public static final Field CONFIGRESETPIN = Field.create("CONFIGRESETPIN", 2200, FieldType.INT, brain_pin_e);
public static final Field UARTCONSOLESERIALSPEED = Field.create("UARTCONSOLESERIALSPEED", 2204, FieldType.INT);
public static final Field TPSDECELENLEANMENTTHRESHOLD = Field.create("TPSDECELENLEANMENTTHRESHOLD", 2208, FieldType.FLOAT);