rusefi
/
rusefi-full
mirror of https://github.com/rusefi/rusefi-full.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

auto-sync

This commit is contained in:
rusEfi 2015-12-27 15:02:51 -05:00
parent 28ee84c333
commit 0b4118a659
8 changed files with 94 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
firmware/config/engines/mazda_626.cpp
View File

@ -28,6 +28,7 @@ void setMazda626EngineConfiguration(DECLARE_ENGINE_PARAMETER_F) {
engineConfiguration->injectionMode = IM_BATCH;
engineConfiguration->twoWireBatch = true;
// chartsize 600
engineConfiguration->engineChartSize = 600;
@ -38,8 +39,8 @@ void setMazda626EngineConfiguration(DECLARE_ENGINE_PARAMETER_F) {
engineConfiguration->injector.flow = 330;
engineConfiguration->specs.displacement = 2.0;
// set_global_trigger_offset_angle 0
engineConfiguration->globalTriggerAngleOffset = 0;
// set_global_trigger_offset_angle 282
engineConfiguration->globalTriggerAngleOffset = 282;
// set_cranking_timing_angle 15
engineConfiguration->crankingTimingAngle = 8;
@ -62,10 +63,10 @@ void setMazda626EngineConfiguration(DECLARE_ENGINE_PARAMETER_F) {
// set_whole_timing_map 10
setWholeTimingTable(10 PASS_ENGINE_PARAMETER);
// http://i.imgur.com/fclVzvu.jpg
setCommonNTCSensor(&engineConfiguration->clt);
// http://i.imgur.com/2hI67yW.jpg
setThermistorConfiguration(&engineConfiguration->iat, 13, 56000, 50, 9000, 80.0, 2700);
// http://s1.micp.ru/tOb0U.png
setThermistorConfiguration(&engineConfiguration->clt, -15, 5900, 23, 1750, 97, 165);
// http://s2.micp.ru/I6Cfe.png
setThermistorConfiguration(&engineConfiguration->iat, 23, 1750, 41, 810, 97, 165);
engineConfiguration->iat.config.bias_resistor = 1820;
commonFrankensoAnalogInputs(engineConfiguration);
@ -77,6 +78,15 @@ void setMazda626EngineConfiguration(DECLARE_ENGINE_PARAMETER_F) {
engineConfiguration->map.sensor.type = MT_SUBY_DENSO;
// http://s2.micp.ru/vJ9Sd.png
engineConfiguration->mapAccelLength = 12;
engineConfiguration->mapAccelEnrichmentThreshold = 1;
engineConfiguration->mapAccelEnrichmentMultiplier = 0.25;
engineConfiguration->tpsAccelLength = 12;
engineConfiguration->tpsAccelEnrichmentThreshold = 10;
engineConfiguration->tpsAccelEnrichmentMultiplier = 0.06;
// todo engineConfiguration->afr.hwChannel = EFI_ADC_3;
setEgoSensor(ES_Innovate_MTX_L PASS_ENGINE_PARAMETER);

2
firmware/controllers/algo/auto_generated_enums.cpp
View File

@ -163,6 +163,8 @@ case TT_NISSAN:
return "TT_NISSAN";
case TT_2JZ:
return "TT_2JZ";
case TT_ROVER_K:
return "TT_ROVER_K";
}
return NULL;
}

4
firmware/controllers/algo/rusefi_enums.h
View File

@ -159,7 +159,9 @@ typedef enum {
TT_2JZ = 25,
TT_UNUSED = 26, // this is used if we want to iterate over all trigger types
TT_ROVER_K = 26,
TT_UNUSED = 27, // this is used if we want to iterate over all trigger types
Force_4b_trigger_type = ENUM_32_BITS,
} trigger_type_e;

3
firmware/controllers/trigger/trigger.mk
View File

@ -12,7 +12,8 @@ TRIGGER_DECODERS_SRC_CPP = \
$(PROJECT_DIR)/controllers/trigger/trigger_nissan.cpp \
$(PROJECT_DIR)/controllers/trigger/trigger_subaru.cpp \
$(PROJECT_DIR)/controllers/trigger/trigger_toyota.cpp \
$(PROJECT_DIR)/controllers/trigger/trigger_gm.cpp
$(PROJECT_DIR)/controllers/trigger/trigger_gm.cpp \
$(PROJECT_DIR)/controllers/trigger/trigger_rover.cpp
TRIGGER_SRC_CPP = \
$(PROJECT_DIR)/controllers/trigger/trigger_emulator_algo.cpp \

5
firmware/controllers/trigger/trigger_decoder.cpp
View File

@ -33,6 +33,7 @@
#include "trigger_subaru.h"
#include "trigger_nissan.h"
#include "trigger_toyota.h"
#include "trigger_rover.h"
#include "auto_generated_enums.h"
#include "trigger_structure.h"
#include "efiGpio.h"
@ -509,6 +510,10 @@ void TriggerShape::initializeTriggerShape(Logging *logger DECLARE_ENGINE_PARAMET
initializeNissan(triggerShape);
break;
case TT_ROVER_K:
initializeRoverK(triggerShape);
break;
default:
firmwareError("initializeTriggerShape() not implemented: %d", triggerConfig->type);
;

50
firmware/controllers/trigger/trigger_rover.cpp Normal file
View File

@ -0,0 +1,50 @@
/*
* @file trigger_rover.cpp
*
* @date Dec 27, 2015
* todo: ask PhilTheGeek to sign contributor agreement
*/
#include "trigger_rover.h"
void initializeRoverK(TriggerShape *s) {
s->initialize(FOUR_STROKE_CRANK_SENSOR, false);
float tooth = 20;
// s->setTriggerSynchronizationGap(2.0);
s->isSynchronizationNeeded = false;
float base = 0;
for (int i = 0; i < 2; i++) {
s->addEvent(base + tooth / 2, T_PRIMARY, TV_RISE);
s->addEvent(base + tooth, T_PRIMARY, TV_FALL);
base += tooth;
}
base += tooth;
for (int i = 0; i < 2; i++) {
s->addEvent(base + tooth / 2, T_PRIMARY, TV_RISE);
s->addEvent(base + tooth, T_PRIMARY, TV_FALL);
base += tooth;
}
base += tooth;
for (int i = 0; i < 14; i++) {
s->addEvent(base + tooth / 2, T_PRIMARY, TV_RISE);
s->addEvent(base + tooth, T_PRIMARY, TV_FALL);
base += tooth;
}
base += tooth;
for (int i = 0; i < 3; i++) {
s->addEvent(base + tooth / 2, T_PRIMARY, TV_RISE);
s->addEvent(base + tooth, T_PRIMARY, TV_FALL);
base += tooth;
}
base += tooth;
for (int i = 0; i < 11; i++) {
s->addEvent(base + tooth / 2, T_PRIMARY, TV_RISE);
s->addEvent(base + tooth, T_PRIMARY, TV_FALL);
base += tooth;
}
}

15
firmware/controllers/trigger/trigger_rover.h Normal file
View File

@ -0,0 +1,15 @@
/*
* @file trigger_rover.h
*
* @date Dec 27, 2015
* todo: ask PhilTheGeek to sign contributor agreement
*/
#ifndef CONTROLLERS_TRIGGER_TRIGGER_ROVER_H_
#define CONTROLLERS_TRIGGER_TRIGGER_ROVER_H_
#include "trigger_structure.h"
void initializeRoverK(TriggerShape *s);
#endif /* CONTROLLERS_TRIGGER_TRIGGER_ROVER_H_ */

2
java_console/build.xml
View File

@ -74,7 +74,7 @@
<zipfileset src="lib/batik/batik-svggen.jar" includes="**/*.class"/>
<zipfileset src="lib/batik/batik-awt-util.jar" includes="**/*.class"/>
<zipfileset src="lib/batik/batik-util.jar" includes="**/*.class"/>
<zipfileset src="lib/jlatexmath-1.0.3.jar" includes="**/*.class **/*.xml"/>
<zipfileset src="lib/jlatexmath-1.0.3.jar" includes="**/*.class **/*.xml **/*.ttf"/>
</jar>
</target>