stub vvt live data

FOME-Tech · Jul 2, 2023 · d17d902 · d17d902
1 parent 406aeae
commit d17d902
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 6 deletions.
diff --git a/firmware/console/binary/live_data.cpp b/firmware/console/binary/live_data.cpp
@@ -8,6 +8,7 @@
 #include "knock_controller_generated.h"
 #include "fuel_computer.h"
 #include "antilag_system_state_generated.h"
+#include "vvt_generated.h"
 
 template<>
 const output_channels_s* getLiveData(size_t) {

diff --git a/firmware/controllers/actuators/vvt.cpp b/firmware/controllers/actuators/vvt.cpp
@@ -12,10 +12,6 @@
 
 #define NO_PIN_PERIOD 500
 
-#if defined(HAS_OS_ACCESS)
-#error "Unexpected OS ACCESS HERE"
-#endif /* HAS_OS_ACCESS */
-
 using vvt_map_t = Map3D<SCRIPT_TABLE_8, SCRIPT_TABLE_8, int8_t, uint16_t, uint16_t>;
 
 static vvt_map_t vvtTable1;
@@ -184,3 +180,16 @@ void initVvtActuators() {
 }
 
 #endif
+
+template<>
+const vvt_s* getLiveData(size_t idx) {
+#if EFI_AUX_PID
+	if (idx >= efi::size(instances)) {
+		return nullptr;
+	}
+
+	return &instances[idx];
+#else
+	return nullptr;
+#endif
+}
diff --git a/firmware/controllers/actuators/vvt.h b/firmware/controllers/actuators/vvt.h
@@ -11,14 +11,15 @@
 #include "closed_loop_controller.h"
 #include "pwm_generator_logic.h"
 #include "efi_pid.h"
+#include "vvt_generated.h"
 
 class ValueProvider3D;
 
 void initVvtActuators();
 void startVvtControlPins();
 void stopVvtControlPins();
 
-class VvtController : public PeriodicTimerController, public ClosedLoopController<angle_t, percent_t> {
+class VvtController : public PeriodicTimerController, public ClosedLoopController<angle_t, percent_t>, public vvt_s {
 public:
 	void init(int index, int bankIndex, int camIndex, const ValueProvider3D* targetMap);
 

diff --git a/firmware/controllers/actuators/vvt.txt b/firmware/controllers/actuators/vvt.txt
@@ -0,0 +1,3 @@
+struct_no_prefix vvt_s
+	int vvt_placeholder
+end_struct
diff --git a/firmware/integration/LiveData.yaml b/firmware/integration/LiveData.yaml
@@ -155,5 +155,9 @@ Usages:
 
   - name: sent_state
     java: SentState.java
-    folder: controllers/sensors/
+    folder: controllers/sensors
     prepend: integration/rusefi_config_shared.txt
+
+  - name: vvt
+    java: VvtState.java
+    folder: controllers/actuators