Merge branch 'master' of https://github.com/fome-tech/fome-fw

firmware/controllers/trigger/trigger_state_generated.h

@@ -7,22 +7,28 @@ struct trigger_state_s {
 	// Sync counter
 	// offset 4
 	uint16_t crankSynchronizationCounter = (uint16_t)0;
-	// Trigger state index
+	// Sync error counter
 	// offset 6
+	uint16_t triggerErrorCounter = (uint16_t)0;
+	// Trigger state index
+	// offset 8
 	uint8_t triggerStateIndex = (uint8_t)0;
-	// offset 7
-	uint8_t alignmentFill_at_7[1];
+	// offset 9
+	uint8_t alignmentFill_at_9[1];
 	// Edge count rise
-	// offset 8
+	// offset 10
 	uint16_t edgeCountRise = (uint16_t)0;
 	// Edge count fall
-	// offset 10
+	// offset 12
 	uint16_t edgeCountFall = (uint16_t)0;
+	// offset 14
+	uint8_t alignmentFill_at_14[2];
 };
-static_assert(sizeof(trigger_state_s) == 12);
+static_assert(sizeof(trigger_state_s) == 16);
 static_assert(offsetof(trigger_state_s, triggerSyncGapRatio) == 0);
 static_assert(offsetof(trigger_state_s, crankSynchronizationCounter) == 4);
-static_assert(offsetof(trigger_state_s, triggerStateIndex) == 6);
-static_assert(offsetof(trigger_state_s, edgeCountRise) == 8);
-static_assert(offsetof(trigger_state_s, edgeCountFall) == 10);
+static_assert(offsetof(trigger_state_s, triggerErrorCounter) == 6);
+static_assert(offsetof(trigger_state_s, triggerStateIndex) == 8);
+static_assert(offsetof(trigger_state_s, edgeCountRise) == 10);
+static_assert(offsetof(trigger_state_s, edgeCountFall) == 12);
 

java_console/models/src/main/java/com/rusefi/config/generated/Fields.java

@@ -83,7 +83,7 @@ public class Fields {
 	public static final int bench_mode_e_BENCH_VVT_3_TARGET_BUMP = 19;
 	public static final int bench_mode_e_BENCH_VVT_4_TARGET_BUMP = 20;
 	public static final int blend_table_s_size = 188;
-	public static final int BLOCKING_FACTOR = 1330;
+	public static final int BLOCKING_FACTOR = 1350;
 	public static final int BOOST_BLEND_COUNT = 2;
 	public static final int BOOST_LOAD_COUNT = 8;
 	public static final int BOOST_RPM_COUNT = 8;
@@ -512,7 +512,6 @@ public class Fields {
 	public static final String GAUGE_NAME_TIMING_ADVANCE = "Ign: Timing Base";
 	public static final String GAUGE_NAME_TPS = "TPS";
 	public static final String GAUGE_NAME_TPS2 = "TPS2";
-	public static final String GAUGE_NAME_TRG_ERR = "Trigger Error Counter";
 	public static final String GAUGE_NAME_TUNE_CRC16 = "Tune CRC16";
 	public static final String GAUGE_NAME_TURBO_SPEED = "Turbocharger Speed";
 	public static final String GAUGE_NAME_UPTIME = "Uptime";
@@ -1008,7 +1007,6 @@ public class Fields {
 	public static final int SentEtbType_FORD_TYPE_1 = 2;
 	public static final int SentEtbType_GM_TYPE_1 = 1;
 	public static final int SentEtbType_NONE = 0;
-	public static final int SIGNATURE_HASH = 1290495648;
 	public static final int spi_device_e_SPI_DEVICE_1 = 1;
 	public static final int spi_device_e_SPI_DEVICE_2 = 2;
 	public static final int spi_device_e_SPI_DEVICE_3 = 3;
@@ -1215,9 +1213,9 @@ public class Fields {
 	public static final int TS_RESPONSE_UNDERRUN = 0x80;
 	public static final int TS_RESPONSE_UNRECOGNIZED_COMMAND = 0x83;
 	public static final char TS_SET_LOGGER_SWITCH = 'l';
-	public static final String TS_SIGNATURE = "rusEFI (FOME) master.2024.12.13.f407-discovery.1290495648";
+	public static final String TS_SIGNATURE = "rusEFI (FOME) master.2024.12.13.f407-discovery.4110456652";
 	public static final char TS_SINGLE_WRITE_COMMAND = 'W';
-	public static final int TS_TOTAL_OUTPUT_SIZE = 1312;
+	public static final int TS_TOTAL_OUTPUT_SIZE = 1328;
 	public static final String TS_TRIGGER_SCOPE_CHANNEL_1_NAME = "Channel 1";
 	public static final String TS_TRIGGER_SCOPE_CHANNEL_2_NAME = "Channel 2";
 	public static final int TS_TRIGGER_SCOPE_DISABLE = 5;