rusefi
/
custom-board-bundle-sample-fork-of-rusefi
mirror of https://github.com/rusefi/custom-board-bundle-sample-fork-of-rusefi.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

auto-sync

This commit is contained in:
rusEfi 2017-01-13 00:03:30 -05:00
parent 1eea50fdde
commit b2af89dd9d
5 changed files with 17 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -380,6 +380,8 @@ case FO_1_2_3_4_5_6:
return "FO_1_THEN_2_THEN_3_THEN_4_THEN_5_THEN_6"; return "FO_1_THEN_2_THEN_3_THEN_4_THEN_5_THEN_6";
case FO_1: case FO_1:
return "FO_ONE_CYLINDER"; return "FO_ONE_CYLINDER";
case FO_1_6_3_2_5_4:
return "FO_1_6_3_2_5_4";
case FO_1_2_3: case FO_1_2_3:
return "FO_1_2_3"; return "FO_1_2_3";
case FO_1_8_7_2_6_5_4_3: case FO_1_8_7_2_6_5_4_3:

20
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 Tue Dec 27 23:08:47 EST 2016 // this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Thu Jan 12 23:31:45 EST 2017
// begin // begin
#ifndef ENGINE_CONFIGURATION_GENERATED_H_ #ifndef ENGINE_CONFIGURATION_GENERATED_H_
#define ENGINE_CONFIGURATION_GENERATED_H_ #define ENGINE_CONFIGURATION_GENERATED_H_
@ -33,7 +33,7 @@ typedef struct {
float baseFuel; float baseFuel;
/** /**
* Cranking mode threshold. Special cranking logic controls fuel and spark while RPM is below this threshold * Cranking mode threshold. Special cranking logic controls fuel and spark while RPM is below this threshold
* set_cranking_rpm X * set cranking_rpm X
* offset 4 * offset 4
*/ */
int16_t rpm; int16_t rpm;
@ -222,7 +222,7 @@ typedef struct {
*/ */
typedef struct { typedef struct {
/** /**
* set_trigger_type X * set trigger_type X
* offset 0 * offset 0
*/ */
trigger_type_e type; trigger_type_e type;
@ -929,7 +929,7 @@ typedef struct {
/** /**
* While cranking (which causes battery voltage to drop) we can calculate dwell time in shaft * While cranking (which causes battery voltage to drop) we can calculate dwell time in shaft
* degrees, not in absolute time as in running mode. * degrees, not in absolute time as in running mode.
* set_cranking_charge_angle X * set cranking_charge_angle X
* offset 108 * offset 108
*/ */
float crankingChargeAngle; float crankingChargeAngle;
@ -994,7 +994,7 @@ typedef struct {
int rpmHardLimit; int rpmHardLimit;
/** /**
* This setting controls which fuel quantity control algorithm is used. * This setting controls which fuel quantity control algorithm is used.
* set_algorithm X * set algorithm X
* offset 424 * offset 424
*/ */
engine_load_mode_e fuelAlgorithm; engine_load_mode_e fuelAlgorithm;
@ -1004,7 +1004,7 @@ typedef struct {
injection_mode_e crankingInjectionMode; injection_mode_e crankingInjectionMode;
/** /**
* 'batched' means two injectors are wired together * 'batched' means two injectors are wired together
* set_injection_mode X * set injection_mode X
* offset 432 * offset 432
*/ */
injection_mode_e injectionMode; injection_mode_e injectionMode;
@ -1017,13 +1017,13 @@ typedef struct {
angle_t extraInjectionOffset; angle_t extraInjectionOffset;
/** /**
* Timing advance while engine cranking * Timing advance while engine cranking
* set_cranking_timing_angle X * set cranking_timing_angle X
* offset 440 * offset 440
*/ */
angle_t crankingTimingAngle; angle_t crankingTimingAngle;
/** /**
* 'wasted' means one coil is driving two spark plugs in two cylinders, with one of the aparks not doing anything since it's happening on the exhaust cycle * 'wasted' means one coil is driving two spark plugs in two cylinders, with one of the aparks not doing anything since it's happening on the exhaust cycle
* set_ignition_mode X * set ignition_mode X
* offset 444 * offset 444
*/ */
ignition_mode_e ignitionMode; ignition_mode_e ignitionMode;
@ -1045,7 +1045,7 @@ typedef struct {
/** /**
* Angle between Top Dead Center (TDC) and the first trigger event. * Angle between Top Dead Center (TDC) and the first trigger event.
* Knowing this angle allows us to control timing and other angles in reference to TDC. * Knowing this angle allows us to control timing and other angles in reference to TDC.
* set_global_trigger_offset_angle X * set global_trigger_offset_angle X
* offset 460 * offset 460
*/ */
angle_t globalTriggerAngleOffset; angle_t globalTriggerAngleOffset;
@ -2006,4 +2006,4 @@ typedef struct {
#endif #endif
// end // end
// this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Tue Dec 27 23:08:47 EST 2016 // this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Thu Jan 12 23:31:45 EST 2017

1
firmware/controllers/algo/firing_order.h
View File

@ -36,6 +36,7 @@ typedef enum {
FO_1_5_3_6_2_4 = 4, FO_1_5_3_6_2_4 = 4,
FO_1_4_2_5_3_6 = 7, FO_1_4_2_5_3_6 = 7,
FO_1_2_3_4_5_6 = 9, FO_1_2_3_4_5_6 = 9,
FO_1_6_3_2_5_4 = 13, // EG33
Force_4b_firing_order = ENUM_32_BITS, Force_4b_firing_order = ENUM_32_BITS,
} firing_order_e; } firing_order_e;

3
firmware/controllers/math/engine_math.cpp
View File

@ -289,6 +289,7 @@ static int order_1_2_4_5_3[] = {1, 2, 4, 5, 3};
static int order_1_THEN_5_THEN_3_THEN_6_THEN_2_THEN_4[] = { 1, 5, 3, 6, 2, 4 }; static int order_1_THEN_5_THEN_3_THEN_6_THEN_2_THEN_4[] = { 1, 5, 3, 6, 2, 4 };
static int order_1_THEN_4_THEN_2_THEN_5_THEN_3_THEN_6[] = { 1, 4, 2, 5, 3, 6 }; static int order_1_THEN_4_THEN_2_THEN_5_THEN_3_THEN_6[] = { 1, 4, 2, 5, 3, 6 };
static int order_1_THEN_2_THEN_3_THEN_4_THEN_5_THEN_6[] = { 1, 2, 3, 4, 5, 6 }; static int order_1_THEN_2_THEN_3_THEN_4_THEN_5_THEN_6[] = { 1, 2, 3, 4, 5, 6 };
static int order_1_6_3_2_5_4[] = {1, 6, 3, 2, 5, 4};
static int order_1_8_4_3_6_5_7_2[] = { 1, 8, 4, 3, 6, 5, 7, 2 }; static int order_1_8_4_3_6_5_7_2[] = { 1, 8, 4, 3, 6, 5, 7, 2 };
@ -332,6 +333,8 @@ int getCylinderId(firing_order_e firingOrder, int index) {
return order_1_THEN_4_THEN_2_THEN_5_THEN_3_THEN_6[index]; return order_1_THEN_4_THEN_2_THEN_5_THEN_3_THEN_6[index];
case FO_1_2_3_4_5_6: case FO_1_2_3_4_5_6:
return order_1_THEN_2_THEN_3_THEN_4_THEN_5_THEN_6[index]; return order_1_THEN_2_THEN_3_THEN_4_THEN_5_THEN_6[index];
case FO_1_6_3_2_5_4:
return order_1_6_3_2_5_4[index];
// 8 cylinder // 8 cylinder
case FO_1_8_4_3_6_5_7_2: case FO_1_8_4_3_6_5_7_2:

2
firmware/integration/rusefi_config.txt
View File

@ -259,7 +259,7 @@ cylinders_count_t cylindersCount;
! FO_1_8_4_3_6_5_7_2 = 5 ! FO_1_8_4_3_6_5_7_2 = 5
! FO_1_2_4_5_3 = 6 ! FO_1_2_4_5_3 = 6
custom firing_order_e 4 bits, U32, @OFFSET@, [0:3], "One Cylinder", "1-3-4-2", "1-2-4-3", "1-3-2-4", "1-5-3-6-2-4", "1-8-4-3-6-5-7-2", "1-2-4-5-3", "1-4-2-5-3-6", "1-2", "1_2_3_4_5_6", "1-2-3", "1-8-7-2-6-5-4-3", "1-5-4-2-6-3-7-8", "fo13", "fo14", "INVALID" custom firing_order_e 4 bits, U32, @OFFSET@, [0:3], "One Cylinder", "1-3-4-2", "1-2-4-3", "1-3-2-4", "1-5-3-6-2-4", "1-8-4-3-6-5-7-2", "1-2-4-5-3", "1-4-2-5-3-6", "1-2", "1_2_3_4_5_6", "1-2-3", "1-8-7-2-6-5-4-3", "1-5-4-2-6-3-7-8", "1-6-3-2-5-4", "fo14", "INVALID"
firing_order_e firingOrder; firing_order_e firingOrder;
end_struct end_struct