Pump depend on CAN

Northeastern-Electric-Racing · Jan 31, 2025 · f2a8e68 · f2a8e68
1 parent 33009f6
commit f2a8e68
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 9 deletions.
diff --git a/Core/Inc/control.h b/Core/Inc/control.h
@@ -5,7 +5,7 @@
 #include "can.h"
 
 #define CONTROL_CANID_FANBATTBOX 0x4A1
-#define CONTROL_CANID_PUMP0	 0x4A0
+#define CONTROL_CANID_PUMP	 0x4A0
 
 extern osThreadId_t control_handle;
 extern const osThreadAttr_t control_attributes;
@@ -14,6 +14,6 @@ void vControl(void *param);
 
 void control_fanbattbox_record(can_msg_t args);
 
-void control_pump0_record(can_msg_t msg);
+void control_pump_record(can_msg_t msg);
 
 #endif
diff --git a/Core/Src/can_handler.c b/Core/Src/can_handler.c
@@ -157,8 +157,8 @@ void vCanReceive(void *pv_params)
 			case CONTROL_CANID_FANBATTBOX:
 				control_fanbattbox_record(msg);
 				break;
-			case CONTROL_CANID_PUMP0:
-				control_pump0_record(msg);
+			case CONTROL_CANID_PUMP:
+				control_pump_record(msg);
 			default:
 				break;
 			}

diff --git a/Core/Src/control.c b/Core/Src/control.c
@@ -10,7 +10,7 @@ const osThreadAttr_t control_attributes = {
 
 static int fanBattBoxState = 0;
 
-static int pump0State = 0;
+static int pumpState = 0;
 
 void vControl(void *param)
 {
@@ -19,7 +19,8 @@ void vControl(void *param)
 	for (;;) {
 		write_fan_battbox(pdu, fanBattBoxState);
 
-		write_pump(pdu, pump0State);
+		write_pump_0(pdu, pumpState);
+		write_pump_1(pdu, pumpState);
 
 		osDelay(1000);
 	}
@@ -34,11 +35,11 @@ void control_fanbattbox_record(can_msg_t msg)
 	}
 }
 
-void control_pump0_record(can_msg_t msg)
+void control_pump_record(can_msg_t msg)
 {
 	if (msg.data[0] > 0) {
-		pump0State = 1;
+		pumpState = 1;
 	} else {
-		pump0State = 0;
+		pumpState = 0;
 	}
 }