diff options
| author | Shlomo Hecht <shlomo@twine-s.com> | 2018-08-13 09:46:03 +0300 |
|---|---|---|
| committer | Shlomo Hecht <shlomo@twine-s.com> | 2018-08-13 09:46:03 +0300 |
| commit | acde45615085df2a8ca4286f55f42ea16aee1943 (patch) | |
| tree | 918809bae4177156ba67816d9d73c452264ba90b /Software/Embedded_SW | |
| parent | ab9db3ed6e2436969c2d0169236c72768d4feaf2 (diff) | |
| download | Tango-acde45615085df2a8ca4286f55f42ea16aee1943.tar.gz Tango-acde45615085df2a8ca4286f55f42ea16aee1943.zip | |
pressure in bars
Diffstat (limited to 'Software/Embedded_SW')
| -rw-r--r-- | Software/Embedded_SW/Embedded/Modules/Diagnostics/Diagnostics.c | 2 | ||||
| -rw-r--r-- | Software/Embedded_SW/Embedded/Modules/IDS/IDS_init.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/Software/Embedded_SW/Embedded/Modules/Diagnostics/Diagnostics.c b/Software/Embedded_SW/Embedded/Modules/Diagnostics/Diagnostics.c index 56e2d65bb..a2031a2e2 100644 --- a/Software/Embedded_SW/Embedded/Modules/Diagnostics/Diagnostics.c +++ b/Software/Embedded_SW/Embedded/Modules/Diagnostics/Diagnostics.c @@ -256,7 +256,7 @@ void Diagnostic100msecCollection(void) for (i=0;i<MAX_SYSTEM_DISPENSERS;i++) { dispensermotorfrequency[i][DiagnosticsIndex] = MotorGetSpeed(HARDWARE_MOTOR_TYPE__MOTO_DISPENSER_1+i); - dispenserspressure[i][DiagnosticsIndex] = GetDispenserPressure(i)/1000000; + dispenserspressure[i][DiagnosticsIndex] = GetDispenserPressure(i); } /* dispenser1motorfrequency[DiagnosticsIndex] = MotorGetSpeed(HARDWARE_MOTOR_TYPE__MOTO_DISPENSER_1); dispenser2motorfrequency[DiagnosticsIndex] = MotorGetSpeed(HARDWARE_MOTOR_TYPE__MOTO_DISPENSER_2); diff --git a/Software/Embedded_SW/Embedded/Modules/IDS/IDS_init.c b/Software/Embedded_SW/Embedded/Modules/IDS/IDS_init.c index 1efce00e3..185d4ac66 100644 --- a/Software/Embedded_SW/Embedded/Modules/IDS/IDS_init.c +++ b/Software/Embedded_SW/Embedded/Modules/IDS/IDS_init.c @@ -66,7 +66,7 @@ float CalculateDispenserPressure (int DispenserId) //----------------------------------- //DispenserPressure[DispenserId] /= 1000000; //Pascal //DispenserPressure[DispenserId] *=10; //Bar; - DispenserPressure[DispenserId] *=10000000; //uBar; + //DispenserPressure[DispenserId] *=10000000; //uBar; //DispenserPressure[DispenserId] *=145.0377; //PSI; return(DispenserPressure[DispenserId]); |