TurboMarian is the ALS boss

firmware/controllers/actuators/antilag.txt

@@ -1,5 +0,0 @@
-struct_no_prefix antilag_s
-
-bit isCltAllowing
-
-end_struct

firmware/controllers/actuators/antilag_generated.h

@@ -1,108 +0,0 @@
-// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/actuators/antilag.txt Wed Dec 14 22:50:16 EST 2022
-// by class com.rusefi.output.CHeaderConsumer
-// begin
-#pragma once
-#include "rusefi_types.h"
-// start of antilag_s
-struct antilag_s {
-	/**
-	offset 0 bit 0 */
-	bool isCltAllowing : 1 {};
-	/**
-	offset 0 bit 1 */
-	bool unusedBit_1_1 : 1 {};
-	/**
-	offset 0 bit 2 */
-	bool unusedBit_1_2 : 1 {};
-	/**
-	offset 0 bit 3 */
-	bool unusedBit_1_3 : 1 {};
-	/**
-	offset 0 bit 4 */
-	bool unusedBit_1_4 : 1 {};
-	/**
-	offset 0 bit 5 */
-	bool unusedBit_1_5 : 1 {};
-	/**
-	offset 0 bit 6 */
-	bool unusedBit_1_6 : 1 {};
-	/**
-	offset 0 bit 7 */
-	bool unusedBit_1_7 : 1 {};
-	/**
-	offset 0 bit 8 */
-	bool unusedBit_1_8 : 1 {};
-	/**
-	offset 0 bit 9 */
-	bool unusedBit_1_9 : 1 {};
-	/**
-	offset 0 bit 10 */
-	bool unusedBit_1_10 : 1 {};
-	/**
-	offset 0 bit 11 */
-	bool unusedBit_1_11 : 1 {};
-	/**
-	offset 0 bit 12 */
-	bool unusedBit_1_12 : 1 {};
-	/**
-	offset 0 bit 13 */
-	bool unusedBit_1_13 : 1 {};
-	/**
-	offset 0 bit 14 */
-	bool unusedBit_1_14 : 1 {};
-	/**
-	offset 0 bit 15 */
-	bool unusedBit_1_15 : 1 {};
-	/**
-	offset 0 bit 16 */
-	bool unusedBit_1_16 : 1 {};
-	/**
-	offset 0 bit 17 */
-	bool unusedBit_1_17 : 1 {};
-	/**
-	offset 0 bit 18 */
-	bool unusedBit_1_18 : 1 {};
-	/**
-	offset 0 bit 19 */
-	bool unusedBit_1_19 : 1 {};
-	/**
-	offset 0 bit 20 */
-	bool unusedBit_1_20 : 1 {};
-	/**
-	offset 0 bit 21 */
-	bool unusedBit_1_21 : 1 {};
-	/**
-	offset 0 bit 22 */
-	bool unusedBit_1_22 : 1 {};
-	/**
-	offset 0 bit 23 */
-	bool unusedBit_1_23 : 1 {};
-	/**
-	offset 0 bit 24 */
-	bool unusedBit_1_24 : 1 {};
-	/**
-	offset 0 bit 25 */
-	bool unusedBit_1_25 : 1 {};
-	/**
-	offset 0 bit 26 */
-	bool unusedBit_1_26 : 1 {};
-	/**
-	offset 0 bit 27 */
-	bool unusedBit_1_27 : 1 {};
-	/**
-	offset 0 bit 28 */
-	bool unusedBit_1_28 : 1 {};
-	/**
-	offset 0 bit 29 */
-	bool unusedBit_1_29 : 1 {};
-	/**
-	offset 0 bit 30 */
-	bool unusedBit_1_30 : 1 {};
-	/**
-	offset 0 bit 31 */
-	bool unusedBit_1_31 : 1 {};
-};
-static_assert(sizeof(antilag_s) == 4);
-
-// end
-// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/actuators/antilag.txt Wed Dec 14 22:50:16 EST 2022

firmware/controllers/algo/antilag_system_state.txt

@@ -0,0 +1,14 @@
+struct_no_prefix antilag_system_state_s
+
+bit isAntilagCondition
+bit ALSMinRPMCondition
+bit ALSMaxRPMCondition
+bit ALSMinCLTCondition
+bit ALSMaxCLTCondition
+bit ALSMaxTPSCondition
+bit AntilagcombinedConditions
+bit isALSSwitchActivated
+bit ALSActivatePinState
+bit ALSSwitchCondition
+
+end_struct

firmware/integration/LiveData.yaml

@@ -43,6 +43,11 @@ Usages:
     java: LaunchControl.java
     folder: controllers/algo
 
+  - name: antilag_system_state
+    java: AntilagSystem.java
+    folder: controllers/algo
+    output_name: als
+
   - name: boost_control
     java: BoostControl.java
     folder: controllers/actuators
@@ -124,8 +129,3 @@ Usages:
     java: WidebandController.java
     folder: controllers/sensors/
     output_name: [ "wb1", "wb2" ]
-
-  - name: antilag
-    java: AntiLag.java
-    folder: controllers/actuators
-    output_name: als

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

@@ -1,13 +0,0 @@
-package com.rusefi.config.generated;
-
-// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/actuators/antilag.txt Thu Dec 15 03:42:15 UTC 2022
-
-// by class com.rusefi.output.FileJavaFieldsConsumer
-import com.rusefi.config.*;
-
-public class AntiLag {
-	public static final Field ISCLTALLOWING = Field.create("ISCLTALLOWING", 0, FieldType.BIT, 0).setBaseOffset(1276);
-	public static final Field[] VALUES = {
-	ISCLTALLOWING,
-	};
-}