Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/fome-tech/fome-fw
Browse files Browse the repository at this point in the history
  • Loading branch information
@mck1117
mck1117 committed Jun 23, 2023
2 parents 8cb484f + cf4f779 commit 2adf683
Show file tree
Hide file tree
Showing 70 changed files with 1,527 additions and 393 deletions.
115 changes: 69 additions & 46 deletions ...ig/boards/subaru_eg33/config/controllers/algo/engine_configuration_generated_structures.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -520,7 +520,7 @@ struct engine_configuration_s {
bool useFordRedundantTps : 1 {};

// offset 88 bit 2
bool unused88b2 : 1 {};
bool lambdaProtectionEnable : 1 {};

// offset 88 bit 3
bool overrideTriggerGaps : 1 {};
Expand Down Expand Up @@ -1131,8 +1131,12 @@ struct engine_configuration_s {
// offset 640
scaled_channel<uint16_t, 1000, 1> fordInjectorSmallPulseSlope;

// RPM
// offset 642
uint8_t unused638[2];
scaled_channel<uint8_t, 1, 100> lambdaProtectionMinRpm;

// offset 643
scaled_channel<uint8_t, 1, 10> lambdaProtectionMinLoad;

// offset 644 bit 0
bool is_enabled_spi_1 : 1 {};
Expand Down Expand Up @@ -1217,31 +1221,31 @@ struct engine_configuration_s {
bool enableAemXSeries : 1 {};

// offset 644 bit 23
bool unusedBit_195_23 : 1 {};
bool unusedBit_196_23 : 1 {};

// offset 644 bit 24
bool unusedBit_195_24 : 1 {};
bool unusedBit_196_24 : 1 {};

// offset 644 bit 25
bool unusedBit_195_25 : 1 {};
bool unusedBit_196_25 : 1 {};

// offset 644 bit 26
bool unusedBit_195_26 : 1 {};
bool unusedBit_196_26 : 1 {};

// offset 644 bit 27
bool unusedBit_195_27 : 1 {};
bool unusedBit_196_27 : 1 {};

// offset 644 bit 28
bool unusedBit_195_28 : 1 {};
bool unusedBit_196_28 : 1 {};

// offset 644 bit 29
bool unusedBit_195_29 : 1 {};
bool unusedBit_196_29 : 1 {};

// offset 644 bit 30
bool unusedBit_195_30 : 1 {};
bool unusedBit_196_30 : 1 {};

// offset 644 bit 31
bool unusedBit_195_31 : 1 {};
bool unusedBit_196_31 : 1 {};

// offset 648
brain_input_pin_e logicAnalyzerPins[LOGIC_ANALYZER_CHANNEL_COUNT];
Expand Down Expand Up @@ -1390,7 +1394,15 @@ struct engine_configuration_s {
uint16_t startCrankingDuration;

// offset 748
uint8_t unused748[3];
scaled_channel<uint8_t, 1, 1> lambdaProtectionMinTps;

// Only respond once lambda is out of range for this period of time. Use to avoid transients triggering lambda protection when not needed
// s
// offset 749
scaled_channel<uint8_t, 10, 1> lambdaProtectionTimeout;

// offset 750
uint8_t unused748;

// offset 751
pin_output_mode_e acRelayPinMode;
Expand Down Expand Up @@ -1537,13 +1549,13 @@ struct engine_configuration_s {
bool verboseCan2 : 1 {};

// offset 808 bit 29
bool unusedBit_288_29 : 1 {};
bool unusedBit_291_29 : 1 {};

// offset 808 bit 30
bool unusedBit_288_30 : 1 {};
bool unusedBit_291_30 : 1 {};

// offset 808 bit 31
bool unusedBit_288_31 : 1 {};
bool unusedBit_291_31 : 1 {};

// offset 812
dc_io etbIo[ETB_COUNT];
Expand Down Expand Up @@ -1921,10 +1933,10 @@ struct engine_configuration_s {
bool ALSActivateInverted : 1 {};

// offset 1200 bit 30
bool unusedBit_393_30 : 1 {};
bool unusedBit_396_30 : 1 {};

// offset 1200 bit 31
bool unusedBit_393_31 : 1 {};
bool unusedBit_396_31 : 1 {};

// count
// offset 1204
Expand Down Expand Up @@ -2231,88 +2243,88 @@ struct engine_configuration_s {
bool injectorFlowAsMassFlow : 1 {};

// offset 1436 bit 4
bool unusedBit_467_4 : 1 {};
bool unusedBit_470_4 : 1 {};

// offset 1436 bit 5
bool unusedBit_467_5 : 1 {};
bool unusedBit_470_5 : 1 {};

// offset 1436 bit 6
bool unusedBit_467_6 : 1 {};
bool unusedBit_470_6 : 1 {};

// offset 1436 bit 7
bool unusedBit_467_7 : 1 {};
bool unusedBit_470_7 : 1 {};

// offset 1436 bit 8
bool unusedBit_467_8 : 1 {};
bool unusedBit_470_8 : 1 {};

// offset 1436 bit 9
bool unusedBit_467_9 : 1 {};
bool unusedBit_470_9 : 1 {};

// offset 1436 bit 10
bool unusedBit_467_10 : 1 {};
bool unusedBit_470_10 : 1 {};

// offset 1436 bit 11
bool unusedBit_467_11 : 1 {};
bool unusedBit_470_11 : 1 {};

// offset 1436 bit 12
bool unusedBit_467_12 : 1 {};
bool unusedBit_470_12 : 1 {};

// offset 1436 bit 13
bool unusedBit_467_13 : 1 {};
bool unusedBit_470_13 : 1 {};

// offset 1436 bit 14
bool unusedBit_467_14 : 1 {};
bool unusedBit_470_14 : 1 {};

// offset 1436 bit 15
bool unusedBit_467_15 : 1 {};
bool unusedBit_470_15 : 1 {};

// offset 1436 bit 16
bool unusedBit_467_16 : 1 {};
bool unusedBit_470_16 : 1 {};

// offset 1436 bit 17
bool unusedBit_467_17 : 1 {};
bool unusedBit_470_17 : 1 {};

// offset 1436 bit 18
bool unusedBit_467_18 : 1 {};
bool unusedBit_470_18 : 1 {};

// offset 1436 bit 19
bool unusedBit_467_19 : 1 {};
bool unusedBit_470_19 : 1 {};

// offset 1436 bit 20
bool unusedBit_467_20 : 1 {};
bool unusedBit_470_20 : 1 {};

// offset 1436 bit 21
bool unusedBit_467_21 : 1 {};
bool unusedBit_470_21 : 1 {};

// offset 1436 bit 22
bool unusedBit_467_22 : 1 {};
bool unusedBit_470_22 : 1 {};

// offset 1436 bit 23
bool unusedBit_467_23 : 1 {};
bool unusedBit_470_23 : 1 {};

// offset 1436 bit 24
bool unusedBit_467_24 : 1 {};
bool unusedBit_470_24 : 1 {};

// offset 1436 bit 25
bool unusedBit_467_25 : 1 {};
bool unusedBit_470_25 : 1 {};

// offset 1436 bit 26
bool unusedBit_467_26 : 1 {};
bool unusedBit_470_26 : 1 {};

// offset 1436 bit 27
bool unusedBit_467_27 : 1 {};
bool unusedBit_470_27 : 1 {};

// offset 1436 bit 28
bool unusedBit_467_28 : 1 {};
bool unusedBit_470_28 : 1 {};

// offset 1436 bit 29
bool unusedBit_467_29 : 1 {};
bool unusedBit_470_29 : 1 {};

// offset 1436 bit 30
bool unusedBit_467_30 : 1 {};
bool unusedBit_470_30 : 1 {};

// offset 1436 bit 31
bool unusedBit_467_31 : 1 {};
bool unusedBit_470_31 : 1 {};

// Time between bench test pulses
// ms
Expand Down Expand Up @@ -3800,6 +3812,17 @@ struct persistent_config_s {
// offset 22476
blend_table_s boostClosedLoopBlends[BOOST_BLEND_COUNT];

// lambda
// offset 22852
scaled_channel<uint8_t, 100, 1> lambdaMaxDeviationTable[4][4];

// offset 22868
uint16_t lambdaMaxDeviationLoadBins[4];

// RPM
// offset 22876
uint16_t lambdaMaxDeviationRpmBins[4];

};
static_assert(sizeof(persistent_config_s) == 22852);
static_assert(sizeof(persistent_config_s) == 22884);

8 changes: 4 additions & 4 deletions firmware/config/boards/subaru_eg33/config/controllers/algo/rusefi_generated.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -894,7 +894,7 @@
#define PACK_PERCENT_BYTE_MULT 100.0
#define PEDAL_TO_TPS_SIZE 8
#define PERCENT_TRIM_BYTE_PACKING_DIV 0.02
#define persistent_config_s_size 22852
#define persistent_config_s_size 22884
#define pid_s_size 20
#define PidAutoTune_AutoTunerState_AUTOTUNER_OFF 0
#define PidAutoTune_AutoTunerState_CONVERGED 16
Expand Down Expand Up @@ -981,7 +981,7 @@
#define show_Frankenso_presets false
#define show_Proteus_presets false
#define show_test_presets false
#define SIGNATURE_HASH 3695117289
#define SIGNATURE_HASH 3454865741
#define spi_device_e_auto_enum 0="SPI_NONE",1="SPI_DEVICE_1",2="SPI_DEVICE_2",3="SPI_DEVICE_3",4="SPI_DEVICE_4"
#define spi_device_e_SPI_DEVICE_1 1
#define spi_device_e_SPI_DEVICE_2 2
Expand Down Expand Up @@ -1027,7 +1027,7 @@
#define TOOTH_PACKET_SIZE 2
#define TOP_DEAD_CENTER_MESSAGE "r"
#define TORQUE_CURVE_SIZE 6
#define TOTAL_CONFIG_SIZE 22852
#define TOTAL_CONFIG_SIZE 22884
#define TPS_2_BYTE_PACKING_MULT 100
#define TPS_TPS_ACCEL_CLT_CORR_TABLE 4
#define TPS_TPS_ACCEL_TABLE 8
Expand Down Expand Up @@ -1248,7 +1248,7 @@
#define ts_show_vbatt true
#define ts_show_vr_threshold_2 true
#define ts_show_vr_threshold_all true
#define TS_SIGNATURE "rusEFI (FOME) master.2023.06.23.subaru_eg33_f7.3695117289"
#define TS_SIGNATURE "rusEFI (FOME) master.2023.06.23.subaru_eg33_f7.3454865741"
#define TS_SINGLE_WRITE_COMMAND 'W'
#define TS_SINGLE_WRITE_COMMAND_char W
#define TS_TEST_COMMAND 't'
Expand Down
Loading

0 comments on commit 2adf683

Please sign in to comment.