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 Jan 3, 2025
2 parents e836f3b + 6da2d6f commit 1d8fd10
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 35 deletions.
9 changes: 4 additions & 5 deletions java_console/models/src/main/java/com/rusefi/config/generated/TriggerState.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
public class TriggerState {
public static final int BANKS_COUNT = 2;
public static final int BOOST_BLEND_COUNT = 2;
public static final int CAM_INPUTS_COUNT = 4;
public static final int CAMS_PER_BANK = 2;
public static final int CAM_INPUTS_COUNT = 4;
public static final int EGT_CHANNEL_COUNT = 8;
public static final String GAUGE_CATEGORY_ETB = "ETB more";
public static final String GAUGE_COIL_DWELL_TIME = "Ign: Dwell";
Expand Down Expand Up @@ -59,9 +59,9 @@ public class TriggerState {
public static final String GAUGE_NAME_FUEL_CRANKING = "Fuel: cranking";
public static final String GAUGE_NAME_FUEL_FLOW = "Fuel: Flow rate";
public static final String GAUGE_NAME_FUEL_IAT_CORR = "Fuel: IAT correction";
public static final String GAUGE_NAME_FUEL_INJECTION_TIMING = "Fuel: Injection timing SOI";
public static final String GAUGE_NAME_FUEL_INJ_DUTY = "Fuel: injector duty cycle";
public static final String GAUGE_NAME_FUEL_INJ_DUTY_STAGE_2 = "Fuel: injector duty cycle stage 2";
public static final String GAUGE_NAME_FUEL_INJECTION_TIMING = "Fuel: Injection timing SOI";
public static final String GAUGE_NAME_FUEL_LAST_INJECTION = "Fuel: Last inj pulse width";
public static final String GAUGE_NAME_FUEL_LAST_INJECTION_STAGE_2 = "Fuel: Last inj pulse width stg 2";
public static final String GAUGE_NAME_FUEL_LEVEL = "Fuel level";
Expand Down Expand Up @@ -98,8 +98,8 @@ public class TriggerState {
public static final String GAUGE_NAME_RPM = "RPM";
public static final String GAUGE_NAME_TARGET_AFR = "Fuel: target AFR";
public static final String GAUGE_NAME_TARGET_LAMBDA = "Fuel: target lambda";
public static final String GAUGE_NAME_TC_RATIO = "TCU: Torque Converter Ratio";
public static final String GAUGE_NAME_TCHARGE = "Air: SD tCharge";
public static final String GAUGE_NAME_TC_RATIO = "TCU: Torque Converter Ratio";
public static final String GAUGE_NAME_THROTTLE_PEDAL = "Throttle pedal position";
public static final String GAUGE_NAME_TIME = "Time";
public static final String GAUGE_NAME_TIMING_ADVANCE = "Ign: Timing Base";
Expand Down Expand Up @@ -152,15 +152,14 @@ public class TriggerState {
public static final int PACK_MULT_PRESSURE = 30;
public static final int PACK_MULT_TEMPERATURE = 100;
public static final int PACK_MULT_VOLTAGE = 1000;
public static final double PACK_PERCENT_BYTE_MULT = 100.0;
public static final int STFT_BANK_COUNT = 4;
public static final int TPS_2_BYTE_PACKING_MULT = 100;
public static final int VE_BLEND_COUNT = 4;
public static final Field TRIGGERSYNCGAPRATIO = Field.create("TRIGGERSYNCGAPRATIO", 0, FieldType.FLOAT).setBaseOffset(1028);
public static final Field CRANKSYNCHRONIZATIONCOUNTER = Field.create("CRANKSYNCHRONIZATIONCOUNTER", 4, FieldType.INT16).setScale(1.0).setBaseOffset(1028);
public static final Field TRIGGERERRORCOUNTER = Field.create("TRIGGERERRORCOUNTER", 6, FieldType.INT16).setScale(1.0).setBaseOffset(1028);
public static final Field TRIGGERSTATEINDEX = Field.create("TRIGGERSTATEINDEX", 8, FieldType.INT8).setScale(1.0).setBaseOffset(1028);
public static final Field ALIGNMENTFILL_AT_9 = Field.create("ALIGNMENTFILL_AT_9", 9, FieldType.INT8).setScale(1.0).setBaseOffset(1028);
public static final Field EDGECOUNTRISE = Field.create("EDGECOUNTRISE", 10, FieldType.INT16).setScale(1.0).setBaseOffset(1028);
public static final Field EDGECOUNTFALL = Field.create("EDGECOUNTFALL", 12, FieldType.INT16).setScale(1.0).setBaseOffset(1028);
public static final Field ALIGNMENTFILL_AT_14 = Field.create("ALIGNMENTFILL_AT_14", 14, FieldType.INT8).setScale(1.0).setBaseOffset(1028);
}
34 changes: 4 additions & 30 deletions java_console/models/src/main/java/com/rusefi/config/generated/TsOutputs.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
public class TsOutputs {
public static final int BANKS_COUNT = 2;
public static final int BOOST_BLEND_COUNT = 2;
public static final int CAM_INPUTS_COUNT = 4;
public static final int CAMS_PER_BANK = 2;
public static final int CAM_INPUTS_COUNT = 4;
public static final int EGT_CHANNEL_COUNT = 8;
public static final String GAUGE_CATEGORY_ETB = "ETB more";
public static final String GAUGE_COIL_DWELL_TIME = "Ign: Dwell";
Expand Down Expand Up @@ -59,9 +59,9 @@ public class TsOutputs {
public static final String GAUGE_NAME_FUEL_CRANKING = "Fuel: cranking";
public static final String GAUGE_NAME_FUEL_FLOW = "Fuel: Flow rate";
public static final String GAUGE_NAME_FUEL_IAT_CORR = "Fuel: IAT correction";
public static final String GAUGE_NAME_FUEL_INJECTION_TIMING = "Fuel: Injection timing SOI";
public static final String GAUGE_NAME_FUEL_INJ_DUTY = "Fuel: injector duty cycle";
public static final String GAUGE_NAME_FUEL_INJ_DUTY_STAGE_2 = "Fuel: injector duty cycle stage 2";
public static final String GAUGE_NAME_FUEL_INJECTION_TIMING = "Fuel: Injection timing SOI";
public static final String GAUGE_NAME_FUEL_LAST_INJECTION = "Fuel: Last inj pulse width";
public static final String GAUGE_NAME_FUEL_LAST_INJECTION_STAGE_2 = "Fuel: Last inj pulse width stg 2";
public static final String GAUGE_NAME_FUEL_LEVEL = "Fuel level";
Expand Down Expand Up @@ -98,8 +98,8 @@ public class TsOutputs {
public static final String GAUGE_NAME_RPM = "RPM";
public static final String GAUGE_NAME_TARGET_AFR = "Fuel: target AFR";
public static final String GAUGE_NAME_TARGET_LAMBDA = "Fuel: target lambda";
public static final String GAUGE_NAME_TC_RATIO = "TCU: Torque Converter Ratio";
public static final String GAUGE_NAME_TCHARGE = "Air: SD tCharge";
public static final String GAUGE_NAME_TC_RATIO = "TCU: Torque Converter Ratio";
public static final String GAUGE_NAME_THROTTLE_PEDAL = "Throttle pedal position";
public static final String GAUGE_NAME_TIME = "Time";
public static final String GAUGE_NAME_TIMING_ADVANCE = "Ign: Timing Base";
Expand Down Expand Up @@ -152,34 +152,10 @@ public class TsOutputs {
public static final int PACK_MULT_PRESSURE = 30;
public static final int PACK_MULT_TEMPERATURE = 100;
public static final int PACK_MULT_VOLTAGE = 1000;
public static final double PACK_PERCENT_BYTE_MULT = 100.0;
public static final int STFT_BANK_COUNT = 4;
public static final int TPS_2_BYTE_PACKING_MULT = 100;
public static final int VE_BLEND_COUNT = 4;
public static final Field SD_PRESENT = Field.create("SD_PRESENT", 0, FieldType.BIT, 0).setBaseOffset(0);
public static final Field SD_LOGGING_INTERNAL = Field.create("SD_LOGGING_INTERNAL", 0, FieldType.BIT, 1).setBaseOffset(0);
public static final Field TRIGGERSCOPEREADY = Field.create("TRIGGERSCOPEREADY", 0, FieldType.BIT, 2).setBaseOffset(0);
public static final Field ANTILAGTRIGGERED = Field.create("ANTILAGTRIGGERED", 0, FieldType.BIT, 3).setBaseOffset(0);
public static final Field ISO2HEATERON = Field.create("ISO2HEATERON", 0, FieldType.BIT, 4).setBaseOffset(0);
public static final Field CHECKENGINE = Field.create("CHECKENGINE", 0, FieldType.BIT, 5).setBaseOffset(0);
public static final Field NEEDBURN = Field.create("NEEDBURN", 0, FieldType.BIT, 6).setBaseOffset(0);
public static final Field SD_MSD = Field.create("SD_MSD", 0, FieldType.BIT, 7).setBaseOffset(0);
public static final Field ACRACTIVE = Field.create("ACRACTIVE", 0, FieldType.BIT, 8).setBaseOffset(0);
public static final Field TOOTHLOGREADY = Field.create("TOOTHLOGREADY", 0, FieldType.BIT, 9).setBaseOffset(0);
public static final Field ISTPSERROR = Field.create("ISTPSERROR", 0, FieldType.BIT, 10).setBaseOffset(0);
public static final Field ISCLTERROR = Field.create("ISCLTERROR", 0, FieldType.BIT, 11).setBaseOffset(0);
public static final Field ISMAPERROR = Field.create("ISMAPERROR", 0, FieldType.BIT, 12).setBaseOffset(0);
public static final Field ISIATERROR = Field.create("ISIATERROR", 0, FieldType.BIT, 13).setBaseOffset(0);
public static final Field ISTRIGGERERROR = Field.create("ISTRIGGERERROR", 0, FieldType.BIT, 14).setBaseOffset(0);
public static final Field HASCRITICALERROR = Field.create("HASCRITICALERROR", 0, FieldType.BIT, 15).setBaseOffset(0);
public static final Field ISWARNNOW = Field.create("ISWARNNOW", 0, FieldType.BIT, 16).setBaseOffset(0);
public static final Field ISPEDALERROR = Field.create("ISPEDALERROR", 0, FieldType.BIT, 17).setBaseOffset(0);
public static final Field LAUNCHTRIGGERED = Field.create("LAUNCHTRIGGERED", 0, FieldType.BIT, 18).setBaseOffset(0);
public static final Field ISTPS2ERROR = Field.create("ISTPS2ERROR", 0, FieldType.BIT, 19).setBaseOffset(0);
public static final Field INJECTORFAULT = Field.create("INJECTORFAULT", 0, FieldType.BIT, 20).setBaseOffset(0);
public static final Field IGNITIONFAULT = Field.create("IGNITIONFAULT", 0, FieldType.BIT, 21).setBaseOffset(0);
public static final Field ISMAINRELAYON = Field.create("ISMAINRELAYON", 0, FieldType.BIT, 22).setBaseOffset(0);
public static final Field ISUSBCONNECTED = Field.create("ISUSBCONNECTED", 0, FieldType.BIT, 23).setBaseOffset(0);
public static final Field DFCOACTIVE = Field.create("DFCOACTIVE", 0, FieldType.BIT, 24).setBaseOffset(0);
public static final Field RPMVALUE = Field.create("RPMVALUE", 4, FieldType.INT16).setScale(1.0).setBaseOffset(0);
public static final Field RPMACCELERATION = Field.create("RPMACCELERATION", 6, FieldType.INT16).setScale(1.0).setBaseOffset(0);
public static final Field SPEEDTORPMRATIO = Field.create("SPEEDTORPMRATIO", 8, FieldType.INT16).setScale(0.01).setBaseOffset(0);
Expand Down Expand Up @@ -330,7 +306,6 @@ public class TsOutputs {
public static final Field LUAINVOCATIONCOUNTER = Field.create("LUAINVOCATIONCOUNTER", 312, FieldType.INT).setScale(1.0).setBaseOffset(0);
public static final Field LUALASTCYCLEDURATION = Field.create("LUALASTCYCLEDURATION", 316, FieldType.INT).setScale(1.0).setBaseOffset(0);
public static final Field TCU_CURRENTRANGE = Field.create("TCU_CURRENTRANGE", 320, FieldType.INT8).setScale(1.0).setBaseOffset(0);
public static final Field ALIGNMENTFILL_AT_321 = Field.create("ALIGNMENTFILL_AT_321", 321, FieldType.INT8).setScale(1.0).setBaseOffset(0);
public static final Field TCRATIO = Field.create("TCRATIO", 322, FieldType.INT16).setScale(0.01).setBaseOffset(0);
public static final Field LASTSHIFTTIME = Field.create("LASTSHIFTTIME", 324, FieldType.FLOAT).setBaseOffset(0);
public static final Field VSSEDGECOUNTER = Field.create("VSSEDGECOUNTER", 328, FieldType.INT).setScale(1.0).setBaseOffset(0);
Expand All @@ -348,7 +323,6 @@ public class TsOutputs {
public static final Field STARTERRELAYDISABLE = Field.create("STARTERRELAYDISABLE", 363, FieldType.INT8).setScale(1.0).setBaseOffset(0);
public static final Field MULTISPARKCOUNTER = Field.create("MULTISPARKCOUNTER", 364, FieldType.INT8).setScale(1.0).setBaseOffset(0);
public static final Field EXTIOVERFLOWCOUNT = Field.create("EXTIOVERFLOWCOUNT", 365, FieldType.INT8).setScale(1.0).setBaseOffset(0);
public static final Field ALIGNMENTFILL_AT_366 = Field.create("ALIGNMENTFILL_AT_366", 366, FieldType.INT8).setScale(1.0).setBaseOffset(0);
public static final Field ALTERNATORSTATUS_PTERM = Field.create("ALTERNATORSTATUS_PTERM", 368, FieldType.FLOAT).setBaseOffset(0);
public static final Field ALTERNATORSTATUS_ITERM = Field.create("ALTERNATORSTATUS_ITERM", 372, FieldType.INT16).setScale(0.01).setBaseOffset(0);
public static final Field ALTERNATORSTATUS_DTERM = Field.create("ALTERNATORSTATUS_DTERM", 374, FieldType.INT16).setScale(0.01).setBaseOffset(0);
Expand Down

0 comments on commit 1d8fd10

Please sign in to comment.