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

auto-sync

This commit is contained in:
rusEfi 2016-08-01 22:04:24 -04:00
parent 5321542774
commit dac94a1d09
8 changed files with 26 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
firmware/config/engines/dodge_neon.cpp
View File

@ -153,6 +153,14 @@ void setDodgeNeon1995EngineConfiguration(DECLARE_ENGINE_PARAMETER_F) {
engineConfiguration->algorithm = LM_ALPHA_N;
// boardConfiguration->spi2mosiPin = GPIOB_15;
// boardConfiguration->spi2misoPin = GPIOB_14;
// boardConfiguration->spi2sckPin = GPIOB_13;
boardConfiguration->cj125CsPin = GPIOB_0; // rev 0.4
boardConfiguration->isCJ125Enabled = true;
boardConfiguration->is_enabled_spi_2 = true;
engineConfiguration->hasIatSensor = false;
// set_rpm_hard_limit 4000

6
firmware/controllers/algo/engine.h
View File

@ -4,8 +4,8 @@
* @date May 21, 2014
* @author Andrey Belomutskiy, (c) 2012-2016
*/
#ifndef ENGINE_H_
#define ENGINE_H_
#ifndef H_ENGINE_H_
#define H_ENGINE_H_
#include "global.h"
#include "main.h"
@ -440,4 +440,4 @@ void resetConfigurationExt(Logging * logger, engine_type_e engineType DECLARE_EN
void applyNonPersistentConfiguration(Logging * logger DECLARE_ENGINE_PARAMETER_S);
void prepareOutputSignals(DECLARE_ENGINE_PARAMETER_F);
#endif /* ENGINE_H_ */
#endif /* H_ENGINE_H_ */

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

@ -200,6 +200,7 @@ void prepareVoidConfiguration(engine_configuration_s *activeConfiguration) {
activeConfiguration->fsioAdc[i] = EFI_ADC_NONE;
}
engineConfiguration->camInput = GPIO_UNASSIGNED;
boardConfiguration->triggerInputPins[0] = GPIO_UNASSIGNED;
boardConfiguration->triggerInputPins[1] = GPIO_UNASSIGNED;
boardConfiguration->triggerInputPins[2] = GPIO_UNASSIGNED;

6
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 24 22:23:59 EDT 2016
// this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Mon Aug 01 21:44:40 EDT 2016
// begin
#ifndef ENGINE_CONFIGURATION_GENERATED_H_
#define ENGINE_CONFIGURATION_GENERATED_H_
@ -1632,7 +1632,7 @@ typedef struct {
/**
* offset 2408
*/
int unusedauxPid1DT;
brain_input_pin_e camInput;
/**
* offset 2412
*/
@ -1904,4 +1904,4 @@ typedef struct {
#endif
// end
// this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Sun Jul 24 22:23:59 EDT 2016
// this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Mon Aug 01 21:44:40 EDT 2016

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

@ -39,7 +39,7 @@
#define injector_offset_hex 8
#define injector_flow_offset 8
#define injector_flow_offset_hex 8
#define injector_lag_offset 12
#define injector_unusedlag_offset 12
#define injector_battLagCorrBins_offset 16
#define injector_battLagCorrBins_offset_hex 10
#define injector_battLagCorr_offset 48
@ -828,8 +828,8 @@
#define mapHighValueVoltage_offset_hex 960
#define egoValueShift_offset 2404
#define egoValueShift_offset_hex 964
#define unusedauxPid1DT_offset 2408
#define unusedauxPid1DT_offset_hex 968
#define camInput_offset 2408
#define camInput_offset_hex 968
#define auxPidDT1_offset 2412
#define auxPidDT2_offset 2416
#define auxPidDT2_offset_hex 970

5
firmware/hw_layer/sensors/CJ125.cpp
View File

@ -12,11 +12,12 @@
#include "CJ125.h"
#include "pwm_generator.h"
#include "pid.h"
#include "pin_repository.h"
#include "hardware.h"
#if EFI_CJ125 || defined(__DOXYGEN__)
#include "pin_repository.h"
#include "hardware.h"
EXTERN_ENGINE;
static SimplePwm wboHeaderControl;

2
firmware/integration/rusefi_config.txt
View File

@ -716,7 +716,7 @@ float[MAP_ACCEL_TAPER] mapAccelTaperMult;;"mult", 1, 0, 0.0, 300,
float mapLowValueVoltage;MAP voltage for low point;"v", 1, 0, 0.0, 10, 2
float mapHighValueVoltage;MAP voltage for low point;"v", 1, 0, 0.0, 10, 2
float egoValueShift;EGO value correction;"value", 1, 0, -10.0, 10, 2
int unusedauxPid1DT
brain_input_pin_e camInput;
pid_dt[AUX_PID_COUNT iterate] auxPidDT;
float crankingIdleAdjustment;Extra idle while cranking;"percent", 1, 0, -100.0, 100,
float tChargeMinRpmMinTps;

8
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 Sun Jul 24 22:23:59 EDT 2016
// this file was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Mon Aug 01 21:44:40 EDT 2016
public class Fields {
public static final int LE_COMMAND_LENGTH = 200;
public static final int FSIO_ADC_COUNT = 4;
@ -832,8 +832,8 @@ public class Fields {
public static final int mapHighValueVoltage_offset_hex = 960;
public static final int egoValueShift_offset = 2404;
public static final int egoValueShift_offset_hex = 964;
public static final int unusedauxPid1DT_offset = 2408;
public static final int unusedauxPid1DT_offset_hex = 968;
public static final int camInput_offset = 2408;
public static final int camInput_offset_hex = 968;
public static final int auxPidDT1_offset = 2412;
public static final int auxPidDT2_offset = 2416;
public static final int auxPidDT2_offset_hex = 970;
@ -1474,7 +1474,7 @@ public class Fields {
public static final Field MAPLOWVALUEVOLTAGE = Field.create("MAPLOWVALUEVOLTAGE", 2396, FieldType.FLOAT);
public static final Field MAPHIGHVALUEVOLTAGE = Field.create("MAPHIGHVALUEVOLTAGE", 2400, FieldType.FLOAT);
public static final Field EGOVALUESHIFT = Field.create("EGOVALUESHIFT", 2404, FieldType.FLOAT);
public static final Field UNUSEDAUXPID1DT = Field.create("UNUSEDAUXPID1DT", 2408, FieldType.INT);
public static final Field CAMINPUT = Field.create("CAMINPUT", 2408, FieldType.INT, brain_input_pin_e);
public static final Field AUXPIDDT1 = Field.create("AUXPIDDT1", 2412, FieldType.INT);
public static final Field AUXPIDDT2 = Field.create("AUXPIDDT2", 2416, FieldType.INT);
public static final Field AUXPIDDT3 = Field.create("AUXPIDDT3", 2420, FieldType.INT);