Created seperate pair of pressure files

Author: mahir-mahota

Common/Inc/config.h

@@ -24,9 +24,9 @@
 
 // BEGIN KELLY DEFS
 // FRAME 1
-const Data_Segment_t DRIVING_DIRECTION_K       = {MOTOR_CONTROLLER_1, 1, 1};
-const Data_Segment_t MOTOR_SPEED_K             = {MOTOR_CONTROLLER_1, 2, 3};
-const Data_Segment_t MOTOR_ERROR_CODE_K        = {MOTOR_CONTROLLER_1, 4, 4};
+const Data_Segment_t DRIVING_DIRECTION_K       = {MOTOR_CONTROLLER_K1, 1, 1};
+const Data_Segment_t MOTOR_SPEED_K             = {MOTOR_CONTROLLER_K1, 2, 3};
+const Data_Segment_t MOTOR_ERROR_CODE_K        = {MOTOR_CONTROLLER_K1, 4, 4};
 // FRAME 2
 const Data_Segment_t BATTERY_VOLTAGE_K         = {MOTOR_CONTROLLER_K2, 1, 2};
 const Data_Segment_t BATTERY_CURRENT_K         = {MOTOR_CONTROLLER_K2, 3, 4};

Sensors/.cproject

@@ -175,5 +175,12 @@
 			<autodiscovery enabled="false" problemReportingEnabled="true" selectedProfileId=""/>
 		</scannerConfigBuildInfo>
 	</storageModule>
-	<storageModule moduleId="refreshScope"/>
+	<storageModule moduleId="refreshScope" versionNumber="2">
+		<configuration configurationName="Debug">
+			<resource resourceType="PROJECT" workspacePath="/Sensors"/>
+		</configuration>
+		<configuration configurationName="Release">
+			<resource resourceType="PROJECT" workspacePath="/Sensors"/>
+		</configuration>
+	</storageModule>
 </cproject>

Sensors/.project

@@ -29,4 +29,11 @@
 		<nature>org.eclipse.cdt.managedbuilder.core.managedBuildNature</nature>
 		<nature>org.eclipse.cdt.managedbuilder.core.ScannerConfigNature</nature>
 	</natures>
+	<linkedResources>
+		<link>
+			<name>Common</name>
+			<type>2</type>
+			<location>C:/Users/mahir/Desktop/Waterloop/G6-STM32/Common</location>
+		</link>
+	</linkedResources>
 </projectDescription>

Sensors/Core/Inc/pressure.h

@@ -0,0 +1,16 @@
+/*
+ * pressure.h
+ *
+ *  Created on: Apr 25, 2024
+ *      Author: mahesh, mahir
+ */
+
+#ifndef INC_PRESSURE_H_
+#define INC_PRESSURE_H_
+
+#include <stdint.h>
+#define MAX_ADC_VALUE 4095
+
+uint8_t poll_pressure_sensor(void);
+
+#endif /* INC_PRESSURE_H_ */

Sensors/Core/Src/main.c

@@ -28,7 +28,7 @@
 #include "can_driver.h"
 #include "config.h"
 #include "mpu6050.h"
-
+#include "pressure.h"
 /* USER CODE END Includes */
 
 /* Private typedef -----------------------------------------------------------*/
@@ -49,25 +49,13 @@
 /* Private variables ---------------------------------------------------------*/
 
 /* USER CODE BEGIN PV */
-uint32_t rawPressureSensorValue;
-float fCalculatedVoltageFromRawPressureSensorVal;
+
 /* USER CODE END PV */
 
 /* Private function prototypes -----------------------------------------------*/
 void SystemClock_Config(void);
 /* USER CODE BEGIN PFP */
-uint8_t poll_Pressure_Sensor(void){
-	HAL_ADC_PollForConversion(&hadc1,1000); // I haven't used HAL_MAX_DELAY here because we will be polling two more sensors after the pressure sensor, and waiting for an ADC conversion here indefinitely will result in the next two sensors not being read.
-	rawPressureSensorValue = HAL_ADC_GetValue(&hadc1);
-	//rawPressureSensorValue will be between 0 and 4095.
-	fCalculatedVoltageFromRawPressureSensorVal = rawPressureSensorValue * (3.3/4095.0);
-	//we now have a voltage between 0 and 3.3V
-	HAL_Delay(200);
-	//right now, I will configure this function to return the voltage itself
-	//later on, we need to edit this to return the pressure
-	//the pressure can be easily calculated from the voltage.
-	return (uint8_t)fCalculatedVoltageFromRawPressureSensorVal;
-}
+
 /* USER CODE END PFP */
 
 /* Private user code ---------------------------------------------------------*/

Sensors/Core/Src/pressure.c

@@ -0,0 +1,24 @@
+/*
+ * pressure.c
+ *
+ *  Created on: Apr 25, 2024
+ *      Author: mahesh, mahir
+ */
+
+#include "pressure.h"
+#include "adc.h"
+
+uint8_t poll_pressure_sensor(void){
+	/*
+	 * I haven't used HAL_MAX_DELAY here because we will be polling
+	 * two more sensors after the pressure sensor, and waiting for an
+	 * ADC conversion here indefinitely will result in delays.
+	*/
+	HAL_ADC_PollForConversion(&hadc1,1000);
+	uint32_t raw_pressure_sensor_value = HAL_ADC_GetValue(&hadc1);
+
+	//rawPressureSensorValue will be between 0 and 4095.
+	uint8_t pressure = (raw_pressure_sensor_value/MAX_ADC_VALUE);
+
+	return pressure;
+}