update dispenser p. sensore

2 files changed, 7 insertions, 4 deletions

diff --git a/Software/Embedded_SW/Embedded/Modules/IDS/IDS_init.c b/Software/Embedded_SW/Embedded/Modules/IDS/IDS_init.c
index 0c3d8c9e4..7a8f97c74 100644
--- a/Software/Embedded_SW/Embedded/Modules/IDS/IDS_init.c
+++ b/Software/Embedded_SW/Embedded/Modules/IDS/IDS_init.c
@@ -46,16 +46,18 @@ float CalculateDispenserPressure (int DispenserId)
     float Bits_0Pascal = Vlow * 4096 / 3; // Vlow * 4096bit / 3Vref = 709.973328 bits
     float Bits_1MPascal = VHigh * 4096 / 3; // VHigh * 4096bit / 3Vref = 3549.86646 bits
 
-    float a = (1 - 0) / (Bits_1MPascal - Bits_0Pascal);// Mpascal/Bits = 0.000352125
+    float a = (Bits_1MPascal - Bits_0Pascal) / (1 - 0) ;// Mpascal/Bits =
 
-    float b = 0 - (a * Bits_0Pascal );
+    float b = Bits_0Pascal - (a * 0 );
 
     data = ADC_GetReading(DispenserIdToPressureSensorId[DispenserId]);
 
     if(data<Bits_0Pascal)
         data = Bits_0Pascal;//40mA 0Bar
 
-    temp = a * data + b;
+    //temp = a * data + b;
+
+    temp = (data - b) / a;
 
     DispenserPressure[DispenserId] = temp; // [Mpascal] ( 1 Mpascal = 10 Bar )
 
diff --git a/Software/Embedded_SW/Embedded/Modules/Thread/Thread_print.c b/Software/Embedded_SW/Embedded/Modules/Thread/Thread_print.c
index b536c93b0..bca6f6533 100644
--- a/Software/Embedded_SW/Embedded/Modules/Thread/Thread_print.c
+++ b/Software/Embedded_SW/Embedded/Modules/Thread/Thread_print.c
@@ -20,7 +20,8 @@
 #include "StateMachines/Printing/PrintingSTM.h"
 
 #include "drivers/Motors/Motor.h"
-#include "drivers/Danser_SSI/ssi_comm.h"
+#include "drivers/SSI_Comm/ssi_comm.h"
+#include "drivers/SSI_Comm/Dancer/Dancer.h"
 #include "drivers/Heater/TemperatureSensor.h"
 #include "drivers/Heater/Heater.h"
 #include "drivers/Motors/Motor.h"