HD

rusefi · Feb 7, 2024 · b0b6423 · b0b6423
1 parent 785120b
commit b0b6423
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 29 deletions.
diff --git a/digital-inputs/firmware/can.cpp b/digital-inputs/firmware/can.cpp
@@ -293,7 +293,12 @@ void processCanRxMessage(const CANRxFrame& frame) {
 	        setNormalText();
 	    }
 	} else if (standardId == (WB_DATA_BASE_ADDR + 2)) {
-	    hasSeenWbo2 = true;
+	    if (!hasSeenWbo1) {
+	        setCyanText();
+	        chprintf(chp, " ***** WBO2 packet\n");
+	        hasSeenWbo2 = true;
+	        setNormalText();
+	    }
 	}
 }
 

diff --git a/digital-inputs/firmware/test_logic.cpp b/digital-inputs/firmware/test_logic.cpp
@@ -193,32 +193,6 @@ BoardConfig boardConfigs[] = {
 		"HS 1", "HS 2", "HS 3", "HS 4",
 				},
 	},
-	{
-		.boardName = "Proteus-HD",
-		.desiredEngineConfig = -1,
-		.boardIds = { STATIC_BOARD_ID_PROTEUS_HARLEY, 0 },
-		.channels = {
-            { nullptr, 0, 0, 0 },//			{ "TPS1_1", 1.0f, VOLT_7B * ANALOG_L, VOLT_7B * ANALOG_H },
-			{ nullptr, 0, 0, 0 },
-			{ nullptr, 0, 0, 0 },
-			{ nullptr, 0, 0, 0 },
-			{ nullptr, 0, 0, 0 },//{ "MAP", 1.0f, VOLT_8B * ANALOG_L, VOLT_8B * ANALOG_H_FOR_LOW_VOLTAGE },
-			{ nullptr, 0, 0, 0 },//{ "CLT", 1.0f, CLT_VALUE(PROTEUS_R) * ANALOG_L, CLT_VALUE(PROTEUS_R) * ANALOG_H },
-			{ nullptr, 0, 0, 0 },//{ "IAT", 1.0f, IAT_VALUE(PROTEUS_R) * ANALOG_L, IAT_VALUE(PROTEUS_R) * ANALOG_H },
-			{ "BATT", PROTEUS_VBATT_MULT, 9.0f, 15.0f },
-
-			{ nullptr, 0, 0, 0 }, // { "TPS2_1", 1.0f, 0.5f * ANALOG_L, 0.5f * ANALOG_H },
-			{ nullptr, 0, 0, 0 }, // { "TPS2_2", 1.0f, 0.5f * ANALOG_L, 0.5f * ANALOG_H },
-			{ nullptr, 0, 0, 0 },//{ "AUXL1", 1.0f, 1.35f * ANALOG_L, 1.35f * ANALOG_H },
-			{ nullptr, 0, 0, 0 },//{ "AUXL2", 1.0f, 2.23f * ANALOG_L, 2.23f * ANALOG_H },
-		},
-		.eventExpected = {/*crank*/true, false, /*cam1*/true, false, false, false, false},
-		.buttonExpected = {false, false, false},
-		.outputNames = {"Inj 1", "Inj 2", "Coil 1", "Coil 2",
-		    "ACR 1", "ACR 2",
-				},
-		.wboUnitsCount = 2,
-	},
 	{
 		.boardName = "mg1",
 		.desiredEngineConfig = -1,
@@ -270,7 +244,7 @@ BoardConfig boardConfigs[] = {
 	{
 		.boardName = "hd",
 		.desiredEngineConfig = -1,
-		.boardIds = { STATIC_BOARD_ID_PROTEUS_HARLEY, STATIC_BOARD_ID_HELLEN_HD, 0 },
+		.boardIds = { STATIC_BOARD_ID_PROTEUS_HARLEY, BOARD_ID_HD81_A, 0 },
 		.channels = {
 			{ "TPS1_1", PULLED_DOWN_RANGE(DOWN_7B, UP_7B, 680'000) },
 			{ "TPS1_2", 1, 0.767938368, /* ideally 0.860549952*/ 0.87 },
@@ -286,7 +260,7 @@ BoardConfig boardConfigs[] = {
 			{ nullptr, 0, 0, 0 },//{ "AUXL1", 1.0f, 1.35f * ANALOG_L, 1.35f * ANALOG_H },
 			{ nullptr, 0, 0, 0 },//{ "AUXL2", 1.0f, 2.23f * ANALOG_L, 2.23f * ANALOG_H },
 		},
-		.eventExpected = {/*crank*/true,
+		.eventExpected = {/*crank TODO */false,
 		false,
 		/*cam1*/true,
 		false, false, false,
@@ -295,8 +269,17 @@ BoardConfig boardConfigs[] = {
 		.outputNames = {
  "Injector 2",
  "Injector 1",
+"25 Front ACR",
+ "8 Rear ACR",
+"VVT Control",
+"63 Cooling Pump",
+"24 Front Coil 2",
+"43 Rear Coil 1",
+"4 Left Oil Fan / Coolant Pump",
+"1 Right Oil Cooling / Coolant Fan",
 	    },
         .wboUnitsCount = 2,
+		.dcHackValue = 0,
 	},
 	{
 		.boardName = "112-17",