diff options
| author | Shlomo Hecht <shlomo@twine-s.com> | 2019-11-19 17:57:43 +0200 |
|---|---|---|
| committer | Shlomo Hecht <shlomo@twine-s.com> | 2019-11-19 17:57:43 +0200 |
| commit | 9e57a93b0278fb7205214ab8a486dcccf307f548 (patch) | |
| tree | 00caa2b901e059614a5a4c908e39c766b3f1e216 /Software/Embedded_SW/Embedded/Modules/General/MachineStatus.c | |
| parent | b0f410083832469938dc4f730c4f02c12fc0225a (diff) | |
| download | Tango-9e57a93b0278fb7205214ab8a486dcccf307f548.tar.gz Tango-9e57a93b0278fb7205214ab8a486dcccf307f548.zip | |
update protobuf to latest
Diffstat (limited to 'Software/Embedded_SW/Embedded/Modules/General/MachineStatus.c')
| -rw-r--r-- | Software/Embedded_SW/Embedded/Modules/General/MachineStatus.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/Software/Embedded_SW/Embedded/Modules/General/MachineStatus.c b/Software/Embedded_SW/Embedded/Modules/General/MachineStatus.c index 2a4800b77..e1a516e95 100644 --- a/Software/Embedded_SW/Embedded/Modules/General/MachineStatus.c +++ b/Software/Embedded_SW/Embedded/Modules/General/MachineStatus.c @@ -20,6 +20,7 @@ #include "PMR/MachineStatus/IDSPackLevel.pb-c.h" #include "drivers/I2C_Communication/ADC_MUX/ADC_MUX.h" +#include "Drivers/Heater/TemperatureSensor.h" #include "drivers/Motors/Motor.h" #include "Modules/General/MachineStatus.h" @@ -70,9 +71,10 @@ int MachineUpdateResponseFunc(void) double dispcapacity = (1.00-(IDS_Dispenser_Data[i].consumedinnanolitter/5800000))*130*1000*1000; IDS_Level[i].dispenserlevel = (int32_t)dispcapacity; IDS_Level[i].has_midtanklevel = true; - IDS_Level[i].midtanklevel = Get_MidTank_Int1000_Sensor(i); + IDS_Level[i].midtanklevel = Get_MidTank_Pressure_Sensor(i); MachineStatus.idspackslevels[MachineStatus.n_idspackslevels] = &IDS_Level[i]; MachineStatus.n_idspackslevels++; + MachineStatus.overalltemperature = max(MillisecGetTemperatures(TEMP_SENSE_AN_ENCLOSURETEMP1),MillisecGetTemperatures(TEMP_SENSE_AN_ENCLOSURETEMP2)); } } else |