diff options
| author | Avi Levkovich <avi@twine-s.com> | 2020-12-24 16:20:59 +0200 |
|---|---|---|
| committer | Avi Levkovich <avi@twine-s.com> | 2020-12-24 16:20:59 +0200 |
| commit | 71f7f59a5345c2df5d2fa8c641a88bf1d12bf063 (patch) | |
| tree | bea86c782bb1a56cef3c824468680e8f0b9df476 /Software/Embedded_SW/Embedded/Modules/IFS | |
| parent | 49251db3f95a2c3146fc94ef2d487042891a6220 (diff) | |
| parent | a7d02907a37ba35da13b03264ba5110bd08f83c1 (diff) | |
| download | Tango-71f7f59a5345c2df5d2fa8c641a88bf1d12bf063.tar.gz Tango-71f7f59a5345c2df5d2fa8c641a88bf1d12bf063.zip | |
Merge branch 'master' of https://twinetfs.visualstudio.com/Tango/_git/Tango
Diffstat (limited to 'Software/Embedded_SW/Embedded/Modules/IFS')
| -rw-r--r-- | Software/Embedded_SW/Embedded/Modules/IFS/ifs.c | 4 | ||||
| -rw-r--r-- | Software/Embedded_SW/Embedded/Modules/IFS/ifs.h | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/Software/Embedded_SW/Embedded/Modules/IFS/ifs.c b/Software/Embedded_SW/Embedded/Modules/IFS/ifs.c index 469e82aa8..2c67a623b 100644 --- a/Software/Embedded_SW/Embedded/Modules/IFS/ifs.c +++ b/Software/Embedded_SW/Embedded/Modules/IFS/ifs.c @@ -157,6 +157,7 @@ bool CartridgeInkFull() int GetCartridgeFillPercent() { double MidTank_Pressure = 0; + double percent; #ifdef IFS_DEBUG static int percent = 0; if (midTankState == MidTankStateFilling) { @@ -169,7 +170,8 @@ int GetCartridgeFillPercent() return percent; #else MidTank_Pressure = Read_MidTank_Pressure_Sensor(midTankCartColor); - return (((MidTank_Pressure - midTankCapacity)* 100) / CARTRIDGE_CAPATICY); + percent = (((MidTank_Pressure - midTankCapacity)* 100) / CARTRIDGE_CAPATICY); + return percent; #endif } diff --git a/Software/Embedded_SW/Embedded/Modules/IFS/ifs.h b/Software/Embedded_SW/Embedded/Modules/IFS/ifs.h index 0f95fb2e2..7d68621e9 100644 --- a/Software/Embedded_SW/Embedded/Modules/IFS/ifs.h +++ b/Software/Embedded_SW/Embedded/Modules/IFS/ifs.h @@ -13,7 +13,7 @@ #define CARTRIDGE_INK_TIMEOUT 420 #define MidTank_Pressure_EMPTY 0.3 -#define CARTRIDGE_CAPATICY 1500 +#define CARTRIDGE_CAPATICY 1.5 typedef enum{ MidTankStateIdle, |