From c6af542da0444af8f89209e5300440a8271791af Mon Sep 17 00:00:00 2001 From: Avi Levkovich Date: Mon, 11 Nov 2019 16:32:52 +0200 Subject: Add stub to head card ADC (using MidTankPressureSensor with ADC ID + 0x8000) --- .../Drivers/I2C_Communication/Head_Card/IO_Ports/Head_IO.h | 2 +- .../Modules/Stubs_Handler/Stub_MidTankPressureSensor.c | 12 +++++++++++- 2 files changed, 12 insertions(+), 2 deletions(-) (limited to 'Software/Embedded_SW/Embedded') diff --git a/Software/Embedded_SW/Embedded/Drivers/I2C_Communication/Head_Card/IO_Ports/Head_IO.h b/Software/Embedded_SW/Embedded/Drivers/I2C_Communication/Head_Card/IO_Ports/Head_IO.h index 9ba47752d..07a2e284c 100644 --- a/Software/Embedded_SW/Embedded/Drivers/I2C_Communication/Head_Card/IO_Ports/Head_IO.h +++ b/Software/Embedded_SW/Embedded/Drivers/I2C_Communication/Head_Card/IO_Ports/Head_IO.h @@ -188,7 +188,7 @@ enum HEADCARD_UPPER_HIT_OUT4, HEADCARD_HIT_MIXER, -}; +}HEADCARD_HEATERS_ENUM; typedef enum { diff --git a/Software/Embedded_SW/Embedded/Modules/Stubs_Handler/Stub_MidTankPressureSensor.c b/Software/Embedded_SW/Embedded/Modules/Stubs_Handler/Stub_MidTankPressureSensor.c index 20c4806e6..1c9b782c6 100644 --- a/Software/Embedded_SW/Embedded/Modules/Stubs_Handler/Stub_MidTankPressureSensor.c +++ b/Software/Embedded_SW/Embedded/Modules/Stubs_Handler/Stub_MidTankPressureSensor.c @@ -27,6 +27,8 @@ #include "drivers/I2C_Communication/ADC_MUX/ADC_MUX.h" +#include "drivers/I2C_Communication/Head_Card/ADC/Head_ADC.h" + void Stub_MidTankPressureSensorRequest(MessageContainer* requestContainer) { @@ -39,7 +41,15 @@ void Stub_MidTankPressureSensorRequest(MessageContainer* requestContainer) response.midtankid = request->midtankid; response.has_midtankid = true; - response.pressure = Read_MidTank_Pressure_Sensor((MidTank_t)request->midtankid); + if((MidTank_t)request->midtankid < NUM_OF_MIDTANKS) + { + response.pressure = Read_MidTank_Pressure_Sensor((MidTank_t)request->midtankid); + } + else if((request->midtankid & 0x8000) == 0x8000)//Head ADC + { + request->midtankid = request->midtankid &~0x8000; + response.pressure = Read_Head_ADC((HEAD_ADC_t)request->midtankid); // Head Current + } response.has_pressure = true; -- cgit v1.3.1