From 2b36cc62f41d952ec5dbe208d0a7bc6fbd2c8664 Mon Sep 17 00:00:00 2001
From: rusefi <rusefillc@gmail.com>
Date: Fri, 1 Sep 2023 17:34:01 -0400
Subject: [PATCH] EPIC: we need to test fresh boards #5511 only:proteus_f7

---
 firmware/controllers/can/can_bench_test.cpp | 27 ++++++++++++++++-----
 firmware/libfirmware                        |  2 +-
 2 files changed, 22 insertions(+), 7 deletions(-)

diff --git a/firmware/controllers/can/can_bench_test.cpp b/firmware/controllers/can/can_bench_test.cpp
index ffa750af7b..ff74d0bf2a 100644
--- a/firmware/controllers/can/can_bench_test.cpp
+++ b/firmware/controllers/can/can_bench_test.cpp
@@ -11,8 +11,6 @@
 // raw values are 0..5V, convert it to 8-bit (0..255)
 #define RAW_TO_BYTE(v) TRUNCATE_TO_BYTE((int)(v * 255.0 / 5.0))
 
-#define RAW_ANALOG_VALUES_COUNT 8
-
 bool qcDirectPinControlMode = false;
 
 #if EFI_CAN_SUPPORT
@@ -71,7 +69,7 @@ void sendButtonCounters() {
 }
 
 void sendRawAnalogValues() {
-	const float values[RAW_ANALOG_VALUES_COUNT] = { 
+	const float values_1[] = {
 		Sensor::getRaw(SensorType::Tps1Primary),
 		Sensor::getRaw(SensorType::Tps1Secondary),
 		Sensor::getRaw(SensorType::AcceleratorPedalPrimary),
@@ -82,14 +80,31 @@ void sendRawAnalogValues() {
 		Sensor::getRaw(SensorType::BatteryVoltage),
 	};
 
+	const float values_2[] = {
+		Sensor::getRaw(SensorType::Tps2Primary),
+		Sensor::getRaw(SensorType::Tps2Secondary),
+		Sensor::getRaw(SensorType::AuxLinear1),
+		Sensor::getRaw(SensorType::AuxLinear2),
+	};
+	static_assert(efi::size(values_1) <= 8);
+	static_assert(efi::size(values_2) <= 8);
+
+
 	// send the first packet
 	{
-		CanTxMessage msg(CanCategory::BENCH_TEST, BENCH_TEST_RAW_ANALOG, 8, /*bus*/0, /*isExtended*/true);
-		for (int valueIdx = 0; valueIdx < 8; valueIdx++) {
-			msg[valueIdx] = (valueIdx < RAW_ANALOG_VALUES_COUNT) ? RAW_TO_BYTE(values[valueIdx]) : 0;
+		CanTxMessage msg(CanCategory::BENCH_TEST, BENCH_TEST_RAW_ANALOG_1, 8, /*bus*/0, /*isExtended*/true);
+		for (int valueIdx = 0; valueIdx < efi::size(values_1); valueIdx++) {
+			msg[valueIdx] = RAW_TO_BYTE(values_1[valueIdx]);
 		}
 	}
+	{
+		CanTxMessage msg(CanCategory::BENCH_TEST, BENCH_TEST_RAW_ANALOG_2, 8, /*bus*/0, /*isExtended*/true);
+		for (int valueIdx = 0; valueIdx < efi::size(values_2); valueIdx++) {
+			msg[valueIdx] = RAW_TO_BYTE(values_2[valueIdx]);
+		}
+
 	// todo: send the second packet
+	}
 }
 
 static void sendOutBoardMeta() {
diff --git a/firmware/libfirmware b/firmware/libfirmware
index 2017ab12ff..698a390196 160000
--- a/firmware/libfirmware
+++ b/firmware/libfirmware
@@ -1 +1 @@
-Subproject commit 2017ab12ffed28c75ee752fe277d1f36281e3803
+Subproject commit 698a3901968cd54790a70a469a897da56caecf08