diff options
| author | Victoria Plitt <Victoria.Plitt@twine-s.com> | 2019-11-12 12:19:21 +0200 |
|---|---|---|
| committer | Victoria Plitt <Victoria.Plitt@twine-s.com> | 2019-11-12 12:19:21 +0200 |
| commit | 81ad4efdc9ec8593a75bf68fb3b39b97aa35aaa6 (patch) | |
| tree | 6ba5e19119cc7ed03be9389da224a27c12690385 /Software/Embedded_SW/Embedded/Modules | |
| parent | f28e23366e163ac8bc057155af007356e94c8871 (diff) | |
| parent | c6af542da0444af8f89209e5300440a8271791af (diff) | |
| download | Tango-81ad4efdc9ec8593a75bf68fb3b39b97aa35aaa6.tar.gz Tango-81ad4efdc9ec8593a75bf68fb3b39b97aa35aaa6.zip | |
Merge branch 'master' of https://twinetfs.visualstudio.com/Tango/_git/Tango
Diffstat (limited to 'Software/Embedded_SW/Embedded/Modules')
| -rw-r--r-- | Software/Embedded_SW/Embedded/Modules/Stubs_Handler/Stub_MidTankPressureSensor.c | 12 |
1 files changed, 11 insertions, 1 deletions
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; |